From a26e90b2024ca3dbdccfd44ae5a33e11aafa7ae2 Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <t.quathamer@mailbox.org>
Date: Fri, 5 Jan 2024 00:12:20 +0100
Subject: [PATCH 001/294] Initial commit of url_replace addon.

This closes https://github.com/friendica/friendica/issues/13220
---
 url_replace/LICENSE.md          |  21 ++++++
 url_replace/README.md           |  17 +++++
 url_replace/lang/C/messages.po  |  50 +++++++++++++
 url_replace/templates/admin.tpl |   5 ++
 url_replace/url_replace.php     | 127 ++++++++++++++++++++++++++++++++
 5 files changed, 220 insertions(+)
 create mode 100644 url_replace/LICENSE.md
 create mode 100644 url_replace/README.md
 create mode 100644 url_replace/lang/C/messages.po
 create mode 100644 url_replace/templates/admin.tpl
 create mode 100644 url_replace/url_replace.php

diff --git a/url_replace/LICENSE.md b/url_replace/LICENSE.md
new file mode 100644
index 00000000..09dc8f64
--- /dev/null
+++ b/url_replace/LICENSE.md
@@ -0,0 +1,21 @@
+# MIT License
+
+Copyright © 2024 Dr. Tobias Quathamer <t.quathamer@mailbox.org>
+
+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/url_replace/README.md b/url_replace/README.md
new file mode 100644
index 00000000..278de91b
--- /dev/null
+++ b/url_replace/README.md
@@ -0,0 +1,17 @@
+# URL replace
+
+This addon will replace all occurrences of specified URLs with the address of
+alternative servers in all displayed postings on a Friendica node.
+
+You can use this to switch from Twitter (or X) to a nitter instance, from
+YouTube to an invidious instance, or from some news sites to 12ft.io.
+
+Note: If you are using the twitter connector on your server, the links to the
+contacts profile pages will not be replaced by this addon. Only links in the
+body of the postings are affected.
+
+## Why
+
+- Access a website without JavaScript enabled to prevent JavaScript analytics
+  and potential IP-based tracking
+- Avoid seeing ads on YouTube videos
diff --git a/url_replace/lang/C/messages.po b/url_replace/lang/C/messages.po
new file mode 100644
index 00000000..c09ad6d9
--- /dev/null
+++ b/url_replace/lang/C/messages.po
@@ -0,0 +1,50 @@
+# ADDON url_replace
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica url_replace addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-01-05 00:06+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: url_replace.php:54
+msgid "Nitter server"
+msgstr ""
+
+#: url_replace.php:56
+msgid "Specify the URL with protocol. The default is https://nitter.net."
+msgstr ""
+
+#: url_replace.php:62
+msgid "Invidious server"
+msgstr ""
+
+#: url_replace.php:64
+msgid "Specify the URL with protocol. The default is https://yewtu.be."
+msgstr ""
+
+#: url_replace.php:70
+msgid "Sites which are accessed through 12ft.io"
+msgstr ""
+
+#: url_replace.php:72
+msgid "Specify the URLs with protocol, one per line."
+msgstr ""
+
+#: url_replace.php:76
+msgid "Save settings"
+msgstr ""
+
+#: url_replace.php:125
+msgid "(URL replace addon enabled for X, YouTube and some news sites.)"
+msgstr ""
diff --git a/url_replace/templates/admin.tpl b/url_replace/templates/admin.tpl
new file mode 100644
index 00000000..b99e6355
--- /dev/null
+++ b/url_replace/templates/admin.tpl
@@ -0,0 +1,5 @@
+{{include file="field_input.tpl" field=$nitter_server}}
+{{include file="field_input.tpl" field=$invidious_server}}
+{{include file="field_textarea.tpl" field=$twelvefeet_sites}}
+
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/url_replace/url_replace.php b/url_replace/url_replace.php
new file mode 100644
index 00000000..51bc10fe
--- /dev/null
+++ b/url_replace/url_replace.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Name: URL Replace
+ * Description: Replaces occurrences of specified URLs with the address of alternative servers in all displays of postings on a node.
+ * Version: 1.0
+ * Author: Dr. Tobias Quathamer <https://social.anoxinon.de/@toddy>
+ * Maintainer: Dr. Tobias Quathamer <https://social.anoxinon.de/@toddy>
+ */
+use Friendica\Core\Hook;
+use Friendica\Core\Renderer;
+use Friendica\DI;
+
+function url_replace_install()
+{
+	Hook::register('prepare_body_final', 'addon/url_replace/url_replace.php', 'url_replace_render');
+}
+
+/**
+ * Handle sent data from admin settings
+ */
+function url_replace_addon_admin_post()
+{
+	DI::config()->set('url_replace', 'nitter_server', rtrim(trim($_POST['nitter_server']), '/'));
+	DI::config()->set('url_replace', 'invidious_server', rtrim(trim($_POST['invidious_server']), '/'));
+	// Convert twelvefeet_sites into an array before setting the new value
+	$twelvefeet_sites = explode(PHP_EOL, $_POST['twelvefeet_sites']);
+	// Normalize URLs by using lower case, removing a trailing slash and whitespace
+	$twelvefeet_sites = array_map(fn ($value): string => rtrim(trim(strtolower($value)), '/'), $twelvefeet_sites);
+	// Do not store empty lines or duplicates
+	$twelvefeet_sites = array_filter($twelvefeet_sites, fn ($value): bool => !empty($value));
+	$twelvefeet_sites = array_unique($twelvefeet_sites);
+	// Ensure a protocol and default to HTTPS
+	$twelvefeet_sites = array_map(
+		fn ($value): string => substr($value, 0, 4) !== 'http' ? 'https://'.$value : $value,
+		$twelvefeet_sites
+	);
+	asort($twelvefeet_sites);
+	DI::config()->set('url_replace', 'twelvefeet_sites', $twelvefeet_sites);
+}
+
+/**
+ * Hook into admin settings to enable choosing a different server
+ * for twitter, youtube, and news sites.
+ */
+function url_replace_addon_admin(string &$o)
+{
+	$nitter_server    = DI::config()->get('url_replace', 'nitter_server');
+	$invidious_server = DI::config()->get('url_replace', 'invidious_server');
+	$twelvefeet_sites = implode(PHP_EOL, DI::config()->get('url_replace', 'twelvefeet_sites'));
+	$t                = Renderer::getMarkupTemplate('admin.tpl', 'addon/url_replace/');
+	$o                = Renderer::replaceMacros($t, [
+		'$nitter_server' => [
+			'nitter_server',
+			DI::l10n()->t('Nitter server'),
+			$nitter_server,
+			DI::l10n()->t('Specify the URL with protocol. The default is https://nitter.net.'),
+			null,
+			'placeholder="https://nitter.net"',
+		],
+		'$invidious_server' => [
+			'invidious_server',
+			DI::l10n()->t('Invidious server'),
+			$invidious_server,
+			DI::l10n()->t('Specify the URL with protocol. The default is https://yewtu.be.'),
+			null,
+			'placeholder="https://yewtu.be"',
+		],
+		'$twelvefeet_sites' => [
+			'twelvefeet_sites',
+			DI::l10n()->t('Sites which are accessed through 12ft.io'),
+			$twelvefeet_sites,
+			DI::l10n()->t('Specify the URLs with protocol, one per line.'),
+			null,
+			'rows=6'
+		],
+		'$submit' => DI::l10n()->t('Save settings'),
+	]);
+}
+
+/**
+ * Replace proprietary URLs with their specified counterpart
+ */
+function url_replace_render(array &$b)
+{
+	$replaced = false;
+
+	$nitter_server = DI::config()->get('url_replace', 'nitter_server');
+	if (empty($nitter_server)) {
+		$nitter_server = 'https://nitter.net';
+	}
+
+	$invidious_server = DI::config()->get('url_replace', 'invidious_server');
+	if (empty($invidious_server)) {
+		$invidious_server = 'https://yewtu.be';
+	}
+
+	// Handle some of twitter and youtube
+	$replacements = [
+		'https://mobile.twitter.com' => $nitter_server,
+		'https://twitter.com'        => $nitter_server,
+		'https://mobile.x.com'       => $nitter_server,
+		'https://x.com'              => $nitter_server,
+		'https://www.youtube.com'    => $invidious_server,
+		'https://youtube.com'        => $invidious_server,
+		'https://m.youtube.com'      => $invidious_server,
+		'https://youtu.be'           => $invidious_server,
+	];
+	foreach ($replacements as $server => $replacement) {
+		if (strpos($b['html'], $server) !== false) {
+			$b['html'] = str_replace($server, $replacement, $b['html']);
+			$replaced  = true;
+		}
+	}
+
+	$twelvefeet_sites = DI::config()->get('url_replace', 'twelvefeet_sites');
+	foreach ($twelvefeet_sites as $twelvefeet_site) {
+		if (strpos($b['html'], $twelvefeet_site) !== false) {
+			$b['html'] = str_replace($twelvefeet_site, 'https://12ft.io/'.$twelvefeet_site, $b['html']);
+			$replaced  = true;
+		}
+	}
+
+
+	if ($replaced) {
+		$b['html'] .= '<hr><p><small>' . DI::l10n()->t('(URL replace addon enabled for X, YouTube and some news sites.)') . '</small></p>';
+	}
+}

From bddb7f4d49d1f36120b0054d2763aa7c89d03f17 Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <toddy@debian.org>
Date: Mon, 8 Jan 2024 10:36:21 +0100
Subject: [PATCH 002/294] Fix PHP warning and use quotes

---
 url_replace/url_replace.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/url_replace/url_replace.php b/url_replace/url_replace.php
index 51bc10fe..4c61b6c2 100644
--- a/url_replace/url_replace.php
+++ b/url_replace/url_replace.php
@@ -71,7 +71,7 @@ function url_replace_addon_admin(string &$o)
 			$twelvefeet_sites,
 			DI::l10n()->t('Specify the URLs with protocol, one per line.'),
 			null,
-			'rows=6'
+			'rows="6"'
 		],
 		'$submit' => DI::l10n()->t('Save settings'),
 	]);
@@ -113,6 +113,9 @@ function url_replace_render(array &$b)
 	}
 
 	$twelvefeet_sites = DI::config()->get('url_replace', 'twelvefeet_sites');
+	if (empty($twelvefeet_sites)) {
+		$twelvefeet_sites = [];
+	}
 	foreach ($twelvefeet_sites as $twelvefeet_site) {
 		if (strpos($b['html'], $twelvefeet_site) !== false) {
 			$b['html'] = str_replace($twelvefeet_site, 'https://12ft.io/'.$twelvefeet_site, $b['html']);

From 13fd713b66cdce186f30cb70bdcf237814f961b5 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Fri, 12 Jan 2024 01:16:01 -0500
Subject: [PATCH 003/294] [various] Rename ICanHandleHttpResponses->getBody to
 getBodyString

- Depends on https://github.com/friendica/friendica/pull/13826
---
 bluesky/bluesky.php                           | 14 +++++++-------
 discourse/discourse.php                       |  4 ++--
 dwpost/dwpost.php                             |  2 +-
 ijpost/ijpost.php                             |  2 +-
 libertree/libertree.php                       |  2 +-
 ljpost/ljpost.php                             |  2 +-
 mailstream/mailstream.php                     |  2 +-
 mastodoncustomemojis/mastodoncustomemojis.php |  2 +-
 openstreetmap/openstreetmap.php               |  2 +-
 tumblr/tumblr.php                             | 10 +++++-----
 twitter/twitter.php                           |  4 ++--
 webdav_storage/src/WebDav.php                 |  4 ++--
 wppost/wppost.php                             |  2 +-
 13 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index dac95437..a2c85ad3 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1111,11 +1111,11 @@ function bluesky_process_post(stdClass $post, int $uid, int $post_reason, int $l
 	$uri = bluesky_get_uri($post);
 
 	if ($id = Post::selectFirst(['id'], ['uri' => $uri, 'uid' => $uid])) {
-		return $id['id'];	
+		return $id['id'];
 	}
 
 	if ($id = Post::selectFirst(['id'], ['extid' => $uri, 'uid' => $uid])) {
-		return $id['id'];	
+		return $id['id'];
 	}
 
 	Logger::debug('Importing post', ['uid' => $uid, 'indexedAt' => $post->indexedAt, 'uri' => $post->uri, 'cid' => $post->cid, 'root' => $post->record->reply->root ?? '']);
@@ -1251,7 +1251,7 @@ function bluesky_get_text(stdClass $record, int $uri_id): string
 					$url      = DI::baseUrl() . '/search?tag=' . urlencode($feature->tag);
 					$linktext = '#' . $feature->tag;
 					break;
-	
+
 				default:
 					Logger::notice('Unhandled feature type', ['type' => $feature->$type, 'feature' => $feature, 'record' => $record]);
 					break;
@@ -1736,13 +1736,13 @@ function bluesky_post(int $uid, string $url, string $params, array $headers): ?s
 	}
 
 	if (!$curlResult->isSuccess()) {
-		Logger::notice('API Error', ['error' => json_decode($curlResult->getBody()) ?: $curlResult->getBody()]);
+		Logger::notice('API Error', ['error' => json_decode($curlResult->getBodyString()) ?: $curlResult->getBodyString()]);
 		DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_API_FAIL);
 		return null;
 	}
 
 	DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_SUCCESS);
-	return json_decode($curlResult->getBody());
+	return json_decode($curlResult->getBodyString());
 }
 
 function bluesky_xrpc_get(int $uid, string $url, array $parameters = []): ?stdClass
@@ -1767,9 +1767,9 @@ function bluesky_get(string $url, string $accept_content = HttpClientAccept::DEF
 	}
 
 	if (!$curlResult->isSuccess()) {
-		Logger::notice('API Error', ['error' => json_decode($curlResult->getBody()) ?: $curlResult->getBody()]);
+		Logger::notice('API Error', ['error' => json_decode($curlResult->getBodyString()) ?: $curlResult->getBodyString()]);
 		return null;
 	}
 
-	return json_decode($curlResult->getBody());
+	return json_decode($curlResult->getBodyString());
 }
diff --git a/discourse/discourse.php b/discourse/discourse.php
index 3d27c5b0..298b3f3e 100644
--- a/discourse/discourse.php
+++ b/discourse/discourse.php
@@ -126,7 +126,7 @@ function discourse_fetch_post($host, $topic, $pid)
 		return false;
 	}
 
-	$raw = $curlResult->getBody();
+	$raw = $curlResult->getBodyString();
 	$data = json_decode($raw, true);
 	$posts = $data['post_stream']['posts'];
 	foreach($posts as $post) {
@@ -162,7 +162,7 @@ function discourse_fetch_post_from_api(&$message, $post, $host)
 		return false;
 	}
 
-	$raw = $curlResult->getBody();
+	$raw = $curlResult->getBodyString();
 	$data = json_decode($raw, true);
 	if (empty($data)) {
 		return false;
diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index 6c1742e4..4ad5021f 100644
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -192,7 +192,7 @@ EOT;
 		Logger::debug('dwpost: data: ' . $xml);
 
 		if ($dw_blog !== 'test') {
-			$x = DI::httpClient()->post($dw_blog, $xml, ['Content-Type' => 'text/xml'])->getBody();
+			$x = DI::httpClient()->post($dw_blog, $xml, ['Content-Type' => 'text/xml'])->getBodyString();
 		}
 
 		Logger::info('posted to dreamwidth: ' . ($x) ? $x : '');
diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index 55d3fb05..885bc289 100644
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -186,7 +186,7 @@ EOT;
 		Logger::debug('ijpost: data: ' . $xml);
 
 		if ($ij_blog !== 'test') {
-			$x = DI::httpClient()->post($ij_blog, $xml, ['Content-Type' => 'text/xml'])->getBody();
+			$x = DI::httpClient()->post($ij_blog, $xml, ['Content-Type' => 'text/xml'])->getBodyString();
 		}
 		Logger::info('posted to insanejournal: ' . $x ? $x : '');
 	}
diff --git a/libertree/libertree.php b/libertree/libertree.php
index c0f896c0..f69c0aab 100644
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -201,7 +201,7 @@ function libertree_send(array &$b)
 		//	'token' => $ltree_api_token
 		];
 
-		$result = DI::httpClient()->post($ltree_blog, $params)->getBody();
+		$result = DI::httpClient()->post($ltree_blog, $params)->getBodyString();
 		Logger::notice('libertree: ' . $result);
 	}
 }
diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index f6f2b79a..fac44767 100644
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -207,7 +207,7 @@ EOT;
 		Logger::debug('ljpost: data: ' . $xml);
 
 		if ($lj_blog !== 'test') {
-			$x = DI::httpClient()->post($lj_blog, $xml, ['Content-Type' => 'text/xml'])->getBody();
+			$x = DI::httpClient()->post($lj_blog, $xml, ['Content-Type' => 'text/xml'])->getBodyString();
 		}
 
 		Logger::info('posted to livejournal: ' . ($x) ? $x : '');
diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index d76ccf86..968ee4c0 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -221,7 +221,7 @@ function mailstream_do_images(array &$item, array &$attachments)
 			continue;
 		}
 		$attachments[$url] = [
-			'data' => $curlResult->getBody(),
+			'data' => $curlResult->getBodyString(),
 			'guid' => hash('crc32', $url),
 			'filename' => basename($components['path']),
 			'type' => $curlResult->getContentType()
diff --git a/mastodoncustomemojis/mastodoncustomemojis.php b/mastodoncustomemojis/mastodoncustomemojis.php
index c84f1a4f..f67054a1 100644
--- a/mastodoncustomemojis/mastodoncustomemojis.php
+++ b/mastodoncustomemojis/mastodoncustomemojis.php
@@ -82,7 +82,7 @@ function mastodoncustomemojis_fetch_custom_emojis_for_url($api_base_url)
 	$fetchResult = DI::httpClient()->fetchFull($api_url);
 
 	if ($fetchResult->isSuccess()) {
-		$emojis_array = json_decode($fetchResult->getBody(), true);
+		$emojis_array = json_decode($fetchResult->getBodyString(), true);
 
 		if (is_array($emojis_array) && count($emojis_array)) {
 			foreach ($emojis_array as $emoji) {
diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index 3b7c4a58..ae22aff0 100644
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -121,7 +121,7 @@ function openstreetmap_get_coordinates(array &$b)
 	if (is_null($j)) {
 		$curlResult = DI::httpClient()->get($nomserver . $args);
 		if ($curlResult->isSuccess()) {
-			$j = json_decode($curlResult->getBody(), true);
+			$j = json_decode($curlResult->getBodyString(), true);
 			DI::cache()->set($cachekey, $j, Duration::MONTH);
 		}
 	}
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 4d5368b8..d6508ff8 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -1244,7 +1244,7 @@ function tumblr_get_contact_by_url(string $url, int $uid): ?array
 		} catch (\Exception $e) {
 			return null;
 		}
-		$html = $curlResult->getBody();
+		$html = $curlResult->getBodyString();
 		if (empty($html)) {
 			return null;
 		}
@@ -1372,7 +1372,7 @@ function tumblr_delete(int $uid, string $url, array $parameters): stdClass
  */
 function tumblr_format_result(ICanHandleHttpResponses $curlResult): stdClass
 {
-	$result = json_decode($curlResult->getBody());
+	$result = json_decode($curlResult->getBodyString());
 	if (empty($result) || empty($result->meta)) {
 		$result               = new stdClass;
 		$result->meta         = new stdClass;
@@ -1426,11 +1426,11 @@ function tumblr_get_token(int $uid, string $code = ''): string
 
 		$curlResult = DI::httpClient()->post('https://api.tumblr.com/v2/oauth2/token', $parameters);
 		if (!$curlResult->isSuccess()) {
-			Logger::info('Error fetching token', ['uid' => $uid, 'code' => $code, 'result' => $curlResult->getBody(), 'parameters' => $parameters]);
+			Logger::info('Error fetching token', ['uid' => $uid, 'code' => $code, 'result' => $curlResult->getBodyString(), 'parameters' => $parameters]);
 			return '';
 		}
 
-		$result = json_decode($curlResult->getBody());
+		$result = json_decode($curlResult->getBodyString());
 		if (empty($result)) {
 			Logger::info('Invalid result when updating token', ['uid' => $uid]);
 			return '';
@@ -1479,7 +1479,7 @@ function tumblr_exchange_token(int $uid): stdClass
 		]);
 
 		$response = $client->post('oauth2/exchange', ['auth' => 'oauth']);
-		return json_decode($response->getBody()->getContents());
+		return json_decode($response->getBodyString()->getContents());
 	} catch (RequestException $exception) {
 		Logger::notice('Exchange failed', ['code' => $exception->getCode(), 'message' => $exception->getMessage()]);
 		return new stdClass;
diff --git a/twitter/twitter.php b/twitter/twitter.php
index b01345b7..8c906daf 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -362,7 +362,7 @@ function twitter_post(int $uid, string $url, string $type, array $data): stdClas
 	]);
 
 	$response = $client->post($url, ['auth' => 'oauth', $type => $data]);
-	$body     = $response->getBody()->getContents();
+	$body     = $response->getBodyString()->getContents();
 
 	$status = [
 		'code'    => $response->getStatusCode(),
@@ -399,7 +399,7 @@ function twitter_test_connection(int $uid)
 		$status = [
 			'code'   => $response->getStatusCode(),
 			'reason'  => $response->getReasonPhrase(),
-			'content' => $response->getBody()->getContents()
+			'content' => $response->getBodyString()->getContents()
 		];
 		DI::pConfig()->set(1, 'twitter', 'last_status',  $status);
 		Logger::info('Test successful', ['uid' => $uid]);
diff --git a/webdav_storage/src/WebDav.php b/webdav_storage/src/WebDav.php
index de9fc476..ddf2dae0 100644
--- a/webdav_storage/src/WebDav.php
+++ b/webdav_storage/src/WebDav.php
@@ -113,7 +113,7 @@ class WebDav implements ICanWriteToStorage
 		$response = $this->client->request('propfind', $uri, $opts);
 
 		$responseDoc = new \DOMDocument();
-		$responseDoc->loadXML($response->getBody());
+		$responseDoc->loadXML($response->getBodyString());
 		$responseDoc->formatOutput = true;
 
 		$xpath = new \DOMXPath($responseDoc);
@@ -205,7 +205,7 @@ class WebDav implements ICanWriteToStorage
 			throw new ReferenceStorageException(sprintf('Invalid reference %s', $reference));
 		}
 
-		return $response->getBody();
+		return $response->getBodyString();
 	}
 
 	/**
diff --git a/wppost/wppost.php b/wppost/wppost.php
index 0405f78a..e27079aa 100644
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -269,7 +269,7 @@ EOT;
 		Logger::debug('wppost: data: ' . $xml);
 
 		if ($wp_blog !== 'test') {
-			$x = DI::httpClient()->post($wp_blog, $xml)->getBody();
+			$x = DI::httpClient()->post($wp_blog, $xml)->getBodyString();
 		}
 		Logger::info('posted to wordpress: ' . (($x) ? $x : ''));
 	}

From 4dd903b473e914b1f8814220dff50fe1f2baf480 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 14 Jan 2024 19:21:08 +0000
Subject: [PATCH 004/294] New addon "tesseract" for OCR

---
 tesseract/composer.json                       |   5 +
 tesseract/composer.lock                       |  66 +++
 tesseract/tesseract.php                       |  33 ++
 tesseract/vendor/autoload.php                 |   7 +
 tesseract/vendor/composer/ClassLoader.php     | 445 +++++++++++++++
 tesseract/vendor/composer/LICENSE             |  21 +
 .../vendor/composer/autoload_classmap.php     |   9 +
 .../vendor/composer/autoload_namespaces.php   |   9 +
 tesseract/vendor/composer/autoload_psr4.php   |  10 +
 tesseract/vendor/composer/autoload_real.php   |  55 ++
 tesseract/vendor/composer/autoload_static.php |  31 ++
 tesseract/vendor/composer/installed.json      |  48 ++
 .../thiagoalessio/tesseract_ocr/.appveyor.yml |  14 +
 .../thiagoalessio/tesseract_ocr/MIT-LICENSE   |  19 +
 .../thiagoalessio/tesseract_ocr/README.md     | 508 ++++++++++++++++++
 .../thiagoalessio/tesseract_ocr/codecov.yml   |   4 +
 .../thiagoalessio/tesseract_ocr/composer.json |  35 ++
 .../tesseract_ocr/src/Command.php             |  80 +++
 .../src/FeatureNotAvailableException.php      |   7 +
 .../tesseract_ocr/src/FriendlyErrors.php      | 120 +++++
 .../src/ImageNotFoundException.php            |   7 +
 .../src/NoWritePermissionsForOutputFile.php   |   7 +
 .../tesseract_ocr/src/Option.php              |  79 +++
 .../tesseract_ocr/src/Process.php             |  83 +++
 .../src/TesseractNotFoundException.php        |   7 +
 .../tesseract_ocr/src/TesseractOCR.php        | 181 +++++++
 .../src/TesseractOcrException.php             |   7 +
 .../src/UnsuccessfulCommandException.php      |   7 +
 28 files changed, 1904 insertions(+)
 create mode 100644 tesseract/composer.json
 create mode 100644 tesseract/composer.lock
 create mode 100644 tesseract/tesseract.php
 create mode 100644 tesseract/vendor/autoload.php
 create mode 100644 tesseract/vendor/composer/ClassLoader.php
 create mode 100644 tesseract/vendor/composer/LICENSE
 create mode 100644 tesseract/vendor/composer/autoload_classmap.php
 create mode 100644 tesseract/vendor/composer/autoload_namespaces.php
 create mode 100644 tesseract/vendor/composer/autoload_psr4.php
 create mode 100644 tesseract/vendor/composer/autoload_real.php
 create mode 100644 tesseract/vendor/composer/autoload_static.php
 create mode 100644 tesseract/vendor/composer/installed.json
 create mode 100644 tesseract/vendor/thiagoalessio/tesseract_ocr/.appveyor.yml
 create mode 100644 tesseract/vendor/thiagoalessio/tesseract_ocr/MIT-LICENSE
 create mode 100644 tesseract/vendor/thiagoalessio/tesseract_ocr/README.md
 create mode 100644 tesseract/vendor/thiagoalessio/tesseract_ocr/codecov.yml
 create mode 100644 tesseract/vendor/thiagoalessio/tesseract_ocr/composer.json
 create mode 100644 tesseract/vendor/thiagoalessio/tesseract_ocr/src/Command.php
 create mode 100644 tesseract/vendor/thiagoalessio/tesseract_ocr/src/FeatureNotAvailableException.php
 create mode 100644 tesseract/vendor/thiagoalessio/tesseract_ocr/src/FriendlyErrors.php
 create mode 100644 tesseract/vendor/thiagoalessio/tesseract_ocr/src/ImageNotFoundException.php
 create mode 100644 tesseract/vendor/thiagoalessio/tesseract_ocr/src/NoWritePermissionsForOutputFile.php
 create mode 100644 tesseract/vendor/thiagoalessio/tesseract_ocr/src/Option.php
 create mode 100644 tesseract/vendor/thiagoalessio/tesseract_ocr/src/Process.php
 create mode 100644 tesseract/vendor/thiagoalessio/tesseract_ocr/src/TesseractNotFoundException.php
 create mode 100644 tesseract/vendor/thiagoalessio/tesseract_ocr/src/TesseractOCR.php
 create mode 100644 tesseract/vendor/thiagoalessio/tesseract_ocr/src/TesseractOcrException.php
 create mode 100644 tesseract/vendor/thiagoalessio/tesseract_ocr/src/UnsuccessfulCommandException.php

diff --git a/tesseract/composer.json b/tesseract/composer.json
new file mode 100644
index 00000000..2a0937c0
--- /dev/null
+++ b/tesseract/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "thiagoalessio/tesseract_ocr": "^2.13"
+    }
+}
diff --git a/tesseract/composer.lock b/tesseract/composer.lock
new file mode 100644
index 00000000..036868e7
--- /dev/null
+++ b/tesseract/composer.lock
@@ -0,0 +1,66 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "778b5479cb5d2b31b57f40473a87f8eb",
+    "packages": [
+        {
+            "name": "thiagoalessio/tesseract_ocr",
+            "version": "2.13.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thiagoalessio/tesseract-ocr-for-php.git",
+                "reference": "232a8cb9d571992f9bd1e263f2f6909cf6c173a1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thiagoalessio/tesseract-ocr-for-php/zipball/232a8cb9d571992f9bd1e263f2f6909cf6c173a1",
+                "reference": "232a8cb9d571992f9bd1e263f2f6909cf6c173a1",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3 || ^7.0 || ^8.0"
+            },
+            "require-dev": {
+                "phpunit/php-code-coverage": "^2.2.4 || ^9.0.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "thiagoalessio\\TesseractOCR\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "thiagoalessio",
+                    "email": "thiagoalessio@me.com"
+                }
+            ],
+            "description": "A wrapper to work with Tesseract OCR inside PHP.",
+            "keywords": [
+                "OCR",
+                "Tesseract",
+                "text recognition"
+            ],
+            "time": "2023-10-05T21:14:48+00:00"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": [],
+    "platform-overrides": {
+        "php": "7.2"
+    },
+    "plugin-api-version": "1.1.0"
+}
diff --git a/tesseract/tesseract.php b/tesseract/tesseract.php
new file mode 100644
index 00000000..3c61273f
--- /dev/null
+++ b/tesseract/tesseract.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Name: Tesseract OCR
+ * Description: Use OCR to get text from images
+ * Version: 0.1
+ * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
+ */
+
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
+use Friendica\Core\System;
+use thiagoalessio\TesseractOCR\TesseractOCR;
+
+require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
+
+function tesseract_install()
+{
+	Hook::register('ocr-detection', __FILE__, 'tesseract_ocr_detection');
+
+	Logger::notice('installed tesseract');
+}
+
+function tesseract_ocr_detection(&$media)
+{
+	$ocr = new TesseractOCR();
+	try {
+		$ocr->tempDir(System::getTempPath());
+		$ocr->imageData($media['img_str'], strlen($media['img_str']));
+		$media['description'] = $ocr->run();
+	} catch (\Throwable $th) {
+		Logger::info('Error calling TesseractOCR', ['message' => $th->getMessage()]);
+	}			
+}
diff --git a/tesseract/vendor/autoload.php b/tesseract/vendor/autoload.php
new file mode 100644
index 00000000..1238ecea
--- /dev/null
+++ b/tesseract/vendor/autoload.php
@@ -0,0 +1,7 @@
+<?php
+
+// autoload.php @generated by Composer
+
+require_once __DIR__ . '/composer/autoload_real.php';
+
+return ComposerAutoloaderInit695d781792f754383aa61632167d066e::getLoader();
diff --git a/tesseract/vendor/composer/ClassLoader.php b/tesseract/vendor/composer/ClassLoader.php
new file mode 100644
index 00000000..03b9bb9c
--- /dev/null
+++ b/tesseract/vendor/composer/ClassLoader.php
@@ -0,0 +1,445 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer\Autoload;
+
+/**
+ * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
+ *
+ *     $loader = new \Composer\Autoload\ClassLoader();
+ *
+ *     // register classes with namespaces
+ *     $loader->add('Symfony\Component', __DIR__.'/component');
+ *     $loader->add('Symfony',           __DIR__.'/framework');
+ *
+ *     // activate the autoloader
+ *     $loader->register();
+ *
+ *     // to enable searching the include path (eg. for PEAR packages)
+ *     $loader->setUseIncludePath(true);
+ *
+ * In this example, if you try to use a class in the Symfony\Component
+ * namespace or one of its children (Symfony\Component\Console for instance),
+ * the autoloader will first look for the class under the component/
+ * directory, and it will then fallback to the framework/ directory if not
+ * found before giving up.
+ *
+ * This class is loosely based on the Symfony UniversalClassLoader.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ * @see    http://www.php-fig.org/psr/psr-0/
+ * @see    http://www.php-fig.org/psr/psr-4/
+ */
+class ClassLoader
+{
+    // PSR-4
+    private $prefixLengthsPsr4 = array();
+    private $prefixDirsPsr4 = array();
+    private $fallbackDirsPsr4 = array();
+
+    // PSR-0
+    private $prefixesPsr0 = array();
+    private $fallbackDirsPsr0 = array();
+
+    private $useIncludePath = false;
+    private $classMap = array();
+    private $classMapAuthoritative = false;
+    private $missingClasses = array();
+    private $apcuPrefix;
+
+    public function getPrefixes()
+    {
+        if (!empty($this->prefixesPsr0)) {
+            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
+        }
+
+        return array();
+    }
+
+    public function getPrefixesPsr4()
+    {
+        return $this->prefixDirsPsr4;
+    }
+
+    public function getFallbackDirs()
+    {
+        return $this->fallbackDirsPsr0;
+    }
+
+    public function getFallbackDirsPsr4()
+    {
+        return $this->fallbackDirsPsr4;
+    }
+
+    public function getClassMap()
+    {
+        return $this->classMap;
+    }
+
+    /**
+     * @param array $classMap Class to filename map
+     */
+    public function addClassMap(array $classMap)
+    {
+        if ($this->classMap) {
+            $this->classMap = array_merge($this->classMap, $classMap);
+        } else {
+            $this->classMap = $classMap;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix, either
+     * appending or prepending to the ones previously set for this prefix.
+     *
+     * @param string       $prefix  The prefix
+     * @param array|string $paths   The PSR-0 root directories
+     * @param bool         $prepend Whether to prepend the directories
+     */
+    public function add($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            if ($prepend) {
+                $this->fallbackDirsPsr0 = array_merge(
+                    (array) $paths,
+                    $this->fallbackDirsPsr0
+                );
+            } else {
+                $this->fallbackDirsPsr0 = array_merge(
+                    $this->fallbackDirsPsr0,
+                    (array) $paths
+                );
+            }
+
+            return;
+        }
+
+        $first = $prefix[0];
+        if (!isset($this->prefixesPsr0[$first][$prefix])) {
+            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+
+            return;
+        }
+        if ($prepend) {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixesPsr0[$first][$prefix]
+            );
+        } else {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                $this->prefixesPsr0[$first][$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace, either
+     * appending or prepending to the ones previously set for this namespace.
+     *
+     * @param string       $prefix  The prefix/namespace, with trailing '\\'
+     * @param array|string $paths   The PSR-4 base directories
+     * @param bool         $prepend Whether to prepend the directories
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function addPsr4($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            // Register directories for the root namespace.
+            if ($prepend) {
+                $this->fallbackDirsPsr4 = array_merge(
+                    (array) $paths,
+                    $this->fallbackDirsPsr4
+                );
+            } else {
+                $this->fallbackDirsPsr4 = array_merge(
+                    $this->fallbackDirsPsr4,
+                    (array) $paths
+                );
+            }
+        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+            // Register directories for a new namespace.
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        } elseif ($prepend) {
+            // Prepend directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixDirsPsr4[$prefix]
+            );
+        } else {
+            // Append directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                $this->prefixDirsPsr4[$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix,
+     * replacing any others previously set for this prefix.
+     *
+     * @param string       $prefix The prefix
+     * @param array|string $paths  The PSR-0 base directories
+     */
+    public function set($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr0 = (array) $paths;
+        } else {
+            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace,
+     * replacing any others previously set for this namespace.
+     *
+     * @param string       $prefix The prefix/namespace, with trailing '\\'
+     * @param array|string $paths  The PSR-4 base directories
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function setPsr4($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr4 = (array) $paths;
+        } else {
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Turns on searching the include path for class files.
+     *
+     * @param bool $useIncludePath
+     */
+    public function setUseIncludePath($useIncludePath)
+    {
+        $this->useIncludePath = $useIncludePath;
+    }
+
+    /**
+     * Can be used to check if the autoloader uses the include path to check
+     * for classes.
+     *
+     * @return bool
+     */
+    public function getUseIncludePath()
+    {
+        return $this->useIncludePath;
+    }
+
+    /**
+     * Turns off searching the prefix and fallback directories for classes
+     * that have not been registered with the class map.
+     *
+     * @param bool $classMapAuthoritative
+     */
+    public function setClassMapAuthoritative($classMapAuthoritative)
+    {
+        $this->classMapAuthoritative = $classMapAuthoritative;
+    }
+
+    /**
+     * Should class lookup fail if not found in the current class map?
+     *
+     * @return bool
+     */
+    public function isClassMapAuthoritative()
+    {
+        return $this->classMapAuthoritative;
+    }
+
+    /**
+     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
+     *
+     * @param string|null $apcuPrefix
+     */
+    public function setApcuPrefix($apcuPrefix)
+    {
+        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
+    }
+
+    /**
+     * The APCu prefix in use, or null if APCu caching is not enabled.
+     *
+     * @return string|null
+     */
+    public function getApcuPrefix()
+    {
+        return $this->apcuPrefix;
+    }
+
+    /**
+     * Registers this instance as an autoloader.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not
+     */
+    public function register($prepend = false)
+    {
+        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+    }
+
+    /**
+     * Unregisters this instance as an autoloader.
+     */
+    public function unregister()
+    {
+        spl_autoload_unregister(array($this, 'loadClass'));
+    }
+
+    /**
+     * Loads the given class or interface.
+     *
+     * @param  string    $class The name of the class
+     * @return bool|null True if loaded, null otherwise
+     */
+    public function loadClass($class)
+    {
+        if ($file = $this->findFile($class)) {
+            includeFile($file);
+
+            return true;
+        }
+    }
+
+    /**
+     * Finds the path to the file where the class is defined.
+     *
+     * @param string $class The name of the class
+     *
+     * @return string|false The path if found, false otherwise
+     */
+    public function findFile($class)
+    {
+        // class map lookup
+        if (isset($this->classMap[$class])) {
+            return $this->classMap[$class];
+        }
+        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
+            return false;
+        }
+        if (null !== $this->apcuPrefix) {
+            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
+            if ($hit) {
+                return $file;
+            }
+        }
+
+        $file = $this->findFileWithExtension($class, '.php');
+
+        // Search for Hack files if we are running on HHVM
+        if (false === $file && defined('HHVM_VERSION')) {
+            $file = $this->findFileWithExtension($class, '.hh');
+        }
+
+        if (null !== $this->apcuPrefix) {
+            apcu_add($this->apcuPrefix.$class, $file);
+        }
+
+        if (false === $file) {
+            // Remember that this class does not exist.
+            $this->missingClasses[$class] = true;
+        }
+
+        return $file;
+    }
+
+    private function findFileWithExtension($class, $ext)
+    {
+        // PSR-4 lookup
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+
+        $first = $class[0];
+        if (isset($this->prefixLengthsPsr4[$first])) {
+            $subPath = $class;
+            while (false !== $lastPos = strrpos($subPath, '\\')) {
+                $subPath = substr($subPath, 0, $lastPos);
+                $search = $subPath . '\\';
+                if (isset($this->prefixDirsPsr4[$search])) {
+                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
+                        if (file_exists($file = $dir . $pathEnd)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-4 fallback dirs
+        foreach ($this->fallbackDirsPsr4 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 lookup
+        if (false !== $pos = strrpos($class, '\\')) {
+            // namespaced class name
+            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
+                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
+        } else {
+            // PEAR-like class name
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+        }
+
+        if (isset($this->prefixesPsr0[$first])) {
+            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
+                if (0 === strpos($class, $prefix)) {
+                    foreach ($dirs as $dir) {
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-0 fallback dirs
+        foreach ($this->fallbackDirsPsr0 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 include paths.
+        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
+            return $file;
+        }
+
+        return false;
+    }
+}
+
+/**
+ * Scope isolated include.
+ *
+ * Prevents access to $this/self from included files.
+ */
+function includeFile($file)
+{
+    include $file;
+}
diff --git a/tesseract/vendor/composer/LICENSE b/tesseract/vendor/composer/LICENSE
new file mode 100644
index 00000000..f27399a0
--- /dev/null
+++ b/tesseract/vendor/composer/LICENSE
@@ -0,0 +1,21 @@
+
+Copyright (c) Nils Adermann, Jordi Boggiano
+
+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/tesseract/vendor/composer/autoload_classmap.php b/tesseract/vendor/composer/autoload_classmap.php
new file mode 100644
index 00000000..7a91153b
--- /dev/null
+++ b/tesseract/vendor/composer/autoload_classmap.php
@@ -0,0 +1,9 @@
+<?php
+
+// autoload_classmap.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+);
diff --git a/tesseract/vendor/composer/autoload_namespaces.php b/tesseract/vendor/composer/autoload_namespaces.php
new file mode 100644
index 00000000..b7fc0125
--- /dev/null
+++ b/tesseract/vendor/composer/autoload_namespaces.php
@@ -0,0 +1,9 @@
+<?php
+
+// autoload_namespaces.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+);
diff --git a/tesseract/vendor/composer/autoload_psr4.php b/tesseract/vendor/composer/autoload_psr4.php
new file mode 100644
index 00000000..80779c77
--- /dev/null
+++ b/tesseract/vendor/composer/autoload_psr4.php
@@ -0,0 +1,10 @@
+<?php
+
+// autoload_psr4.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+    'thiagoalessio\\TesseractOCR\\' => array($vendorDir . '/thiagoalessio/tesseract_ocr/src'),
+);
diff --git a/tesseract/vendor/composer/autoload_real.php b/tesseract/vendor/composer/autoload_real.php
new file mode 100644
index 00000000..10af9c56
--- /dev/null
+++ b/tesseract/vendor/composer/autoload_real.php
@@ -0,0 +1,55 @@
+<?php
+
+// autoload_real.php @generated by Composer
+
+class ComposerAutoloaderInit695d781792f754383aa61632167d066e
+{
+    private static $loader;
+
+    public static function loadClassLoader($class)
+    {
+        if ('Composer\Autoload\ClassLoader' === $class) {
+            require __DIR__ . '/ClassLoader.php';
+        }
+    }
+
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
+    public static function getLoader()
+    {
+        if (null !== self::$loader) {
+            return self::$loader;
+        }
+
+        spl_autoload_register(array('ComposerAutoloaderInit695d781792f754383aa61632167d066e', 'loadClassLoader'), true, true);
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+        spl_autoload_unregister(array('ComposerAutoloaderInit695d781792f754383aa61632167d066e', 'loadClassLoader'));
+
+        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
+        if ($useStaticLoader) {
+            require_once __DIR__ . '/autoload_static.php';
+
+            call_user_func(\Composer\Autoload\ComposerStaticInit695d781792f754383aa61632167d066e::getInitializer($loader));
+        } else {
+            $map = require __DIR__ . '/autoload_namespaces.php';
+            foreach ($map as $namespace => $path) {
+                $loader->set($namespace, $path);
+            }
+
+            $map = require __DIR__ . '/autoload_psr4.php';
+            foreach ($map as $namespace => $path) {
+                $loader->setPsr4($namespace, $path);
+            }
+
+            $classMap = require __DIR__ . '/autoload_classmap.php';
+            if ($classMap) {
+                $loader->addClassMap($classMap);
+            }
+        }
+
+        $loader->register(true);
+
+        return $loader;
+    }
+}
diff --git a/tesseract/vendor/composer/autoload_static.php b/tesseract/vendor/composer/autoload_static.php
new file mode 100644
index 00000000..59b66053
--- /dev/null
+++ b/tesseract/vendor/composer/autoload_static.php
@@ -0,0 +1,31 @@
+<?php
+
+// autoload_static.php @generated by Composer
+
+namespace Composer\Autoload;
+
+class ComposerStaticInit695d781792f754383aa61632167d066e
+{
+    public static $prefixLengthsPsr4 = array (
+        't' => 
+        array (
+            'thiagoalessio\\TesseractOCR\\' => 27,
+        ),
+    );
+
+    public static $prefixDirsPsr4 = array (
+        'thiagoalessio\\TesseractOCR\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/thiagoalessio/tesseract_ocr/src',
+        ),
+    );
+
+    public static function getInitializer(ClassLoader $loader)
+    {
+        return \Closure::bind(function () use ($loader) {
+            $loader->prefixLengthsPsr4 = ComposerStaticInit695d781792f754383aa61632167d066e::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit695d781792f754383aa61632167d066e::$prefixDirsPsr4;
+
+        }, null, ClassLoader::class);
+    }
+}
diff --git a/tesseract/vendor/composer/installed.json b/tesseract/vendor/composer/installed.json
new file mode 100644
index 00000000..70bcc01c
--- /dev/null
+++ b/tesseract/vendor/composer/installed.json
@@ -0,0 +1,48 @@
+[
+    {
+        "name": "thiagoalessio/tesseract_ocr",
+        "version": "2.13.0",
+        "version_normalized": "2.13.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/thiagoalessio/tesseract-ocr-for-php.git",
+            "reference": "232a8cb9d571992f9bd1e263f2f6909cf6c173a1"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/thiagoalessio/tesseract-ocr-for-php/zipball/232a8cb9d571992f9bd1e263f2f6909cf6c173a1",
+            "reference": "232a8cb9d571992f9bd1e263f2f6909cf6c173a1",
+            "shasum": ""
+        },
+        "require": {
+            "php": "^5.3 || ^7.0 || ^8.0"
+        },
+        "require-dev": {
+            "phpunit/php-code-coverage": "^2.2.4 || ^9.0.0"
+        },
+        "time": "2023-10-05T21:14:48+00:00",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "thiagoalessio\\TesseractOCR\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "thiagoalessio",
+                "email": "thiagoalessio@me.com"
+            }
+        ],
+        "description": "A wrapper to work with Tesseract OCR inside PHP.",
+        "keywords": [
+            "OCR",
+            "Tesseract",
+            "text recognition"
+        ]
+    }
+]
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/.appveyor.yml b/tesseract/vendor/thiagoalessio/tesseract_ocr/.appveyor.yml
new file mode 100644
index 00000000..1debc1a1
--- /dev/null
+++ b/tesseract/vendor/thiagoalessio/tesseract_ocr/.appveyor.yml
@@ -0,0 +1,14 @@
+---
+build: false
+
+install:
+  - ps: Set-Service wuauserv -StartupType Manual
+  - choco install php
+  - choco install capture2text --version 3.9
+  - choco install composer
+  - refreshenv
+  - cd %APPVEYOR_BUILD_FOLDER%
+  - composer install
+
+test_script:
+  - php tests\run.php unit e2e
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/MIT-LICENSE b/tesseract/vendor/thiagoalessio/tesseract_ocr/MIT-LICENSE
new file mode 100644
index 00000000..448104d6
--- /dev/null
+++ b/tesseract/vendor/thiagoalessio/tesseract_ocr/MIT-LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2012-2021 Thiago Alessio Pereira
+
+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/tesseract/vendor/thiagoalessio/tesseract_ocr/README.md b/tesseract/vendor/thiagoalessio/tesseract_ocr/README.md
new file mode 100644
index 00000000..b828344c
--- /dev/null
+++ b/tesseract/vendor/thiagoalessio/tesseract_ocr/README.md
@@ -0,0 +1,508 @@
+<img src="https://thiagoalessio.github.io/tesseract-ocr-for-php/images/logo.png" alt="Tesseract OCR for PHP" align="right" width="320px"/>
+
+# Tesseract OCR for PHP
+
+A wrapper to work with Tesseract OCR inside PHP.
+
+[![CI][ci_badge]][ci]
+[![AppVeyor][appveyor_badge]][appveyor]
+[![Codacy][codacy_badge]][codacy]
+[![Test Coverage][test_coverage_badge]][test_coverage]
+<br/>
+[![Latest Stable Version][stable_version_badge]][packagist]
+[![Total Downloads][total_downloads_badge]][packagist]
+[![Monthly Downloads][monthly_downloads_badge]][packagist]
+
+## Installation
+
+Via [Composer][]:
+
+    $ composer require thiagoalessio/tesseract_ocr
+
+:bangbang: **This library depends on [Tesseract OCR][], version _3.02_ or later.**
+
+<br/>
+
+### ![][windows_icon] Note for Windows users
+
+There are [many ways][tesseract_installation_on_windows] to install
+[Tesseract OCR][] on your system, but if you just want something quick to
+get up and running, I recommend installing the [Capture2Text][] package with
+[Chocolatey][].
+
+    choco install capture2text --version 3.9
+
+:warning: Recent versions of [Capture2Text][] stopped shipping the `tesseract` binary.
+
+<br/>
+
+### ![][macos_icon] Note for macOS users
+
+With [MacPorts][] you can install support for individual languages, like so:
+
+    $ sudo port install tesseract-<langcode>
+
+But that is not possible with [Homebrew][]. It comes only with **English** support
+by default, so if you intend to use it for other language, the quickest solution
+is to install them all:
+
+    $ brew install tesseract tesseract-lang
+
+<br/>
+
+## Usage
+
+### Basic usage
+
+<img align="right" width="50%" title="The quick brown fox jumps over the lazy dog." src="./tests/EndToEnd/images/text.png"/>
+
+```php
+use thiagoalessio\TesseractOCR\TesseractOCR;
+echo (new TesseractOCR('text.png'))
+    ->run();
+```
+
+```
+The quick brown fox
+jumps over
+the lazy dog.
+```
+
+<br/>
+
+### Other languages
+
+<img align="right" width="50%" title="Bülowstraße" src="./tests/EndToEnd/images/german.png"/>
+
+```php
+use thiagoalessio\TesseractOCR\TesseractOCR;
+echo (new TesseractOCR('german.png'))
+    ->lang('deu')
+    ->run();
+```
+
+```
+Bülowstraße
+```
+
+<br/>
+
+### Multiple languages
+
+<img align="right" width="50%" title="I eat すし y Pollo" src="./tests/EndToEnd/images/mixed-languages.png"/>
+
+```php
+use thiagoalessio\TesseractOCR\TesseractOCR;
+echo (new TesseractOCR('mixed-languages.png'))
+    ->lang('eng', 'jpn', 'spa')
+    ->run();
+```
+
+```
+I eat すし y Pollo
+```
+
+<br/>
+
+### Inducing recognition
+
+<img align="right" width="50%" title="8055" src="./tests/EndToEnd/images/8055.png"/>
+
+```php
+use thiagoalessio\TesseractOCR\TesseractOCR;
+echo (new TesseractOCR('8055.png'))
+    ->allowlist(range('A', 'Z'))
+    ->run();
+```
+
+```
+BOSS
+```
+
+<br/>
+
+### Breaking CAPTCHAs
+
+Yes, I know some of you might want to use this library for the *noble* purpose
+of breaking CAPTCHAs, so please take a look at this comment:
+
+<https://github.com/thiagoalessio/tesseract-ocr-for-php/issues/91#issuecomment-342290510>
+
+## API
+
+### run
+
+Executes a `tesseract` command, optionally receiving an integer as `timeout`,
+in case you experience stalled tesseract processes.
+
+```php
+$ocr = new TesseractOCR();
+$ocr->run();
+```
+```php
+$ocr = new TesseractOCR();
+$timeout = 500;
+$ocr->run($timeout);
+```
+
+### image
+
+Define the path of an image to be recognized by `tesseract`.
+
+```php
+$ocr = new TesseractOCR();
+$ocr->image('/path/to/image.png');
+$ocr->run();
+```
+
+### imageData
+
+Set the image to be recognized by `tesseract` from a string, with its size.
+This can be useful when dealing with files that are already loaded in memory.
+You can easily retrieve the image data and size of an image object :
+```php
+//Using Imagick
+$data = $img->getImageBlob();
+$size = $img->getImageLength();
+//Using GD
+ob_start();
+// Note that you can use any format supported by tesseract
+imagepng($img, null, 0);
+$size = ob_get_length();
+$data = ob_get_clean();
+
+$ocr = new TesseractOCR();
+$ocr->imageData($data, $size);
+$ocr->run();
+```
+
+### executable
+
+Define a custom location of the `tesseract` executable,
+if by any reason it is not present in the `$PATH`.
+
+```php
+echo (new TesseractOCR('img.png'))
+    ->executable('/path/to/tesseract')
+    ->run();
+```
+
+### version
+
+Returns the current version of `tesseract`.
+
+```php
+echo (new TesseractOCR())->version();
+```
+
+### availableLanguages
+
+Returns a list of available languages/scripts.
+
+```php
+foreach((new TesseractOCR())->availableLanguages() as $lang) echo $lang;
+```
+
+__More info:__ <https://github.com/tesseract-ocr/tesseract/blob/master/doc/tesseract.1.asc#languages-and-scripts>
+
+### tessdataDir
+
+Specify a custom location for the tessdata directory.
+
+```php
+echo (new TesseractOCR('img.png'))
+    ->tessdataDir('/path')
+    ->run();
+```
+
+### userWords
+
+Specify the location of user words file.
+
+This is a plain text file containing a list of words that you want to be
+considered as a normal dictionary words by `tesseract`.
+
+Useful when dealing with contents that contain technical terminology, jargon,
+etc.
+
+```
+$ cat /path/to/user-words.txt
+foo
+bar
+```
+
+```php
+echo (new TesseractOCR('img.png'))
+    ->userWords('/path/to/user-words.txt')
+    ->run();
+```
+
+### userPatterns
+
+Specify the location of user patterns file.
+
+If the contents you are dealing with have known patterns, this option can help
+a lot tesseract's recognition accuracy.
+
+```
+$ cat /path/to/user-patterns.txt'
+1-\d\d\d-GOOG-441
+www.\n\\\*.com
+```
+
+```php
+echo (new TesseractOCR('img.png'))
+    ->userPatterns('/path/to/user-patterns.txt')
+    ->run();
+```
+
+### lang
+
+Define one or more languages to be used during the recognition.
+A complete list of available languages can be found at:
+<https://github.com/tesseract-ocr/tesseract/blob/master/doc/tesseract.1.asc#languages>
+
+__Tip from [@daijiale][]:__ Use the combination `->lang('chi_sim', 'chi_tra')`
+for proper recognition of Chinese.
+
+```php
+ echo (new TesseractOCR('img.png'))
+     ->lang('lang1', 'lang2', 'lang3')
+     ->run();
+```
+
+### psm
+
+Specify the Page Segmentation Method, which instructs `tesseract` how to
+interpret the given image.
+
+__More info:__ <https://github.com/tesseract-ocr/tesseract/wiki/ImproveQuality#page-segmentation-method>
+
+```php
+echo (new TesseractOCR('img.png'))
+    ->psm(6)
+    ->run();
+```
+
+### oem
+
+Specify the OCR Engine Mode. (see `tesseract --help-oem`)
+
+```php
+echo (new TesseractOCR('img.png'))
+    ->oem(2)
+    ->run();
+```
+
+### dpi
+
+Specify the image DPI. It is useful if your image does not contain this information in its metadata.
+
+```php
+echo (new TesseractOCR('img.png'))
+    ->dpi(300)
+    ->run();
+```
+
+### allowlist
+
+This is a shortcut for `->config('tessedit_char_whitelist', 'abcdef....')`.
+
+```php
+echo (new TesseractOCR('img.png'))
+    ->allowlist(range('a', 'z'), range(0, 9), '-_@')
+    ->run();
+```
+
+### configFile
+
+Specify a config file to be used. It can either be the path to your own
+config file or the name of one of the predefined config files:
+<https://github.com/tesseract-ocr/tesseract/tree/master/tessdata/configs>
+
+```php
+echo (new TesseractOCR('img.png'))
+    ->configFile('hocr')
+    ->run();
+```
+
+### setOutputFile
+
+Specify an Outputfile to be used. Be aware: If you set an outputfile then
+the option `withoutTempFiles` is ignored.
+Tempfiles are written (and deleted) even if `withoutTempFiles = true`.
+
+In combination with `configFile` you are able to get the `hocr`, `tsv` or
+`pdf` files.
+
+```php
+echo (new TesseractOCR('img.png'))
+    ->configFile('pdf')
+    ->setOutputFile('/PATH_TO_MY_OUTPUTFILE/searchable.pdf')
+    ->run();
+```
+
+### digits
+
+Shortcut for `->configFile('digits')`.
+
+```php
+echo (new TesseractOCR('img.png'))
+    ->digits()
+    ->run();
+```
+
+### hocr
+
+Shortcut for `->configFile('hocr')`.
+
+```php
+echo (new TesseractOCR('img.png'))
+    ->hocr()
+    ->run();
+```
+
+### pdf
+
+Shortcut for `->configFile('pdf')`.
+
+```php
+echo (new TesseractOCR('img.png'))
+    ->pdf()
+    ->run();
+```
+
+### quiet
+
+Shortcut for `->configFile('quiet')`.
+
+```php
+echo (new TesseractOCR('img.png'))
+    ->quiet()
+    ->run();
+```
+
+### tsv
+
+Shortcut for `->configFile('tsv')`.
+
+```php
+echo (new TesseractOCR('img.png'))
+    ->tsv()
+    ->run();
+```
+
+### txt
+
+Shortcut for `->configFile('txt')`.
+
+```php
+echo (new TesseractOCR('img.png'))
+    ->txt()
+    ->run();
+```
+
+### tempDir
+
+Define a custom directory to store temporary files generated by tesseract.
+Make sure the directory actually exists and the user running `php` is allowed
+to write in there.
+
+```php
+echo (new TesseractOCR('img.png'))
+    ->tempDir('./my/custom/temp/dir')
+    ->run();
+```
+
+### withoutTempFiles
+
+Specify that `tesseract` should output the recognized text without writing to temporary files.
+The data is gathered from the standard output of `tesseract` instead.
+
+```php
+echo (new TesseractOCR('img.png'))
+    ->withoutTempFiles()
+    ->run();
+```
+
+### Other options
+
+Any configuration option offered by Tesseract can be used like that:
+
+```php
+echo (new TesseractOCR('img.png'))
+    ->config('config_var', 'value')
+    ->config('other_config_var', 'other value')
+    ->run();
+```
+
+Or like that:
+
+```php
+echo (new TesseractOCR('img.png'))
+    ->configVar('value')
+    ->otherConfigVar('other value')
+    ->run();
+```
+
+__More info:__ <https://github.com/tesseract-ocr/tesseract/wiki/ControlParams>
+
+### Thread-limit
+
+Sometimes, it may be useful to limit the number of threads that tesseract is
+allowed to use (e.g. in [this case](https://github.com/tesseract-ocr/tesseract/issues/898)).
+Set the maxmium number of threads as param for the `run` function:
+
+```php
+echo (new TesseractOCR('img.png'))
+    ->threadLimit(1)
+    ->run();
+```
+
+## How to contribute
+
+You can contribute to this project by:
+
+* Opening an [Issue][] if you found a bug or wish to propose a new feature;
+* Placing a [Pull Request][] with code that fix a bug, missing/wrong documentation
+  or implement a new feature;
+
+Just make sure you take a look at our [Code of Conduct][] and [Contributing][]
+instructions.
+
+## License
+
+tesseract-ocr-for-php is released under the [MIT License][].
+
+
+<h2></h2><p align="center"><sub>Made with <sub><a href="#"><img src="https://thiagoalessio.github.io/tesseract-ocr-for-php/images/heart.svg" alt="love" width="14px"/></a></sub> in Berlin</sub></p>
+
+[ci_badge]: https://github.com/thiagoalessio/tesseract-ocr-for-php/workflows/CI/badge.svg?event=push&branch=main
+[ci]: https://github.com/thiagoalessio/tesseract-ocr-for-php/actions?query=workflow%3ACI
+[appveyor_badge]: https://ci.appveyor.com/api/projects/status/xwy5ls0798iwcim3/branch/main?svg=true
+[appveyor]: https://ci.appveyor.com/project/thiagoalessio/tesseract-ocr-for-php/branch/main
+[codacy_badge]: https://app.codacy.com/project/badge/Grade/a81aa10012874f23a57df5b492d835f2
+[codacy]: https://www.codacy.com/gh/thiagoalessio/tesseract-ocr-for-php/dashboard
+[test_coverage_badge]: https://codecov.io/gh/thiagoalessio/tesseract-ocr-for-php/branch/main/graph/badge.svg?token=Y0VnrqiSIf
+[test_coverage]: https://codecov.io/gh/thiagoalessio/tesseract-ocr-for-php
+[stable_version_badge]: https://img.shields.io/packagist/v/thiagoalessio/tesseract_ocr.svg
+[packagist]: https://packagist.org/packages/thiagoalessio/tesseract_ocr
+[total_downloads_badge]: https://img.shields.io/packagist/dt/thiagoalessio/tesseract_ocr.svg
+[monthly_downloads_badge]: https://img.shields.io/packagist/dm/thiagoalessio/tesseract_ocr.svg
+[Tesseract OCR]: https://github.com/tesseract-ocr/tesseract
+[Composer]: http://getcomposer.org/
+[windows_icon]: https://thiagoalessio.github.io/tesseract-ocr-for-php/images/windows-18.svg
+[macos_icon]: https://thiagoalessio.github.io/tesseract-ocr-for-php/images/apple-18.svg
+[tesseract_installation_on_windows]: https://github.com/tesseract-ocr/tesseract/wiki#windows
+[Capture2Text]: https://chocolatey.org/packages/capture2text
+[Chocolatey]: https://chocolatey.org
+[MacPorts]: https://www.macports.org
+[Homebrew]: https://brew.sh
+[@daijiale]: https://github.com/daijiale
+[HOCR]: https://github.com/tesseract-ocr/tesseract/wiki/Command-Line-Usage#hocr-output
+[TSV]: https://github.com/tesseract-ocr/tesseract/wiki/Command-Line-Usage#tsv-output-currently-available-in-305-dev-in-master-branch-on-github
+[Issue]: https://github.com/thiagoalessio/tesseract-ocr-for-php/issues
+[Pull Request]: https://github.com/thiagoalessio/tesseract-ocr-for-php/pulls
+[Code of Conduct]: https://github.com/thiagoalessio/tesseract-ocr-for-php/blob/main/.github/CODE_OF_CONDUCT.md
+[Contributing]: https://github.com/thiagoalessio/tesseract-ocr-for-php/blob/main/.github/CONTRIBUTING.md
+[MIT License]: https://github.com/thiagoalessio/tesseract-ocr-for-php/blob/main/MIT-LICENSE
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/codecov.yml b/tesseract/vendor/thiagoalessio/tesseract_ocr/codecov.yml
new file mode 100644
index 00000000..8fd4c921
--- /dev/null
+++ b/tesseract/vendor/thiagoalessio/tesseract_ocr/codecov.yml
@@ -0,0 +1,4 @@
+fixes:
+- "/home/runner/work/tesseract-ocr-for-php/tesseract-ocr-for-php/::"
+- "/Users/runner/work/tesseract-ocr-for-php/tesseract-ocr-for-php/::"
+- "C:\\projects\\tesseract-ocr-for-php\\::"
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/composer.json b/tesseract/vendor/thiagoalessio/tesseract_ocr/composer.json
new file mode 100644
index 00000000..9a07e6d5
--- /dev/null
+++ b/tesseract/vendor/thiagoalessio/tesseract_ocr/composer.json
@@ -0,0 +1,35 @@
+{
+	"name": "thiagoalessio/tesseract_ocr",
+	"description": "A wrapper to work with Tesseract OCR inside PHP.",
+	"version": "2.13.0",
+	"type": "library",
+	"keywords": ["Tesseract", "OCR", "text recognition"],
+	"license": "MIT",
+	"authors": [
+		{
+			"name": "thiagoalessio",
+			"email": "thiagoalessio@me.com"
+		}
+	],
+	"support": {
+		"issues": "https://github.com/thiagoalessio/tesseract-ocr-for-php/issues",
+		"irc": "irc://irc.freenode.net/tesseract-ocr-for-php",
+		"source": "https://github.com/thiagoalessio/tesseract-ocr-for-php"
+	},
+	"require": {
+		"php": "^5.3 || ^7.0 || ^8.0"
+	},
+	"require-dev": {
+		"phpunit/php-code-coverage": "^2.2.4 || ^9.0.0"
+	},
+	"autoload": {
+		"psr-4": {
+			"thiagoalessio\\TesseractOCR\\": "src/"
+		}
+	},
+	"autoload-dev": {
+		"psr-4": {
+			"thiagoalessio\\TesseractOCR\\Tests\\": "tests/"
+		}
+	}
+}
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/Command.php b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/Command.php
new file mode 100644
index 00000000..ad123e82
--- /dev/null
+++ b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/Command.php
@@ -0,0 +1,80 @@
+<?php namespace thiagoalessio\TesseractOCR;
+
+class Command
+{
+	public $executable = 'tesseract';
+	public $useFileAsInput = true;
+	public $useFileAsOutput = true;
+	public $options = array();
+	public $configFile;
+	public $tempDir;
+	public $threadLimit;
+	public $image;
+	public $imageSize;
+	private $outputFile;
+
+	public function __construct($image=null, $outputFile=null)
+	{
+		$this->image = $image;
+		$this->outputFile = $outputFile;
+	}
+
+	public function build() { return "$this"; }
+
+	public function __toString()
+	{
+		$cmd = array();
+		if ($this->threadLimit) $cmd[] = "OMP_THREAD_LIMIT={$this->threadLimit}";
+		$cmd[] = self::escape($this->executable);
+		$cmd[] = $this->useFileAsInput ? self::escape($this->image) : "-";
+		$cmd[] = $this->useFileAsOutput ? self::escape($this->getOutputFile(false)) : "-";
+
+		$version = $this->getTesseractVersion();
+
+		foreach ($this->options as $option) {
+			$cmd[] = is_callable($option) ? $option($version) : "$option";
+		}
+		if ($this->configFile) $cmd[] = $this->configFile;
+
+		return join(' ', $cmd);
+	}
+
+	public function getOutputFile($withExt=true)
+	{
+		if (!$this->outputFile)
+			$this->outputFile = $this->getTempDir()
+				.DIRECTORY_SEPARATOR
+				.basename(tempnam($this->getTempDir(), 'ocr'));
+		if (!$withExt) return $this->outputFile;
+
+		$hasCustomExt = array('hocr', 'tsv', 'pdf');
+		$ext = in_array($this->configFile, $hasCustomExt) ? $this->configFile : 'txt';
+		return "{$this->outputFile}.{$ext}";
+	}
+
+	public function getTempDir()
+	{
+		return $this->tempDir ?: sys_get_temp_dir();
+	}
+
+	public function getTesseractVersion()
+	{
+		exec(self::escape($this->executable).' --version 2>&1', $output);
+		$outputParts = explode(' ', $output[0]);
+		return $outputParts[1];
+	}
+
+	public function getAvailableLanguages()
+	{
+		exec(self::escape($this->executable) . ' --list-langs 2>&1', $output);
+		array_shift($output);
+		sort($output);
+		return $output;
+	}
+
+	public static function escape($str)
+	{
+		$charlist = strtoupper(substr(PHP_OS, 0, 3)) == 'WIN' ? '$"`' : '$"\\`';
+		return '"'.addcslashes($str, $charlist).'"';
+	}
+}
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/FeatureNotAvailableException.php b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/FeatureNotAvailableException.php
new file mode 100644
index 00000000..12264f5c
--- /dev/null
+++ b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/FeatureNotAvailableException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace thiagoalessio\TesseractOCR;
+
+class FeatureNotAvailableException extends TesseractOcrException
+{
+}
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/FriendlyErrors.php b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/FriendlyErrors.php
new file mode 100644
index 00000000..93c7caa9
--- /dev/null
+++ b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/FriendlyErrors.php
@@ -0,0 +1,120 @@
+<?php namespace thiagoalessio\TesseractOCR;
+
+class FriendlyErrors
+{
+	public static function checkImagePath($image)
+	{
+		if (file_exists($image)) return;
+
+		$currentDir = __DIR__;
+		$msg = array();
+		$msg[] = "Error! The image \"$image\" was not found.";
+		$msg[] = '';
+		$msg[] = "The current __DIR__ is $currentDir";
+		$msg = join(PHP_EOL, $msg);
+
+		throw new ImageNotFoundException($msg);
+	}
+
+	public static function checkTesseractPresence($executable)
+	{
+		if (file_exists($executable)) return;
+
+		$cmd = stripos(PHP_OS, 'win') === 0
+			? 'where.exe '.Command::escape($executable).' > NUL 2>&1'
+			: 'type '.Command::escape($executable).' > /dev/null 2>&1';
+		system($cmd, $exitCode);
+
+		if ($exitCode == 0) return;
+
+		$currentPath = getenv('PATH');
+		$msg = array();
+		$msg[] = "Error! The command \"$executable\" was not found.";
+		$msg[] = '';
+		$msg[] = 'Make sure you have Tesseract OCR installed on your system:';
+		$msg[] = 'https://github.com/tesseract-ocr/tesseract';
+		$msg[] = '';
+		$msg[] = "The current \$PATH is $currentPath";
+		$msg = join(PHP_EOL, $msg);
+
+		throw new TesseractNotFoundException($msg);
+	}
+
+	public static function checkCommandExecution($command, $stdout, $stderr)
+	{
+		if ($command->useFileAsOutput) {
+		    $file = $command->getOutputFile();
+		    if (file_exists($file) && filesize($file) > 0)  return;
+		}
+
+		if (!$command->useFileAsOutput && $stdout) {
+			return;
+		}
+
+		$msg = array();
+		$msg[] = 'Error! The command did not produce any output.';
+		$msg[] = '';
+		$msg[] = 'Generated command:';
+		$msg[] = "$command";
+		$msg[] = '';
+		$msg[] = 'Returned message:';
+		$arrayStderr = explode(PHP_EOL, $stderr);
+		array_pop($arrayStderr);
+		$msg = array_merge($msg, $arrayStderr);
+		$msg = join(PHP_EOL, $msg);
+
+		throw new UnsuccessfulCommandException($msg);
+	}
+
+	public static function checkProcessCreation($processHandle, $command)
+	{
+		if ($processHandle !== FALSE) return;
+
+		$msg = array();
+		$msg[] = 'Error! The command could not be launched.';
+		$msg[] = '';
+		$msg[] = 'Generated command:';
+		$msg[] = "$command";
+		$msg = join(PHP_EOL, $msg);
+
+		throw new UnsuccessfulCommandException($msg);
+	}
+
+	public static function checkTesseractVersion($expected, $action, $command)
+	{
+		$actual = $command->getTesseractVersion();
+
+		if ($actual[0] === 'v')
+			$actual = substr($actual, 1);
+
+		if (version_compare($actual, $expected, ">=")) return;
+
+		$msg = array();
+		$msg[] = "Error! $action is not available this tesseract version";
+		$msg[] = "Required version is $expected, actual version is $actual";
+		$msg[] = '';
+		$msg[] = 'Generated command:';
+		$msg[] = "$command";
+		$msg = join(PHP_EOL, $msg);
+
+		throw new FeatureNotAvailableException($msg);
+	}
+
+	public static function checkWritePermissions($path)
+	{
+		if (!is_dir(dirname($path))) mkdir(dirname($path));
+		$writableDirectory = is_writable(dirname($path));
+		$writableFile = true;
+		if (file_exists($path)) $writableFile = is_writable($path);
+		if ($writableFile && $writableDirectory) return;
+
+		$msg = array();
+		$msg[] = "Error! No permission to write to $path";
+		$msg[] = "Make sure you have the right outputFile and permissions "
+			."to write to the folder";
+		$msg[] = '';
+		$msg = join(PHP_EOL, $msg);
+
+		throw new NoWritePermissionsForOutputFile($msg);
+	}
+}
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/ImageNotFoundException.php b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/ImageNotFoundException.php
new file mode 100644
index 00000000..2ba7df64
--- /dev/null
+++ b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/ImageNotFoundException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace thiagoalessio\TesseractOCR;
+
+class ImageNotFoundException extends TesseractOcrException
+{
+}
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/NoWritePermissionsForOutputFile.php b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/NoWritePermissionsForOutputFile.php
new file mode 100644
index 00000000..792a44e2
--- /dev/null
+++ b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/NoWritePermissionsForOutputFile.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace thiagoalessio\TesseractOCR;
+
+class NoWritePermissionsForOutputFile extends TesseractOcrException
+{
+}
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/Option.php b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/Option.php
new file mode 100644
index 00000000..f39782e5
--- /dev/null
+++ b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/Option.php
@@ -0,0 +1,79 @@
+<?php namespace thiagoalessio\TesseractOCR;
+
+class Option
+{
+	public static function psm($psm)
+	{
+		return function($version) use ($psm) {
+			$version = preg_replace('/^v/', '', $version);
+			return (version_compare($version, 4, '>=') ? '-' : '')."-psm $psm";
+		};
+	}
+
+	public static function oem($oem)
+	{
+		return function($version) use ($oem) {
+			Option::checkMinVersion('3.05', $version, 'oem');
+			return "--oem $oem";
+		};
+	}
+
+	public static function dpi($dpi)
+	{
+		return function() use ($dpi) {
+			return "--dpi $dpi";
+		};
+	}
+
+	public static function userWords($path)
+	{
+		return function($version) use ($path) {
+			Option::checkMinVersion('3.04', $version, 'user-words');
+			return '--user-words "'.addcslashes($path, '\\"').'"';
+		};
+	}
+
+	public static function userPatterns($path)
+	{
+		return function($version) use ($path) {
+			Option::checkMinVersion('3.04', $version, 'user-patterns');
+			return '--user-patterns "'.addcslashes($path, '\\"').'"';
+		};
+	}
+
+	public static function tessdataDir($path)
+	{
+		return function() use ($path) {
+			return '--tessdata-dir "'.addcslashes($path, '\\"').'"';
+		};
+	}
+
+	public static function lang()
+	{
+		$languages = func_get_args();
+		return function() use ($languages) {
+			return '-l '.join('+', $languages);
+		};
+	}
+
+	public static function config($var, $value)
+	{
+		return function() use($var, $value) {
+			$snakeCase = function($str) {
+				return strtolower(preg_replace('/([A-Z])+/', '_$1', $str));
+			};
+			$pair = $snakeCase($var).'='.$value;
+			return '-c "'.addcslashes($pair, '\\"').'"';
+		};
+	}
+
+	public static function checkMinVersion($minVersion, $currVersion, $option)
+	{
+		$minVersion = preg_replace('/^v/', '', $minVersion);
+		$currVersion = preg_replace('/^v/', '', $currVersion);
+		if (!version_compare($currVersion, $minVersion, '<')) return;
+		$msg = "$option option is only available on Tesseract $minVersion or later.";
+		$msg.= PHP_EOL."Your version of Tesseract is $currVersion";
+		throw new \Exception($msg);
+	}
+}
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/Process.php b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/Process.php
new file mode 100644
index 00000000..38460eb0
--- /dev/null
+++ b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/Process.php
@@ -0,0 +1,83 @@
+<?php namespace thiagoalessio\TesseractOCR;
+
+class Process {
+
+    private $stdin;
+    private $stdout;
+    private $stderr;
+    private $handle;
+    private $startTime;
+
+    public function __construct($command)
+    {
+        $this->startTime = microtime(true);
+        $streamDescriptors = [
+            array("pipe", "r"),
+            array("pipe", "w"),
+            array("pipe", "w")
+        ];
+        $this->handle = proc_open($command, $streamDescriptors, $pipes, NULL, NULL, ["bypass_shell" => true]);
+        list($this->stdin, $this->stdout, $this->stderr) = $pipes;
+
+        FriendlyErrors::checkProcessCreation($this->handle, $command);
+
+        //This is can avoid deadlock on some cases (when stderr buffer is filled up before writing to stdout and vice-versa)
+        stream_set_blocking($this->stdout, 0);
+        stream_set_blocking($this->stderr, 0);
+    }
+
+    public function write($data, $len)
+    {
+        $total = 0;
+        do
+        {
+            $res = fwrite($this->stdin, substr($data, $total));
+        } while($res && $total += $res < $len);
+        return $total === $len;
+    }
+
+
+    public function wait($timeout = 0)
+    {
+        $running = true;
+        $data = ["out" => "", "err" => ""];
+        while (($running === true) && !$this->hasTimedOut($timeout))
+        {
+            $data["out"] .= fread($this->stdout, 8192);
+            $data["err"] .= fread($this->stderr, 8192);
+            $procInfo = proc_get_status($this->handle);
+            $running = $procInfo["running"];
+            if ($running) {
+                usleep(1000); // Sleep 1ms to yield CPU time
+            }
+        }
+        return $data;
+    }
+
+    public function close()
+    {
+        $this->closeStream($this->stdin);
+        $this->closeStream($this->stdout);
+        $this->closeStream($this->stderr);
+        return proc_close($this->handle);
+    }
+
+    public function closeStdin()
+    {
+        $this->closeStream($this->stdin);
+    }
+
+    private function hasTimedOut($timeout)
+    {
+        return (($timeout > 0) &&  ($this->startTime + $timeout < microtime(true)));    
+    }
+    
+    private function closeStream(&$stream)
+    {
+        if ($stream !== NULL)
+        {
+            fclose($stream);
+            $stream = NULL;
+        }
+    }
+}
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/TesseractNotFoundException.php b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/TesseractNotFoundException.php
new file mode 100644
index 00000000..7b7f0c1e
--- /dev/null
+++ b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/TesseractNotFoundException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace thiagoalessio\TesseractOCR;
+
+class TesseractNotFoundException extends TesseractOcrException
+{
+}
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/TesseractOCR.php b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/TesseractOCR.php
new file mode 100644
index 00000000..343e8ae8
--- /dev/null
+++ b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/TesseractOCR.php
@@ -0,0 +1,181 @@
+<?php namespace thiagoalessio\TesseractOCR;
+
+use thiagoalessio\TesseractOCR\Command;
+use thiagoalessio\TesseractOCR\Option;
+use thiagoalessio\TesseractOCR\FriendlyErrors;
+
+class TesseractOCR
+{
+	public $command;
+	private $outputFile = null;
+
+	public function __construct($image=null, $command=null)
+	{
+		$this->command = $command ?: new Command;
+		$this->image("$image");
+	}
+
+	public function run($timeout = 0)
+	{
+		try {
+			if ($this->outputFile !== null) {
+				FriendlyErrors::checkWritePermissions($this->outputFile);
+				$this->command->useFileAsOutput = true;
+			}
+
+			FriendlyErrors::checkTesseractPresence($this->command->executable);
+			if ($this->command->useFileAsInput) {
+				FriendlyErrors::checkImagePath($this->command->image);
+			}
+
+			$process = new Process("{$this->command}");
+
+			if (!$this->command->useFileAsInput) {
+				$process->write($this->command->image, $this->command->imageSize);
+				$process->closeStdin();
+			}
+			$output = $process->wait($timeout);
+
+			FriendlyErrors::checkCommandExecution($this->command, $output["out"], $output["err"]);
+		}
+		catch (TesseractOcrException $e) {
+			if ($this->command->useFileAsOutput) $this->cleanTempFiles();
+			throw $e;
+		}
+
+		if ($this->command->useFileAsOutput) {
+			$text = file_get_contents($this->command->getOutputFile());
+
+			if ($this->outputFile !== null) {
+				rename($this->command->getOutputFile(), $this->outputFile);
+			}
+
+			$this->cleanTempFiles();
+		}
+		else
+			$text = $output["out"];
+
+		return trim($text, " \t\n\r\0\x0A\x0B\x0C");
+	}
+
+	public function imageData($image, $size)
+	{
+		FriendlyErrors::checkTesseractVersion("3.03-rc1", "Reading image data from stdin", $this->command);
+		$this->command->useFileAsInput = false;
+		$this->command->image = $image;
+		$this->command->imageSize = $size;
+		return $this;
+	}
+
+	public function withoutTempFiles()
+	{
+		FriendlyErrors::checkTesseractVersion("3.03-rc1", "Writing to stdout (without using temp files)", $this->command);
+		$this->command->useFileAsOutput = false;
+		return $this;
+	}
+
+	public function image($image)
+	{
+		$this->command->image = $image;
+		return $this;
+	}
+
+	public function executable($executable)
+	{
+		FriendlyErrors::checkTesseractPresence($executable);
+		$this->command->executable = $executable;
+		return $this;
+	}
+
+	public function configFile($configFile)
+	{
+		$this->command->configFile = $configFile;
+		return $this;
+	}
+
+	public function tempDir($tempDir)
+	{
+		$this->command->tempDir = $tempDir;
+		return $this;
+	}
+
+	public function threadLimit($limit)
+	{
+		$this->command->threadLimit = $limit;
+		return $this;
+	}
+
+	// @deprecated
+	public function format($fmt) { return $this->configFile($fmt); }
+
+	public function setOutputFile($path) {
+		$this->outputFile = $path;
+		return $this;
+	}
+
+	public function allowlist()
+	{
+		$concat = function ($arg) { return is_array($arg) ? join('', $arg) : $arg; };
+		$allowlist = join('', array_map($concat, func_get_args()));
+		$this->command->options[] = Option::config('tessedit_char_whitelist', $allowlist);
+		return $this;
+	}
+
+	public function whitelist()
+	{
+		$warningMsg = 'Notice: whitelist is deprecated, use allowlist instead.';
+		trigger_error($warningMsg, E_USER_NOTICE);
+
+		$concat = function ($arg) { return is_array($arg) ? join('', $arg) : $arg; };
+		$allowlist = join('', array_map($concat, func_get_args()));
+		return $this->allowlist($allowlist);
+	}
+
+	public function version()
+	{
+		return $this->command->getTesseractVersion();
+	}
+
+	public function availableLanguages()
+	{
+		return $this->command->getAvailableLanguages();
+	}
+
+	public function __call($method, $args)
+	{
+		if ($this->isConfigFile($method)) return $this->configFile($method);
+		if ($this->isOption($method)) {
+			$option = $this->getOptionClassName().'::'.$method;
+			$this->command->options[] = call_user_func_array($option, $args);
+			return $this;
+		}
+		$arg = empty($args) ? null : $args[0];
+		$this->command->options[] = Option::config($method, $arg);
+		return $this;
+	}
+
+	private function isConfigFile($name)
+	{
+		return in_array($name, array('digits', 'hocr', 'pdf', 'quiet', 'tsv', 'txt'));
+	}
+
+	private function isOption($name)
+	{
+		return in_array($name, get_class_methods($this->getOptionClassName()));
+	}
+
+	private function getOptionClassName()
+	{
+		return __NAMESPACE__.'\\Option';
+	}
+
+	private function cleanTempFiles()
+	{
+		if (file_exists($this->command->getOutputFile(false))) {
+			unlink($this->command->getOutputFile(false));
+		}
+		if (file_exists($this->command->getOutputFile(true))) {
+			unlink($this->command->getOutputFile(true));
+		}
+	}
+}
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/TesseractOcrException.php b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/TesseractOcrException.php
new file mode 100644
index 00000000..8c078616
--- /dev/null
+++ b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/TesseractOcrException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace thiagoalessio\TesseractOCR;
+
+abstract class TesseractOcrException extends \Exception
+{
+}
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/UnsuccessfulCommandException.php b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/UnsuccessfulCommandException.php
new file mode 100644
index 00000000..201b3524
--- /dev/null
+++ b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/UnsuccessfulCommandException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace thiagoalessio\TesseractOCR;
+
+class UnsuccessfulCommandException extends TesseractOcrException
+{
+}

From 07a7a87c37e73473dd0333c594942dec7877022c Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 15 Jan 2024 20:09:03 +0000
Subject: [PATCH 005/294] README.md created

---
 tesseract/README.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 tesseract/README.md

diff --git a/tesseract/README.md b/tesseract/README.md
new file mode 100644
index 00000000..d0b5eee2
--- /dev/null
+++ b/tesseract/README.md
@@ -0,0 +1 @@
+To make the addon work, you have to install the tesseract-ocr command line tool.
\ No newline at end of file

From c28af61873b71b5de2d1cdd4ebb64cd3ec535960 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 21 Jan 2024 21:24:08 +0000
Subject: [PATCH 006/294] Twitter: Fix error after posting

---
 twitter/twitter.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 8c906daf..b01345b7 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -362,7 +362,7 @@ function twitter_post(int $uid, string $url, string $type, array $data): stdClas
 	]);
 
 	$response = $client->post($url, ['auth' => 'oauth', $type => $data]);
-	$body     = $response->getBodyString()->getContents();
+	$body     = $response->getBody()->getContents();
 
 	$status = [
 		'code'    => $response->getStatusCode(),
@@ -399,7 +399,7 @@ function twitter_test_connection(int $uid)
 		$status = [
 			'code'   => $response->getStatusCode(),
 			'reason'  => $response->getReasonPhrase(),
-			'content' => $response->getBodyString()->getContents()
+			'content' => $response->getBody()->getContents()
 		];
 		DI::pConfig()->set(1, 'twitter', 'last_status',  $status);
 		Logger::info('Test successful', ['uid' => $uid]);

From a30e9b788c427c73b3e3a0b621d70cb85de38eb1 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Fri, 12 Jan 2024 00:08:24 -0500
Subject: [PATCH 007/294] [advancedcontentfilter] Migrate Slim to version 4 to
 avoid PHP 8.2 deprecation error

- Fix https://github.com/friendica/friendica/issues/13822
---
 .../advancedcontentfilter.php                 |   24 +-
 advancedcontentfilter/composer.json           |    3 +-
 advancedcontentfilter/composer.lock           |  553 +++++---
 advancedcontentfilter/src/middlewares.php     |   33 +-
 advancedcontentfilter/src/routes.php          |   21 +-
 .../vendor/composer/ClassLoader.php           |    6 +-
 .../vendor/composer/autoload_classmap.php     |  133 +-
 .../vendor/composer/autoload_namespaces.php   |    1 -
 .../vendor/composer/autoload_psr4.php         |    4 +-
 .../vendor/composer/autoload_real.php         |    3 +
 .../vendor/composer/autoload_static.php       |  161 +--
 .../vendor/composer/installed.json            |  572 +++++---
 .../container-interop/.gitignore              |    3 -
 .../container-interop/LICENSE                 |   20 -
 .../container-interop/README.md               |  148 --
 .../container-interop/composer.json           |   15 -
 .../docs/ContainerInterface-meta.md           |  114 --
 .../docs/ContainerInterface.md                |  158 ---
 .../docs/Delegate-lookup-meta.md              |  259 ----
 .../container-interop/docs/Delegate-lookup.md |   60 -
 .../docs/images/interoperating_containers.png |  Bin 25738 -> 0 bytes
 .../docs/images/priority.png                  |  Bin 16252 -> 0 bytes
 .../docs/images/side_by_side_containers.png   |  Bin 16265 -> 0 bytes
 .../Interop/Container/ContainerInterface.php  |   15 -
 .../Exception/ContainerException.php          |   15 -
 .../Container/Exception/NotFoundException.php |   15 -
 .../vendor/pimple/pimple/.gitignore           |    3 -
 .../vendor/pimple/pimple/.travis.yml          |   40 -
 .../vendor/pimple/pimple/CHANGELOG            |   59 -
 .../vendor/pimple/pimple/README.rst           |  326 -----
 .../vendor/pimple/pimple/composer.json        |   29 -
 .../pimple/pimple/ext/pimple/.gitignore       |   30 -
 .../vendor/pimple/pimple/ext/pimple/README.md |   12 -
 .../vendor/pimple/pimple/ext/pimple/config.m4 |   63 -
 .../pimple/pimple/ext/pimple/config.w32       |   13 -
 .../pimple/pimple/ext/pimple/php_pimple.h     |  137 --
 .../vendor/pimple/pimple/ext/pimple/pimple.c  | 1114 ---------------
 .../pimple/pimple/ext/pimple/pimple_compat.h  |   81 --
 .../pimple/pimple/ext/pimple/tests/001.phpt   |   45 -
 .../pimple/pimple/ext/pimple/tests/002.phpt   |   15 -
 .../pimple/pimple/ext/pimple/tests/003.phpt   |   16 -
 .../pimple/pimple/ext/pimple/tests/004.phpt   |   30 -
 .../pimple/pimple/ext/pimple/tests/005.phpt   |   27 -
 .../pimple/pimple/ext/pimple/tests/006.phpt   |   51 -
 .../pimple/pimple/ext/pimple/tests/007.phpt   |   22 -
 .../pimple/pimple/ext/pimple/tests/008.phpt   |   29 -
 .../pimple/pimple/ext/pimple/tests/009.phpt   |   13 -
 .../pimple/pimple/ext/pimple/tests/010.phpt   |   45 -
 .../pimple/pimple/ext/pimple/tests/011.phpt   |   19 -
 .../pimple/pimple/ext/pimple/tests/012.phpt   |   28 -
 .../pimple/pimple/ext/pimple/tests/013.phpt   |   33 -
 .../pimple/pimple/ext/pimple/tests/014.phpt   |   30 -
 .../pimple/pimple/ext/pimple/tests/015.phpt   |   17 -
 .../pimple/pimple/ext/pimple/tests/016.phpt   |   24 -
 .../pimple/pimple/ext/pimple/tests/017.phpt   |   17 -
 .../pimple/pimple/ext/pimple/tests/017_1.phpt |   17 -
 .../pimple/pimple/ext/pimple/tests/018.phpt   |   23 -
 .../pimple/pimple/ext/pimple/tests/019.phpt   |   18 -
 .../pimple/pimple/ext/pimple/tests/bench.phpb |   51 -
 .../pimple/ext/pimple/tests/bench_shared.phpb |   25 -
 .../vendor/pimple/pimple/phpunit.xml.dist     |   14 -
 .../pimple/pimple/src/Pimple/Container.php    |  298 ----
 .../Exception/ExpectedInvokableException.php  |   38 -
 .../Exception/FrozenServiceException.php      |   45 -
 .../InvalidServiceIdentifierException.php     |   45 -
 .../Exception/UnknownIdentifierException.php  |   45 -
 .../pimple/src/Pimple/Psr11/Container.php     |   55 -
 .../src/Pimple/Psr11/ServiceLocator.php       |   75 -
 .../pimple/src/Pimple/ServiceIterator.php     |   69 -
 .../src/Pimple/ServiceProviderInterface.php   |   46 -
 .../src/Pimple/Tests/Fixtures/Invokable.php   |   38 -
 .../Pimple/Tests/Fixtures/NonInvokable.php    |   34 -
 .../Tests/Fixtures/PimpleServiceProvider.php  |   54 -
 .../src/Pimple/Tests/Fixtures/Service.php     |   35 -
 .../PimpleServiceProviderInterfaceTest.php    |   76 -
 .../pimple/src/Pimple/Tests/PimpleTest.php    |  589 --------
 .../src/Pimple/Tests/Psr11/ContainerTest.php  |   77 --
 .../Pimple/Tests/Psr11/ServiceLocatorTest.php |  134 --
 .../src/Pimple/Tests/ServiceIteratorTest.php  |   52 -
 .../vendor/psr/container/README.md            |   14 +-
 .../vendor/psr/container/composer.json        |    6 +-
 .../src/ContainerExceptionInterface.php       |    7 +-
 .../psr/container/src/ContainerInterface.php  |    9 +-
 .../src/NotFoundExceptionInterface.php        |    3 -
 .../pimple => psr/http-factory}/LICENSE       |   12 +-
 .../vendor/psr/http-factory/README.md         |   12 +
 .../vendor/psr/http-factory/composer.json     |   35 +
 .../src/RequestFactoryInterface.php           |   18 +
 .../src/ResponseFactoryInterface.php          |   18 +
 .../src/ServerRequestFactoryInterface.php     |   24 +
 .../src/StreamFactoryInterface.php            |   45 +
 .../src/UploadedFileFactoryInterface.php      |   34 +
 .../http-factory/src/UriFactoryInterface.php  |   17 +
 .../vendor/psr/http-message/README.md         |    5 +-
 .../vendor/psr/http-message/composer.json     |    4 +-
 .../psr/http-message/docs/PSR7-Interfaces.md  |  130 ++
 .../psr/http-message/docs/PSR7-Usage.md       |  159 +++
 .../psr/http-message/src/MessageInterface.php |   16 +-
 .../psr/http-message/src/RequestInterface.php |   10 +-
 .../http-message/src/ResponseInterface.php    |    4 +-
 .../src/ServerRequestInterface.php            |    8 +-
 .../psr/http-message/src/StreamInterface.php  |   12 +-
 .../src/UploadedFileInterface.php             |    4 +-
 .../psr/http-message/src/UriInterface.php     |   17 +-
 .../vendor/psr/http-server-handler/LICENSE    |   21 +
 .../vendor/psr/http-server-handler/README.md  |   12 +
 .../psr/http-server-handler/composer.json     |   36 +
 .../src/RequestHandlerInterface.php           |   22 +
 .../vendor/psr/http-server-middleware/LICENSE |   21 +
 .../psr/http-server-middleware/README.md      |   12 +
 .../psr/http-server-middleware/composer.json  |   36 +
 .../src/MiddlewareInterface.php               |   25 +
 .../vendor/psr/log/.gitignore                 |    1 -
 .../vendor/psr/log/Psr/Log/AbstractLogger.php |   32 +-
 .../psr/log/Psr/Log/LoggerAwareTrait.php      |    2 +-
 .../psr/log/Psr/Log/LoggerInterface.php       |   40 +-
 .../vendor/psr/log/Psr/Log/LoggerTrait.php    |    2 +
 .../vendor/psr/log/Psr/Log/NullLogger.php     |    2 +
 .../vendor/psr/log/Psr/Log/Test/DummyTest.php |   18 +
 .../log/Psr/Log/Test/LoggerInterfaceTest.php  |   14 +-
 .../psr/log/Psr/Log/Test/TestLogger.php       |  147 ++
 .../vendor/psr/log/README.md                  |   13 +
 .../vendor/psr/log/composer.json              |    4 +-
 .../vendor/slim/slim/CHANGELOG.md             |  237 ++++
 .../vendor/slim/slim/LICENSE.md               |    2 +-
 .../vendor/slim/slim/MAINTAINERS.md           |   17 +
 .../vendor/slim/slim/SECURITY.md              |   14 +
 .../vendor/slim/slim/Slim/App.php             |  730 ++--------
 .../slim/slim/Slim/CallableResolver.php       |  227 ++-
 .../slim/Slim/CallableResolverAwareTrait.php  |   47 -
 .../vendor/slim/slim/Slim/Collection.php      |  202 ---
 .../vendor/slim/slim/Slim/Container.php       |  179 ---
 .../slim/Slim/DefaultServicesProvider.php     |  211 ---
 .../slim/slim/Slim/DeferredCallable.php       |   45 -
 .../slim/Slim/Error/AbstractErrorRenderer.php |   46 +
 .../Error/Renderers/HtmlErrorRenderer.php     |   84 ++
 .../Error/Renderers/JsonErrorRenderer.php     |   56 +
 .../Renderers/PlainTextErrorRenderer.php      |   59 +
 .../Slim/Error/Renderers/XmlErrorRenderer.php |   54 +
 .../Slim/Exception/ContainerException.php     |   20 -
 .../ContainerValueNotFoundException.php       |   20 -
 .../Exception/HttpBadRequestException.php     |   28 +
 .../slim/Slim/Exception/HttpException.php     |   64 +
 .../Slim/Exception/HttpForbiddenException.php |   27 +
 .../slim/Slim/Exception/HttpGoneException.php |   27 +
 .../HttpInternalServerErrorException.php      |   27 +
 .../HttpMethodNotAllowedException.php         |   52 +
 .../Slim/Exception/HttpNotFoundException.php  |   27 +
 .../Exception/HttpNotImplementedException.php |   27 +
 .../Exception/HttpSpecializedException.php    |   31 +
 .../Exception/HttpUnauthorizedException.php   |   27 +
 .../Slim/Exception/InvalidMethodException.php |   27 -
 .../Exception/MethodNotAllowedException.php   |   45 -
 .../slim/Slim/Exception/NotFoundException.php |   14 -
 .../slim/Slim/Exception/SlimException.php     |   69 -
 .../slim/slim/Slim/Factory/AppFactory.php     |  206 +++
 .../Slim/Factory/Psr17/GuzzlePsr17Factory.php |   19 +
 .../Factory/Psr17/HttpSoftPsr17Factory.php    |   19 +
 .../Psr17/LaminasDiactorosPsr17Factory.php    |   19 +
 .../Slim/Factory/Psr17/NyholmPsr17Factory.php |   36 +
 .../slim/Slim/Factory/Psr17/Psr17Factory.php  |  101 ++
 .../Factory/Psr17/Psr17FactoryProvider.php    |   53 +
 .../Factory/Psr17/ServerRequestCreator.php    |   44 +
 .../Factory/Psr17/SlimHttpPsr17Factory.php    |   39 +
 .../Psr17/SlimHttpServerRequestCreator.php    |   56 +
 .../Slim/Factory/Psr17/SlimPsr17Factory.php   |   19 +
 .../Factory/ServerRequestCreatorFactory.php   |   87 ++
 .../slim/slim/Slim/Handlers/AbstractError.php |   99 --
 .../slim/Slim/Handlers/AbstractHandler.php    |   59 -
 .../vendor/slim/slim/Slim/Handlers/Error.php  |  224 ---
 .../slim/slim/Slim/Handlers/ErrorHandler.php  |  308 +++++
 .../slim/slim/Slim/Handlers/NotAllowed.php    |  147 --
 .../slim/slim/Slim/Handlers/NotFound.php      |  141 --
 .../slim/slim/Slim/Handlers/PhpError.php      |  205 ---
 .../Handlers/Strategies/RequestHandler.php    |   48 +
 .../Handlers/Strategies/RequestResponse.php   |   19 +-
 .../Strategies/RequestResponseArgs.php        |   24 +-
 .../Strategies/RequestResponseNamedArgs.php   |   44 +
 .../vendor/slim/slim/Slim/Http/Body.php       |   22 -
 .../vendor/slim/slim/Slim/Http/Cookies.php    |  195 ---
 .../slim/slim/Slim/Http/Environment.php       |   63 -
 .../vendor/slim/slim/Slim/Http/Headers.php    |  222 ---
 .../vendor/slim/slim/Slim/Http/Message.php    |  305 ----
 .../vendor/slim/slim/Slim/Http/Request.php    | 1227 -----------------
 .../slim/slim/Slim/Http/RequestBody.php       |   27 -
 .../vendor/slim/slim/Slim/Http/Response.php   |  508 -------
 .../vendor/slim/slim/Slim/Http/Stream.php     |  450 ------
 .../slim/slim/Slim/Http/UploadedFile.php      |  327 -----
 .../vendor/slim/slim/Slim/Http/Uri.php        |  845 ------------
 .../AdvancedCallableResolverInterface.php     |   28 +
 .../Interfaces/CallableResolverInterface.php  |   22 +-
 .../Slim/Interfaces/CollectionInterface.php   |   32 -
 .../Slim/Interfaces/DispatcherInterface.php   |   28 +
 .../Slim/Interfaces/ErrorHandlerInterface.php |   26 +
 .../Interfaces/ErrorRendererInterface.php     |   18 +
 .../Slim/Interfaces/Http/CookiesInterface.php |   23 -
 .../Interfaces/Http/EnvironmentInterface.php  |   20 -
 .../Slim/Interfaces/Http/HeadersInterface.php |   24 -
 .../InvocationStrategyInterface.php           |   20 +-
 .../MiddlewareDispatcherInterface.php         |   42 +
 .../Slim/Interfaces/Psr17FactoryInterface.php |   48 +
 .../Psr17FactoryProviderInterface.php         |   26 +
 ...uestHandlerInvocationStrategyInterface.php |   15 +
 .../Interfaces/RouteCollectorInterface.php    |  102 ++
 .../RouteCollectorProxyInterface.php          |  118 ++
 .../Slim/Interfaces/RouteGroupInterface.php   |   51 +-
 .../slim/Slim/Interfaces/RouteInterface.php   |  151 +-
 .../Slim/Interfaces/RouteParserInterface.php  |   52 +
 .../Interfaces/RouteResolverInterface.php     |   17 +
 .../slim/Slim/Interfaces/RouterInterface.php  |  111 --
 .../ServerRequestCreatorInterface.php         |   18 +
 .../vendor/slim/slim/Slim/Logger.php          |   32 +
 .../Slim/Middleware/BodyParsingMiddleware.php |  196 +++
 .../Middleware/ContentLengthMiddleware.php    |   32 +
 .../slim/Slim/Middleware/ErrorMiddleware.php  |  212 +++
 .../Middleware/MethodOverrideMiddleware.php   |   43 +
 .../Middleware/OutputBufferingMiddleware.php  |   74 +
 .../Slim/Middleware/RoutingMiddleware.php     |   98 ++
 .../slim/slim/Slim/MiddlewareAwareTrait.php   |  121 --
 .../slim/slim/Slim/MiddlewareDispatcher.php   |  275 ++++
 .../vendor/slim/slim/Slim/ResponseEmitter.php |  136 ++
 .../vendor/slim/slim/Slim/Routable.php        |  106 --
 .../vendor/slim/slim/Slim/Route.php           |  349 -----
 .../vendor/slim/slim/Slim/RouteGroup.php      |   47 -
 .../vendor/slim/slim/Slim/Router.php          |  455 ------
 .../slim/slim/Slim/Routing/Dispatcher.php     |   78 ++
 .../slim/Slim/Routing/FastRouteDispatcher.php |  109 ++
 .../vendor/slim/slim/Slim/Routing/Route.php   |  360 +++++
 .../slim/slim/Slim/Routing/RouteCollector.php |  293 ++++
 .../slim/Slim/Routing/RouteCollectorProxy.php |  187 +++
 .../slim/slim/Slim/Routing/RouteContext.php   |   88 ++
 .../slim/slim/Slim/Routing/RouteGroup.php     |  104 ++
 .../slim/slim/Slim/Routing/RouteParser.php    |  127 ++
 .../slim/slim/Slim/Routing/RouteResolver.php  |   56 +
 .../slim/slim/Slim/Routing/RouteRunner.php    |   70 +
 .../slim/slim/Slim/Routing/RoutingResults.php |  112 ++
 .../vendor/slim/slim/composer.json            |   74 +-
 .../symfony/cache/Adapter/AbstractAdapter.php |   94 +-
 .../cache/Adapter/AdapterInterface.php        |    2 +-
 .../symfony/cache/Adapter/ArrayAdapter.php    |   23 +-
 .../symfony/cache/Adapter/ChainAdapter.php    |   48 +-
 .../symfony/cache/Adapter/DoctrineAdapter.php |    5 +-
 .../symfony/cache/Adapter/NullAdapter.php     |    2 +-
 .../symfony/cache/Adapter/PdoAdapter.php      |    4 +-
 .../symfony/cache/Adapter/PhpArrayAdapter.php |   62 +-
 .../symfony/cache/Adapter/PhpFilesAdapter.php |    4 +-
 .../symfony/cache/Adapter/ProxyAdapter.php    |   42 +-
 .../cache/Adapter/SimpleCacheAdapter.php      |    8 +-
 .../symfony/cache/Adapter/TagAwareAdapter.php |  183 ++-
 .../cache/Adapter/TraceableAdapter.php        |   18 +-
 .../vendor/symfony/cache/CacheItem.php        |   53 +-
 .../DataCollector/CacheDataCollector.php      |   44 +-
 .../vendor/symfony/cache/DoctrineProvider.php |    3 +-
 .../vendor/symfony/cache/LICENSE              |    2 +-
 .../symfony/cache/Simple/AbstractCache.php    |   55 +-
 .../symfony/cache/Simple/ArrayCache.php       |   30 +-
 .../symfony/cache/Simple/ChainCache.php       |   14 +-
 .../symfony/cache/Simple/DoctrineCache.php    |    5 +-
 .../symfony/cache/Simple/MemcachedCache.php   |    5 +-
 .../vendor/symfony/cache/Simple/PdoCache.php  |    4 +-
 .../symfony/cache/Simple/PhpArrayCache.php    |   60 +-
 .../symfony/cache/Simple/PhpFilesCache.php    |    4 +-
 .../vendor/symfony/cache/Simple/Psr6Cache.php |   69 +-
 .../symfony/cache/Simple/TraceableCache.php   |   14 +-
 .../Adapter/AbstractRedisAdapterTest.php      |   15 +-
 .../cache/Tests/Adapter/AdapterTestCase.php   |    8 +-
 .../cache/Tests/Adapter/ApcuAdapterTest.php   |   14 +-
 .../cache/Tests/Adapter/ArrayAdapterTest.php  |    4 +-
 .../cache/Tests/Adapter/ChainAdapterTest.php  |  157 ++-
 .../Tests/Adapter/DoctrineAdapterTest.php     |    4 +-
 .../Tests/Adapter/FilesystemAdapterTest.php   |    2 +-
 .../Tests/Adapter/MaxIdLengthAdapterTest.php  |   50 +-
 .../Tests/Adapter/MemcachedAdapterTest.php    |  112 +-
 .../cache/Tests/Adapter/NullAdapterTest.php   |    4 +-
 .../cache/Tests/Adapter/PdoAdapterTest.php    |    4 +-
 .../Tests/Adapter/PdoDbalAdapterTest.php      |    8 +-
 .../Tests/Adapter/PhpArrayAdapterTest.php     |   30 +-
 .../PhpArrayAdapterWithFallbackTest.php       |    8 +-
 .../Tests/Adapter/PhpFilesAdapterTest.php     |    4 +-
 .../cache/Tests/Adapter/PredisAdapterTest.php |   12 +-
 .../Adapter/PredisClusterAdapterTest.php      |    6 +-
 .../Adapter/PredisRedisClusterAdapterTest.php |   28 +
 .../cache/Tests/Adapter/ProxyAdapterTest.php  |   10 +-
 .../cache/Tests/Adapter/RedisAdapterTest.php  |   36 +-
 .../Tests/Adapter/RedisArrayAdapterTest.php   |    4 +-
 .../Tests/Adapter/RedisClusterAdapterTest.php |   27 +
 .../Tests/Adapter/SimpleCacheAdapterTest.php  |   17 +-
 .../Tests/Adapter/TagAwareAdapterTest.php     |  183 ++-
 ...TagAwareAndProxyAdapterIntegrationTest.php |   38 +
 .../Tests/Adapter/TraceableAdapterTest.php    |   24 +-
 .../Adapter/TraceableTagAwareAdapterTest.php  |    2 +-
 .../symfony/cache/Tests/CacheItemTest.php     |   48 +-
 .../cache/Tests/Fixtures/ArrayCache.php       |    8 +-
 .../cache/Tests/Fixtures/ExternalAdapter.php  |    6 +-
 .../Tests/Simple/AbstractRedisCacheTest.php   |   15 +-
 .../cache/Tests/Simple/ApcuCacheTest.php      |    8 +-
 .../cache/Tests/Simple/CacheTestCase.php      |   19 +-
 .../cache/Tests/Simple/ChainCacheTest.php     |   37 +-
 .../cache/Tests/Simple/DoctrineCacheTest.php  |    4 +-
 .../cache/Tests/Simple/MemcachedCacheTest.php |   99 +-
 .../Simple/MemcachedCacheTextModeTest.php     |   25 +
 .../cache/Tests/Simple/NullCacheTest.php      |    6 +-
 .../cache/Tests/Simple/PdoCacheTest.php       |    4 +-
 .../cache/Tests/Simple/PdoDbalCacheTest.php   |    8 +-
 .../cache/Tests/Simple/PhpArrayCacheTest.php  |   36 +-
 .../Simple/PhpArrayCacheWithFallbackTest.php  |    8 +-
 .../cache/Tests/Simple/PhpFilesCacheTest.php  |    4 +-
 .../cache/Tests/Simple/Psr6CacheTest.php      |    4 +-
 .../Tests/Simple/RedisArrayCacheTest.php      |    4 +-
 .../cache/Tests/Simple/RedisCacheTest.php     |   32 +-
 .../Tests/Simple/RedisClusterCacheTest.php    |   27 +
 .../cache/Tests/Simple/TraceableCacheTest.php |   26 +-
 .../cache/Tests/Traits/PdoPruneableTrait.php  |    6 +-
 .../symfony/cache/Traits/AbstractTrait.php    |   52 +-
 .../vendor/symfony/cache/Traits/ApcuTrait.php |   16 +-
 .../symfony/cache/Traits/ArrayTrait.php       |   12 +-
 .../symfony/cache/Traits/DoctrineTrait.php    |    2 +-
 .../cache/Traits/FilesystemCommonTrait.php    |   20 +-
 .../symfony/cache/Traits/FilesystemTrait.php  |    6 +-
 .../symfony/cache/Traits/MemcachedTrait.php   |  105 +-
 .../vendor/symfony/cache/Traits/PdoTrait.php  |  105 +-
 .../symfony/cache/Traits/PhpArrayTrait.php    |   40 +-
 .../symfony/cache/Traits/PhpFilesTrait.php    |   24 +-
 .../symfony/cache/Traits/ProxyTrait.php       |    2 +
 .../symfony/cache/Traits/RedisProxy.php       |    2 +-
 .../symfony/cache/Traits/RedisTrait.php       |  180 +--
 .../vendor/symfony/cache/composer.json        |   13 +-
 .../vendor/symfony/cache/phpunit.xml.dist     |   12 +-
 .../symfony/expression-language/Compiler.php  |   16 +-
 .../ExpressionFunction.php                    |   10 +-
 .../ExpressionLanguage.php                    |   20 +-
 .../symfony/expression-language/LICENSE       |    2 +-
 .../symfony/expression-language/Lexer.php     |   30 +-
 .../Node/ArgumentsNode.php                    |    2 +-
 .../expression-language/Node/ArrayNode.php    |   14 +-
 .../expression-language/Node/BinaryNode.php   |   28 +-
 .../Node/ConditionalNode.php                  |    4 +-
 .../expression-language/Node/ConstantNode.php |    8 +-
 .../expression-language/Node/FunctionNode.php |   14 +-
 .../expression-language/Node/GetAttrNode.php  |   28 +-
 .../expression-language/Node/NameNode.php     |    6 +-
 .../symfony/expression-language/Node/Node.php |   16 +-
 .../expression-language/Node/UnaryNode.php    |   10 +-
 .../symfony/expression-language/Parser.php    |   88 +-
 .../ParserCache/ArrayParserCache.php          |    4 +-
 .../ParserCache/ParserCacheAdapter.php        |   18 +-
 .../ParserCache/ParserCacheInterface.php      |    2 +-
 .../Resources/bin/generate_operator_regex.php |   14 +-
 .../expression-language/SyntaxError.php       |    4 +-
 .../Tests/ExpressionFunctionTest.php          |   12 +-
 .../Tests/ExpressionLanguageTest.php          |  130 +-
 .../Tests/Fixtures/TestProvider.php           |    4 +-
 .../expression-language/Tests/LexerTest.php   |   92 +-
 .../Tests/Node/AbstractNodeTest.php           |    4 +-
 .../Tests/Node/ArgumentsNodeTest.php          |   12 +-
 .../Tests/Node/ArrayNodeTest.php              |   18 +-
 .../Tests/Node/BinaryNodeTest.php             |  194 +--
 .../Tests/Node/ConditionalNodeTest.php        |   24 +-
 .../Tests/Node/ConstantNodeTest.php           |   62 +-
 .../Tests/Node/FunctionNodeTest.php           |   24 +-
 .../Tests/Node/GetAttrNodeTest.php            |   46 +-
 .../Tests/Node/NameNodeTest.php               |   18 +-
 .../Tests/Node/NodeTest.php                   |    6 +-
 .../Tests/Node/UnaryNodeTest.php              |   38 +-
 .../ParserCache/ParserCacheAdapterTest.php    |   26 +-
 .../expression-language/Tests/ParserTest.php  |  193 +--
 .../symfony/expression-language/Token.php     |    2 +-
 .../expression-language/TokenStream.php       |    4 +-
 .../symfony/expression-language/composer.json |   10 +-
 .../expression-language/phpunit.xml.dist      |    2 +-
 .../vendor/symfony/polyfill-apcu/Apcu.php     |   18 +-
 .../vendor/symfony/polyfill-apcu/LICENSE      |    2 +-
 .../vendor/symfony/polyfill-apcu/README.md    |    4 +-
 .../symfony/polyfill-apcu/bootstrap.php       |   67 +-
 .../symfony/polyfill-apcu/bootstrap80.php     |   75 +
 .../symfony/polyfill-apcu/composer.json       |    8 +-
 376 files changed, 10144 insertions(+), 15497 deletions(-)
 delete mode 100644 advancedcontentfilter/vendor/container-interop/container-interop/.gitignore
 delete mode 100644 advancedcontentfilter/vendor/container-interop/container-interop/LICENSE
 delete mode 100644 advancedcontentfilter/vendor/container-interop/container-interop/README.md
 delete mode 100644 advancedcontentfilter/vendor/container-interop/container-interop/composer.json
 delete mode 100644 advancedcontentfilter/vendor/container-interop/container-interop/docs/ContainerInterface-meta.md
 delete mode 100644 advancedcontentfilter/vendor/container-interop/container-interop/docs/ContainerInterface.md
 delete mode 100644 advancedcontentfilter/vendor/container-interop/container-interop/docs/Delegate-lookup-meta.md
 delete mode 100644 advancedcontentfilter/vendor/container-interop/container-interop/docs/Delegate-lookup.md
 delete mode 100644 advancedcontentfilter/vendor/container-interop/container-interop/docs/images/interoperating_containers.png
 delete mode 100644 advancedcontentfilter/vendor/container-interop/container-interop/docs/images/priority.png
 delete mode 100644 advancedcontentfilter/vendor/container-interop/container-interop/docs/images/side_by_side_containers.png
 delete mode 100644 advancedcontentfilter/vendor/container-interop/container-interop/src/Interop/Container/ContainerInterface.php
 delete mode 100644 advancedcontentfilter/vendor/container-interop/container-interop/src/Interop/Container/Exception/ContainerException.php
 delete mode 100644 advancedcontentfilter/vendor/container-interop/container-interop/src/Interop/Container/Exception/NotFoundException.php
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/.gitignore
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/.travis.yml
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/CHANGELOG
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/README.rst
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/composer.json
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/.gitignore
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/README.md
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/config.m4
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/config.w32
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/php_pimple.h
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/pimple.c
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/pimple_compat.h
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/001.phpt
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/002.phpt
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/003.phpt
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/004.phpt
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/005.phpt
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/006.phpt
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/007.phpt
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/008.phpt
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/009.phpt
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/010.phpt
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/011.phpt
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/012.phpt
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/013.phpt
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/014.phpt
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/015.phpt
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/016.phpt
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/017.phpt
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/017_1.phpt
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/018.phpt
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/019.phpt
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/bench.phpb
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/bench_shared.phpb
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/phpunit.xml.dist
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Container.php
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/ExpectedInvokableException.php
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/FrozenServiceException.php
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/InvalidServiceIdentifierException.php
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/UnknownIdentifierException.php
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Psr11/Container.php
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/src/Pimple/ServiceIterator.php
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/src/Pimple/ServiceProviderInterface.php
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/Invokable.php
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/NonInvokable.php
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/PimpleServiceProvider.php
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/Service.php
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/PimpleServiceProviderInterfaceTest.php
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/PimpleTest.php
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Psr11/ContainerTest.php
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Psr11/ServiceLocatorTest.php
 delete mode 100644 advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/ServiceIteratorTest.php
 rename advancedcontentfilter/vendor/{pimple/pimple => psr/http-factory}/LICENSE (87%)
 create mode 100644 advancedcontentfilter/vendor/psr/http-factory/README.md
 create mode 100644 advancedcontentfilter/vendor/psr/http-factory/composer.json
 create mode 100644 advancedcontentfilter/vendor/psr/http-factory/src/RequestFactoryInterface.php
 create mode 100644 advancedcontentfilter/vendor/psr/http-factory/src/ResponseFactoryInterface.php
 create mode 100644 advancedcontentfilter/vendor/psr/http-factory/src/ServerRequestFactoryInterface.php
 create mode 100644 advancedcontentfilter/vendor/psr/http-factory/src/StreamFactoryInterface.php
 create mode 100644 advancedcontentfilter/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php
 create mode 100644 advancedcontentfilter/vendor/psr/http-factory/src/UriFactoryInterface.php
 create mode 100644 advancedcontentfilter/vendor/psr/http-message/docs/PSR7-Interfaces.md
 create mode 100644 advancedcontentfilter/vendor/psr/http-message/docs/PSR7-Usage.md
 create mode 100644 advancedcontentfilter/vendor/psr/http-server-handler/LICENSE
 create mode 100644 advancedcontentfilter/vendor/psr/http-server-handler/README.md
 create mode 100644 advancedcontentfilter/vendor/psr/http-server-handler/composer.json
 create mode 100644 advancedcontentfilter/vendor/psr/http-server-handler/src/RequestHandlerInterface.php
 create mode 100644 advancedcontentfilter/vendor/psr/http-server-middleware/LICENSE
 create mode 100644 advancedcontentfilter/vendor/psr/http-server-middleware/README.md
 create mode 100644 advancedcontentfilter/vendor/psr/http-server-middleware/composer.json
 create mode 100644 advancedcontentfilter/vendor/psr/http-server-middleware/src/MiddlewareInterface.php
 delete mode 100644 advancedcontentfilter/vendor/psr/log/.gitignore
 create mode 100644 advancedcontentfilter/vendor/psr/log/Psr/Log/Test/DummyTest.php
 create mode 100644 advancedcontentfilter/vendor/psr/log/Psr/Log/Test/TestLogger.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/CHANGELOG.md
 create mode 100644 advancedcontentfilter/vendor/slim/slim/MAINTAINERS.md
 create mode 100644 advancedcontentfilter/vendor/slim/slim/SECURITY.md
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/CallableResolverAwareTrait.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Collection.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Container.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/DefaultServicesProvider.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/DeferredCallable.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Error/AbstractErrorRenderer.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/HtmlErrorRenderer.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/JsonErrorRenderer.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/PlainTextErrorRenderer.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/XmlErrorRenderer.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Exception/ContainerException.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Exception/ContainerValueNotFoundException.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpBadRequestException.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpException.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpForbiddenException.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpGoneException.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpInternalServerErrorException.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpMethodNotAllowedException.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpNotFoundException.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpNotImplementedException.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpSpecializedException.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpUnauthorizedException.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Exception/InvalidMethodException.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Exception/MethodNotAllowedException.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Exception/NotFoundException.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Exception/SlimException.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Factory/AppFactory.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/GuzzlePsr17Factory.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/HttpSoftPsr17Factory.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/LaminasDiactorosPsr17Factory.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/NyholmPsr17Factory.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/Psr17Factory.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/Psr17FactoryProvider.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/ServerRequestCreator.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimHttpPsr17Factory.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimHttpServerRequestCreator.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimPsr17Factory.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Factory/ServerRequestCreatorFactory.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Handlers/AbstractError.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Handlers/AbstractHandler.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Error.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Handlers/ErrorHandler.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Handlers/NotAllowed.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Handlers/NotFound.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Handlers/PhpError.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestHandler.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestResponseNamedArgs.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Http/Body.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Http/Cookies.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Http/Environment.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Http/Headers.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Http/Message.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Http/Request.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Http/RequestBody.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Http/Response.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Http/Stream.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Http/UploadedFile.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Http/Uri.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/AdvancedCallableResolverInterface.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/CollectionInterface.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/DispatcherInterface.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/ErrorHandlerInterface.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/ErrorRendererInterface.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Http/CookiesInterface.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Http/EnvironmentInterface.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Http/HeadersInterface.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/MiddlewareDispatcherInterface.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Psr17FactoryInterface.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Psr17FactoryProviderInterface.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RequestHandlerInvocationStrategyInterface.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteCollectorInterface.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteCollectorProxyInterface.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteParserInterface.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteResolverInterface.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouterInterface.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/ServerRequestCreatorInterface.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Logger.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Middleware/BodyParsingMiddleware.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Middleware/ContentLengthMiddleware.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Middleware/ErrorMiddleware.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Middleware/MethodOverrideMiddleware.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Middleware/OutputBufferingMiddleware.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Middleware/RoutingMiddleware.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/MiddlewareAwareTrait.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/MiddlewareDispatcher.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/ResponseEmitter.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Routable.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Route.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/RouteGroup.php
 delete mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Router.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Routing/Dispatcher.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Routing/FastRouteDispatcher.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Routing/Route.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteCollector.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteCollectorProxy.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteContext.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteGroup.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteParser.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteResolver.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteRunner.php
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Routing/RoutingResults.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisRedisClusterAdapterTest.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisClusterAdapterTest.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TagAwareAndProxyAdapterIntegrationTest.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Simple/MemcachedCacheTextModeTest.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisClusterCacheTest.php
 create mode 100644 advancedcontentfilter/vendor/symfony/polyfill-apcu/bootstrap80.php

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index f2927f57..55bc5005 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -190,7 +190,7 @@ function advancedcontentfilter_module() {}
 function advancedcontentfilter_init()
 {
 	if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'api') {
-		$slim = new \Slim\App();
+		$slim = \Slim\Factory\AppFactory::create();
 
 		require __DIR__ . '/src/middlewares.php';
 
@@ -305,7 +305,7 @@ function advancedcontentfilter_build_fields($data)
  * API
  */
 
-function advancedcontentfilter_get_rules()
+function advancedcontentfilter_get_rules(ServerRequestInterface $request, ResponseInterface $response)
 {
 	if (!DI::userSession()->getLocalUserId()) {
 		throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));
@@ -313,7 +313,8 @@ function advancedcontentfilter_get_rules()
 
 	$rules = DBA::toArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => DI::userSession()->getLocalUserId()]));
 
-	return json_encode($rules);
+	$response->getBody()->write(json_encode($rules));
+	return $response->withHeader('Content-Type', 'application/json');
 }
 
 function advancedcontentfilter_get_rules_id(ServerRequestInterface $request, ResponseInterface $response, $args)
@@ -324,10 +325,11 @@ function advancedcontentfilter_get_rules_id(ServerRequestInterface $request, Res
 
 	$rule = DBA::selectFirst('advancedcontentfilter_rules', [], ['id' => $args['id'], 'uid' => DI::userSession()->getLocalUserId()]);
 
-	return json_encode($rule);
+	$response->getBody()->write(json_encode($rule));
+	return $response->withHeader('Content-Type', 'application/json');
 }
 
-function advancedcontentfilter_post_rules(ServerRequestInterface $request)
+function advancedcontentfilter_post_rules(ServerRequestInterface $request, ResponseInterface $response)
 {
 	if (!DI::userSession()->getLocalUserId()) {
 		throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));
@@ -360,7 +362,8 @@ function advancedcontentfilter_post_rules(ServerRequestInterface $request)
 
 	DI::cache()->delete('rules_' . DI::userSession()->getLocalUserId());
 
-	return json_encode(['message' => DI::l10n()->t('Rule successfully added'), 'rule' => $rule]);
+	$response->getBody()->write(json_encode(['message' => DI::l10n()->t('Rule successfully added'), 'rule' => $rule]));
+	return $response->withHeader('Content-Type', 'application/json');
 }
 
 function advancedcontentfilter_put_rules_id(ServerRequestInterface $request, ResponseInterface $response, $args)
@@ -391,7 +394,8 @@ function advancedcontentfilter_put_rules_id(ServerRequestInterface $request, Res
 
 	DI::cache()->delete('rules_' . DI::userSession()->getLocalUserId());
 
-	return json_encode(['message' => DI::l10n()->t('Rule successfully updated')]);
+	$response->getBody()->write(json_encode(['message' => DI::l10n()->t('Rule successfully updated')]));
+	return $response->withHeader('Content-Type', 'application/json');
 }
 
 function advancedcontentfilter_delete_rules_id(ServerRequestInterface $request, ResponseInterface $response, $args)
@@ -414,7 +418,8 @@ function advancedcontentfilter_delete_rules_id(ServerRequestInterface $request,
 
 	DI::cache()->delete('rules_' . DI::userSession()->getLocalUserId());
 
-	return json_encode(['message' => DI::l10n()->t('Rule successfully deleted')]);
+	$response->getBody()->write(json_encode(['message' => DI::l10n()->t('Rule successfully deleted')]));
+	return $response->withHeader('Content-Type', 'application/json');
 }
 
 function advancedcontentfilter_get_variables_guid(ServerRequestInterface $request, ResponseInterface $response, $args)
@@ -437,7 +442,8 @@ function advancedcontentfilter_get_variables_guid(ServerRequestInterface $reques
 
 	$return = advancedcontentfilter_get_filter_fields(advancedcontentfilter_prepare_item_row($item_row));
 
-	return json_encode(['variables' => str_replace('\\\'', '\'', var_export($return, true))]);
+	$response->getBody()->write(json_encode(['variables' => str_replace('\\\'', '\'', var_export($return, true))]));
+	return $response->withHeader('Content-Type', 'application/json');
 }
 
 /**
diff --git a/advancedcontentfilter/composer.json b/advancedcontentfilter/composer.json
index 93b19cd5..ceb152e7 100644
--- a/advancedcontentfilter/composer.json
+++ b/advancedcontentfilter/composer.json
@@ -11,8 +11,7 @@
 		}
 	],
 	"require": {
-		"php": ">=5.6.0",
-		"slim/slim": "^3.1",
+		"slim/slim": "^4",
 		"symfony/expression-language": "^3.4"
 	},
 	"license": "3-clause BSD license",
diff --git a/advancedcontentfilter/composer.lock b/advancedcontentfilter/composer.lock
index 774b5ec8..83d61074 100644
--- a/advancedcontentfilter/composer.lock
+++ b/advancedcontentfilter/composer.lock
@@ -4,40 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d0e3662dd9d910ffe4f71d325bc39319",
+    "content-hash": "3e87f0369e4799fc35d98f399c67f1e9",
     "packages": [
-        {
-            "name": "container-interop/container-interop",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/container-interop/container-interop.git",
-                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
-                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
-                "shasum": ""
-            },
-            "require": {
-                "psr/container": "^1.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Interop\\Container\\": "src/Interop/Container/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
-            "homepage": "https://github.com/container-interop/container-interop",
-            "abandoned": "psr/container",
-            "time": "2017-02-14T19:40:03+00:00"
-        },
         {
             "name": "nikic/fast-route",
             "version": "v1.3.0",
@@ -84,56 +52,6 @@
             ],
             "time": "2018-02-13T20:26:39+00:00"
         },
-        {
-            "name": "pimple/pimple",
-            "version": "v3.2.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/silexphp/Pimple.git",
-                "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/9e403941ef9d65d20cba7d54e29fe906db42cf32",
-                "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0",
-                "psr/container": "^1.0"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "^3.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Pimple": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Pimple, a simple Dependency Injection Container",
-            "homepage": "http://pimple.sensiolabs.org",
-            "keywords": [
-                "container",
-                "dependency injection"
-            ],
-            "time": "2018-01-21T07:42:36+00:00"
-        },
         {
             "name": "psr/cache",
             "version": "1.0.1",
@@ -182,25 +100,25 @@
         },
         {
             "name": "psr/container",
-            "version": "1.0.0",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=7.4.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -215,7 +133,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common Container Interface (PHP FIG PSR-11)",
@@ -227,24 +145,25 @@
                 "container-interop",
                 "psr"
             ],
-            "time": "2017-02-14T16:28:37+00:00"
+            "time": "2021-11-05T16:47:00+00:00"
         },
         {
-            "name": "psr/http-message",
-            "version": "1.0.1",
+            "name": "psr/http-factory",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/http-message.git",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+                "url": "https://github.com/php-fig/http-factory.git",
+                "reference": "e616d01114759c4c489f93b099585439f795fe35"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
+                "reference": "e616d01114759c4c489f93b099585439f795fe35",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=7.0.0",
+                "psr/http-message": "^1.0 || ^2.0"
             },
             "type": "library",
             "extra": {
@@ -261,6 +180,57 @@
             "license": [
                 "MIT"
             ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interfaces for PSR-7 HTTP message factories",
+            "keywords": [
+                "factory",
+                "http",
+                "message",
+                "psr",
+                "psr-17",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "time": "2023-04-10T20:10:41+00:00"
+        },
+        {
+            "name": "psr/http-message",
+            "version": "1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
             "authors": [
                 {
                     "name": "PHP-FIG",
@@ -277,20 +247,126 @@
                 "request",
                 "response"
             ],
-            "time": "2016-08-06T14:39:51+00:00"
+            "time": "2023-04-04T09:50:52+00:00"
         },
         {
-            "name": "psr/log",
-            "version": "1.1.2",
+            "name": "psr/http-server-handler",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
+                "url": "https://github.com/php-fig/http-server-handler.git",
+                "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
-                "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
+                "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/84c4fb66179be4caaf8e97bd239203245302e7d4",
+                "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0",
+                "psr/http-message": "^1.0 || ^2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Server\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP server-side request handler",
+            "keywords": [
+                "handler",
+                "http",
+                "http-interop",
+                "psr",
+                "psr-15",
+                "psr-7",
+                "request",
+                "response",
+                "server"
+            ],
+            "time": "2023-04-10T20:06:20+00:00"
+        },
+        {
+            "name": "psr/http-server-middleware",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-server-middleware.git",
+                "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/c1481f747daaa6a0782775cd6a8c26a1bf4a3829",
+                "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0",
+                "psr/http-message": "^1.0 || ^2.0",
+                "psr/http-server-handler": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Server\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP server-side middleware",
+            "keywords": [
+                "http",
+                "http-interop",
+                "middleware",
+                "psr",
+                "psr-15",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "time": "2023-04-11T06:14:47+00:00"
+        },
+        {
+            "name": "psr/log",
+            "version": "1.1.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
                 "shasum": ""
             },
             "require": {
@@ -314,7 +390,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for logging libraries",
@@ -324,7 +400,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2019-11-01T11:05:21+00:00"
+            "time": "2021-05-03T11:20:27+00:00"
         },
         {
             "name": "psr/simple-cache",
@@ -376,32 +452,51 @@
         },
         {
             "name": "slim/slim",
-            "version": "3.9.2",
+            "version": "4.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/slimphp/Slim.git",
-                "reference": "4086d0106cf5a7135c69fce4161fe355a8feb118"
+                "reference": "e9e99c2b24398b967841c6c4c3048622cc7e2b18"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/slimphp/Slim/zipball/4086d0106cf5a7135c69fce4161fe355a8feb118",
-                "reference": "4086d0106cf5a7135c69fce4161fe355a8feb118",
+                "url": "https://api.github.com/repos/slimphp/Slim/zipball/e9e99c2b24398b967841c6c4c3048622cc7e2b18",
+                "reference": "e9e99c2b24398b967841c6c4c3048622cc7e2b18",
                 "shasum": ""
             },
             "require": {
-                "container-interop/container-interop": "^1.2",
-                "nikic/fast-route": "^1.0",
-                "php": ">=5.5.0",
-                "pimple/pimple": "^3.0",
-                "psr/container": "^1.0",
-                "psr/http-message": "^1.0"
-            },
-            "provide": {
-                "psr/http-message-implementation": "1.0"
+                "ext-json": "*",
+                "nikic/fast-route": "^1.3",
+                "php": "^7.4 || ^8.0",
+                "psr/container": "^1.0 || ^2.0",
+                "psr/http-factory": "^1.0",
+                "psr/http-message": "^1.1",
+                "psr/http-server-handler": "^1.0",
+                "psr/http-server-middleware": "^1.0",
+                "psr/log": "^1.1 || ^2.0 || ^3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.0",
-                "squizlabs/php_codesniffer": "^2.5"
+                "adriansuter/php-autoload-override": "^1.4",
+                "ext-simplexml": "*",
+                "guzzlehttp/psr7": "^2.5",
+                "httpsoft/http-message": "^1.1",
+                "httpsoft/http-server-request": "^1.1",
+                "laminas/laminas-diactoros": "^2.17",
+                "nyholm/psr7": "^1.8",
+                "nyholm/psr7-server": "^1.0",
+                "phpspec/prophecy": "^1.17",
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^9.6",
+                "slim/http": "^1.3",
+                "slim/psr7": "^1.6",
+                "squizlabs/php_codesniffer": "^3.7"
+            },
+            "suggest": {
+                "ext-simplexml": "Needed to support XML format in BodyParsingMiddleware",
+                "ext-xml": "Needed to support XML format in BodyParsingMiddleware",
+                "php-di/php-di": "PHP-DI is the recommended container library to be used with Slim",
+                "slim/psr7": "Slim PSR-7 implementation. See https://www.slimframework.com/docs/v4/start/installation.html for more information."
             },
             "type": "library",
             "autoload": {
@@ -414,49 +509,64 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Rob Allen",
-                    "email": "rob@akrabat.com",
-                    "homepage": "http://akrabat.com"
-                },
                 {
                     "name": "Josh Lockhart",
                     "email": "hello@joshlockhart.com",
                     "homepage": "https://joshlockhart.com"
                 },
-                {
-                    "name": "Gabriel Manricks",
-                    "email": "gmanricks@me.com",
-                    "homepage": "http://gabrielmanricks.com"
-                },
                 {
                     "name": "Andrew Smith",
                     "email": "a.smith@silentworks.co.uk",
                     "homepage": "http://silentworks.co.uk"
+                },
+                {
+                    "name": "Rob Allen",
+                    "email": "rob@akrabat.com",
+                    "homepage": "http://akrabat.com"
+                },
+                {
+                    "name": "Pierre Berube",
+                    "email": "pierre@lgse.com",
+                    "homepage": "http://www.lgse.com"
+                },
+                {
+                    "name": "Gabriel Manricks",
+                    "email": "gmanricks@me.com",
+                    "homepage": "http://gabrielmanricks.com"
                 }
             ],
             "description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs",
-            "homepage": "https://slimframework.com",
+            "homepage": "https://www.slimframework.com",
             "keywords": [
                 "api",
                 "framework",
                 "micro",
                 "router"
             ],
-            "time": "2017-11-26T19:13:09+00:00"
+            "funding": [
+                {
+                    "url": "https://opencollective.com/slimphp",
+                    "type": "open_collective"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/slim/slim",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-07-23T04:54:29+00:00"
         },
         {
             "name": "symfony/cache",
-            "version": "v3.4.36",
+            "version": "v3.4.47",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache.git",
-                "reference": "3d9f46a6960fd5cd7f030f86adc5b4b63bcfa4e3"
+                "reference": "a7a14c4832760bd1fbd31be2859ffedc9b6ff813"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/3d9f46a6960fd5cd7f030f86adc5b4b63bcfa4e3",
-                "reference": "3d9f46a6960fd5cd7f030f86adc5b4b63bcfa4e3",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/a7a14c4832760bd1fbd31be2859ffedc9b6ff813",
+                "reference": "a7a14c4832760bd1fbd31be2859ffedc9b6ff813",
                 "shasum": ""
             },
             "require": {
@@ -475,16 +585,11 @@
             },
             "require-dev": {
                 "cache/integration-tests": "dev-master",
-                "doctrine/cache": "~1.6",
-                "doctrine/dbal": "~2.4",
-                "predis/predis": "~1.0"
+                "doctrine/cache": "^1.6",
+                "doctrine/dbal": "^2.4|^3.0",
+                "predis/predis": "^1.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.4-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Cache\\": ""
@@ -513,32 +618,42 @@
                 "caching",
                 "psr6"
             ],
-            "time": "2019-12-01T10:45:41+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-10-24T10:57:07+00:00"
         },
         {
             "name": "symfony/expression-language",
-            "version": "v3.4.8",
+            "version": "v3.4.47",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/expression-language.git",
-                "reference": "867e4d1f5d4e52435a8ffff6b24fd6a801582241"
+                "reference": "de38e66398fca1fcb9c48e80279910e6889cb28f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/expression-language/zipball/867e4d1f5d4e52435a8ffff6b24fd6a801582241",
-                "reference": "867e4d1f5d4e52435a8ffff6b24fd6a801582241",
+                "url": "https://api.github.com/repos/symfony/expression-language/zipball/de38e66398fca1fcb9c48e80279910e6889cb28f",
+                "reference": "de38e66398fca1fcb9c48e80279910e6889cb28f",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.5.9|>=7.0.8",
-                "symfony/cache": "~3.1|~4.0"
+                "symfony/cache": "~3.1|~4.0",
+                "symfony/polyfill-php70": "~1.6"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.4-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\ExpressionLanguage\\": ""
@@ -563,38 +678,56 @@
             ],
             "description": "Symfony ExpressionLanguage Component",
             "homepage": "https://symfony.com",
-            "time": "2018-01-03T07:37:34+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-10-24T10:57:07+00:00"
         },
         {
             "name": "symfony/polyfill-apcu",
-            "version": "v1.13.1",
+            "version": "v1.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-apcu.git",
-                "reference": "a8e961c841b9ec52927a87914f8820a1ad8f8116"
+                "reference": "c6c2c0f5f4cb0b100c5dfea807ef5cd27bbe9899"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/a8e961c841b9ec52927a87914f8820a1ad8f8116",
-                "reference": "a8e961c841b9ec52927a87914f8820a1ad8f8116",
+                "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/c6c2c0f5f4cb0b100c5dfea807ef5cd27bbe9899",
+                "reference": "c6c2c0f5f4cb0b100c5dfea807ef5cd27bbe9899",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.13-dev"
+                    "dev-main": "1.28-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Apcu\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Apcu\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -619,7 +752,86 @@
                 "portable",
                 "shim"
             ],
-            "time": "2019-11-27T13:56:44+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-01-26T09:26:14+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php70",
+            "version": "v1.20.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php70.git",
+                "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/5f03a781d984aae42cebd18e7912fa80f02ee644",
+                "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "metapackage",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.20-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-10-23T14:02:19+00:00"
         }
     ],
     "packages-dev": [],
@@ -631,5 +843,6 @@
     "platform": {
         "php": ">=5.6.0"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
 }
diff --git a/advancedcontentfilter/src/middlewares.php b/advancedcontentfilter/src/middlewares.php
index dffb9363..84dd6ed8 100644
--- a/advancedcontentfilter/src/middlewares.php
+++ b/advancedcontentfilter/src/middlewares.php
@@ -21,31 +21,12 @@
 
 use Friendica\DI;
 
-$container = $slim->getContainer();
+/** @var $slim \Slim\App */
 
-// Error handler based off https://stackoverflow.com/a/48135009/757392
-$container['errorHandler'] = function () {
-	return function(Psr\Http\Message\RequestInterface $request, Psr\Http\Message\ResponseInterface $response, Exception $exception)
-	{
-		$responseCode = 500;
+/**
+ * The routing middleware should be added before the ErrorMiddleware
+ * Otherwise exceptions thrown from it will not be handled
+ */
+$slim->addRoutingMiddleware();
 
-		if (is_a($exception, 'Friendica\Network\HTTPException')) {
-			$responseCode = $exception->getCode();
-		}
-
-		$errors['message'] = $exception->getMessage();
-
-		$errors['responseCode'] = $responseCode;
-
-		return $response
-				->withStatus($responseCode)
-				->withJson($errors);
-	};
-};
-
-$container['notFoundHandler'] = function () {
-	return function ()
-	{
-		throw new \Friendica\Network\HTTPException\NotFoundException(DI::l10n()->t('Method not found'));
-	};
-};
+$errorMiddleware = $slim->addErrorMiddleware(true, true, true);
diff --git a/advancedcontentfilter/src/routes.php b/advancedcontentfilter/src/routes.php
index 09077bda..a46f1b4b 100644
--- a/advancedcontentfilter/src/routes.php
+++ b/advancedcontentfilter/src/routes.php
@@ -20,20 +20,17 @@
  */
 
 /* @var $slim Slim\App */
-$slim->group('/advancedcontentfilter/api', function () {
-	/* @var $this Slim\App */
-	$this->group('/rules', function () {
-		/* @var $this Slim\App */
-		$this->get('', 'advancedcontentfilter_get_rules');
-		$this->post('', 'advancedcontentfilter_post_rules');
+$slim->group('/advancedcontentfilter/api', function (\Slim\Routing\RouteCollectorProxy $app) {
+	$app->group('/rules', function (\Slim\Routing\RouteCollectorProxy $app) {
+		$app->get('', 'advancedcontentfilter_get_rules');
+		$app->post('', 'advancedcontentfilter_post_rules');
 
-		$this->get('/{id}', 'advancedcontentfilter_get_rules_id');
-		$this->put('/{id}', 'advancedcontentfilter_put_rules_id');
-		$this->delete('/{id}', 'advancedcontentfilter_delete_rules_id');
+		$app->get('/{id}', 'advancedcontentfilter_get_rules_id');
+		$app->put('/{id}', 'advancedcontentfilter_put_rules_id');
+		$app->delete('/{id}', 'advancedcontentfilter_delete_rules_id');
 	});
 
-	$this->group('/variables', function () {
-		/* @var $this Slim\App */
-		$this->get('/{guid}', 'advancedcontentfilter_get_variables_guid');
+	$app->group('/variables', function (\Slim\Routing\RouteCollectorProxy $app) {
+		$app->get('/{guid}', 'advancedcontentfilter_get_variables_guid');
 	});
 });
diff --git a/advancedcontentfilter/vendor/composer/ClassLoader.php b/advancedcontentfilter/vendor/composer/ClassLoader.php
index dc02dfb1..03b9bb9c 100644
--- a/advancedcontentfilter/vendor/composer/ClassLoader.php
+++ b/advancedcontentfilter/vendor/composer/ClassLoader.php
@@ -60,7 +60,7 @@ class ClassLoader
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', $this->prefixesPsr0);
+            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
         }
 
         return array();
@@ -279,7 +279,7 @@ class ClassLoader
      */
     public function setApcuPrefix($apcuPrefix)
     {
-        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
     }
 
     /**
@@ -377,7 +377,7 @@ class ClassLoader
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath.'\\';
+                $search = $subPath . '\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
                     $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
diff --git a/advancedcontentfilter/vendor/composer/autoload_classmap.php b/advancedcontentfilter/vendor/composer/autoload_classmap.php
index 4f884be1..aa3de8a3 100644
--- a/advancedcontentfilter/vendor/composer/autoload_classmap.php
+++ b/advancedcontentfilter/vendor/composer/autoload_classmap.php
@@ -23,27 +23,6 @@ return array(
     'FastRoute\\RouteCollector' => $vendorDir . '/nikic/fast-route/src/RouteCollector.php',
     'FastRoute\\RouteParser' => $vendorDir . '/nikic/fast-route/src/RouteParser.php',
     'FastRoute\\RouteParser\\Std' => $vendorDir . '/nikic/fast-route/src/RouteParser/Std.php',
-    'Interop\\Container\\ContainerInterface' => $vendorDir . '/container-interop/container-interop/src/Interop/Container/ContainerInterface.php',
-    'Interop\\Container\\Exception\\ContainerException' => $vendorDir . '/container-interop/container-interop/src/Interop/Container/Exception/ContainerException.php',
-    'Interop\\Container\\Exception\\NotFoundException' => $vendorDir . '/container-interop/container-interop/src/Interop/Container/Exception/NotFoundException.php',
-    'Pimple\\Container' => $vendorDir . '/pimple/pimple/src/Pimple/Container.php',
-    'Pimple\\Exception\\ExpectedInvokableException' => $vendorDir . '/pimple/pimple/src/Pimple/Exception/ExpectedInvokableException.php',
-    'Pimple\\Exception\\FrozenServiceException' => $vendorDir . '/pimple/pimple/src/Pimple/Exception/FrozenServiceException.php',
-    'Pimple\\Exception\\InvalidServiceIdentifierException' => $vendorDir . '/pimple/pimple/src/Pimple/Exception/InvalidServiceIdentifierException.php',
-    'Pimple\\Exception\\UnknownIdentifierException' => $vendorDir . '/pimple/pimple/src/Pimple/Exception/UnknownIdentifierException.php',
-    'Pimple\\Psr11\\Container' => $vendorDir . '/pimple/pimple/src/Pimple/Psr11/Container.php',
-    'Pimple\\Psr11\\ServiceLocator' => $vendorDir . '/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php',
-    'Pimple\\ServiceIterator' => $vendorDir . '/pimple/pimple/src/Pimple/ServiceIterator.php',
-    'Pimple\\ServiceProviderInterface' => $vendorDir . '/pimple/pimple/src/Pimple/ServiceProviderInterface.php',
-    'Pimple\\Tests\\Fixtures\\Invokable' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Fixtures/Invokable.php',
-    'Pimple\\Tests\\Fixtures\\NonInvokable' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Fixtures/NonInvokable.php',
-    'Pimple\\Tests\\Fixtures\\PimpleServiceProvider' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Fixtures/PimpleServiceProvider.php',
-    'Pimple\\Tests\\Fixtures\\Service' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Fixtures/Service.php',
-    'Pimple\\Tests\\PimpleServiceProviderInterfaceTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/PimpleServiceProviderInterfaceTest.php',
-    'Pimple\\Tests\\PimpleTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/PimpleTest.php',
-    'Pimple\\Tests\\Psr11\\ContainerTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Psr11/ContainerTest.php',
-    'Pimple\\Tests\\Psr11\\ServiceLocatorTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Psr11/ServiceLocatorTest.php',
-    'Pimple\\Tests\\ServiceIteratorTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/ServiceIteratorTest.php',
     'Psr\\Cache\\CacheException' => $vendorDir . '/psr/cache/src/CacheException.php',
     'Psr\\Cache\\CacheItemInterface' => $vendorDir . '/psr/cache/src/CacheItemInterface.php',
     'Psr\\Cache\\CacheItemPoolInterface' => $vendorDir . '/psr/cache/src/CacheItemPoolInterface.php',
@@ -52,12 +31,20 @@ return array(
     'Psr\\Container\\ContainerInterface' => $vendorDir . '/psr/container/src/ContainerInterface.php',
     'Psr\\Container\\NotFoundExceptionInterface' => $vendorDir . '/psr/container/src/NotFoundExceptionInterface.php',
     'Psr\\Http\\Message\\MessageInterface' => $vendorDir . '/psr/http-message/src/MessageInterface.php',
+    'Psr\\Http\\Message\\RequestFactoryInterface' => $vendorDir . '/psr/http-factory/src/RequestFactoryInterface.php',
     'Psr\\Http\\Message\\RequestInterface' => $vendorDir . '/psr/http-message/src/RequestInterface.php',
+    'Psr\\Http\\Message\\ResponseFactoryInterface' => $vendorDir . '/psr/http-factory/src/ResponseFactoryInterface.php',
     'Psr\\Http\\Message\\ResponseInterface' => $vendorDir . '/psr/http-message/src/ResponseInterface.php',
+    'Psr\\Http\\Message\\ServerRequestFactoryInterface' => $vendorDir . '/psr/http-factory/src/ServerRequestFactoryInterface.php',
     'Psr\\Http\\Message\\ServerRequestInterface' => $vendorDir . '/psr/http-message/src/ServerRequestInterface.php',
+    'Psr\\Http\\Message\\StreamFactoryInterface' => $vendorDir . '/psr/http-factory/src/StreamFactoryInterface.php',
     'Psr\\Http\\Message\\StreamInterface' => $vendorDir . '/psr/http-message/src/StreamInterface.php',
+    'Psr\\Http\\Message\\UploadedFileFactoryInterface' => $vendorDir . '/psr/http-factory/src/UploadedFileFactoryInterface.php',
     'Psr\\Http\\Message\\UploadedFileInterface' => $vendorDir . '/psr/http-message/src/UploadedFileInterface.php',
+    'Psr\\Http\\Message\\UriFactoryInterface' => $vendorDir . '/psr/http-factory/src/UriFactoryInterface.php',
     'Psr\\Http\\Message\\UriInterface' => $vendorDir . '/psr/http-message/src/UriInterface.php',
+    'Psr\\Http\\Server\\MiddlewareInterface' => $vendorDir . '/psr/http-server-middleware/src/MiddlewareInterface.php',
+    'Psr\\Http\\Server\\RequestHandlerInterface' => $vendorDir . '/psr/http-server-handler/src/RequestHandlerInterface.php',
     'Psr\\Log\\AbstractLogger' => $vendorDir . '/psr/log/Psr/Log/AbstractLogger.php',
     'Psr\\Log\\InvalidArgumentException' => $vendorDir . '/psr/log/Psr/Log/InvalidArgumentException.php',
     'Psr\\Log\\LogLevel' => $vendorDir . '/psr/log/Psr/Log/LogLevel.php',
@@ -66,57 +53,83 @@ return array(
     'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php',
     'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php',
     'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
-    'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
+    'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/DummyTest.php',
     'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
+    'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php',
     'Psr\\SimpleCache\\CacheException' => $vendorDir . '/psr/simple-cache/src/CacheException.php',
     'Psr\\SimpleCache\\CacheInterface' => $vendorDir . '/psr/simple-cache/src/CacheInterface.php',
     'Psr\\SimpleCache\\InvalidArgumentException' => $vendorDir . '/psr/simple-cache/src/InvalidArgumentException.php',
     'Slim\\App' => $vendorDir . '/slim/slim/Slim/App.php',
     'Slim\\CallableResolver' => $vendorDir . '/slim/slim/Slim/CallableResolver.php',
-    'Slim\\CallableResolverAwareTrait' => $vendorDir . '/slim/slim/Slim/CallableResolverAwareTrait.php',
-    'Slim\\Collection' => $vendorDir . '/slim/slim/Slim/Collection.php',
-    'Slim\\Container' => $vendorDir . '/slim/slim/Slim/Container.php',
-    'Slim\\DefaultServicesProvider' => $vendorDir . '/slim/slim/Slim/DefaultServicesProvider.php',
-    'Slim\\DeferredCallable' => $vendorDir . '/slim/slim/Slim/DeferredCallable.php',
-    'Slim\\Exception\\ContainerException' => $vendorDir . '/slim/slim/Slim/Exception/ContainerException.php',
-    'Slim\\Exception\\ContainerValueNotFoundException' => $vendorDir . '/slim/slim/Slim/Exception/ContainerValueNotFoundException.php',
-    'Slim\\Exception\\InvalidMethodException' => $vendorDir . '/slim/slim/Slim/Exception/InvalidMethodException.php',
-    'Slim\\Exception\\MethodNotAllowedException' => $vendorDir . '/slim/slim/Slim/Exception/MethodNotAllowedException.php',
-    'Slim\\Exception\\NotFoundException' => $vendorDir . '/slim/slim/Slim/Exception/NotFoundException.php',
-    'Slim\\Exception\\SlimException' => $vendorDir . '/slim/slim/Slim/Exception/SlimException.php',
-    'Slim\\Handlers\\AbstractError' => $vendorDir . '/slim/slim/Slim/Handlers/AbstractError.php',
-    'Slim\\Handlers\\AbstractHandler' => $vendorDir . '/slim/slim/Slim/Handlers/AbstractHandler.php',
-    'Slim\\Handlers\\Error' => $vendorDir . '/slim/slim/Slim/Handlers/Error.php',
-    'Slim\\Handlers\\NotAllowed' => $vendorDir . '/slim/slim/Slim/Handlers/NotAllowed.php',
-    'Slim\\Handlers\\NotFound' => $vendorDir . '/slim/slim/Slim/Handlers/NotFound.php',
-    'Slim\\Handlers\\PhpError' => $vendorDir . '/slim/slim/Slim/Handlers/PhpError.php',
+    'Slim\\Error\\AbstractErrorRenderer' => $vendorDir . '/slim/slim/Slim/Error/AbstractErrorRenderer.php',
+    'Slim\\Error\\Renderers\\HtmlErrorRenderer' => $vendorDir . '/slim/slim/Slim/Error/Renderers/HtmlErrorRenderer.php',
+    'Slim\\Error\\Renderers\\JsonErrorRenderer' => $vendorDir . '/slim/slim/Slim/Error/Renderers/JsonErrorRenderer.php',
+    'Slim\\Error\\Renderers\\PlainTextErrorRenderer' => $vendorDir . '/slim/slim/Slim/Error/Renderers/PlainTextErrorRenderer.php',
+    'Slim\\Error\\Renderers\\XmlErrorRenderer' => $vendorDir . '/slim/slim/Slim/Error/Renderers/XmlErrorRenderer.php',
+    'Slim\\Exception\\HttpBadRequestException' => $vendorDir . '/slim/slim/Slim/Exception/HttpBadRequestException.php',
+    'Slim\\Exception\\HttpException' => $vendorDir . '/slim/slim/Slim/Exception/HttpException.php',
+    'Slim\\Exception\\HttpForbiddenException' => $vendorDir . '/slim/slim/Slim/Exception/HttpForbiddenException.php',
+    'Slim\\Exception\\HttpGoneException' => $vendorDir . '/slim/slim/Slim/Exception/HttpGoneException.php',
+    'Slim\\Exception\\HttpInternalServerErrorException' => $vendorDir . '/slim/slim/Slim/Exception/HttpInternalServerErrorException.php',
+    'Slim\\Exception\\HttpMethodNotAllowedException' => $vendorDir . '/slim/slim/Slim/Exception/HttpMethodNotAllowedException.php',
+    'Slim\\Exception\\HttpNotFoundException' => $vendorDir . '/slim/slim/Slim/Exception/HttpNotFoundException.php',
+    'Slim\\Exception\\HttpNotImplementedException' => $vendorDir . '/slim/slim/Slim/Exception/HttpNotImplementedException.php',
+    'Slim\\Exception\\HttpSpecializedException' => $vendorDir . '/slim/slim/Slim/Exception/HttpSpecializedException.php',
+    'Slim\\Exception\\HttpUnauthorizedException' => $vendorDir . '/slim/slim/Slim/Exception/HttpUnauthorizedException.php',
+    'Slim\\Factory\\AppFactory' => $vendorDir . '/slim/slim/Slim/Factory/AppFactory.php',
+    'Slim\\Factory\\Psr17\\GuzzlePsr17Factory' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/GuzzlePsr17Factory.php',
+    'Slim\\Factory\\Psr17\\HttpSoftPsr17Factory' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/HttpSoftPsr17Factory.php',
+    'Slim\\Factory\\Psr17\\LaminasDiactorosPsr17Factory' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/LaminasDiactorosPsr17Factory.php',
+    'Slim\\Factory\\Psr17\\NyholmPsr17Factory' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/NyholmPsr17Factory.php',
+    'Slim\\Factory\\Psr17\\Psr17Factory' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/Psr17Factory.php',
+    'Slim\\Factory\\Psr17\\Psr17FactoryProvider' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/Psr17FactoryProvider.php',
+    'Slim\\Factory\\Psr17\\ServerRequestCreator' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/ServerRequestCreator.php',
+    'Slim\\Factory\\Psr17\\SlimHttpPsr17Factory' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/SlimHttpPsr17Factory.php',
+    'Slim\\Factory\\Psr17\\SlimHttpServerRequestCreator' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/SlimHttpServerRequestCreator.php',
+    'Slim\\Factory\\Psr17\\SlimPsr17Factory' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/SlimPsr17Factory.php',
+    'Slim\\Factory\\ServerRequestCreatorFactory' => $vendorDir . '/slim/slim/Slim/Factory/ServerRequestCreatorFactory.php',
+    'Slim\\Handlers\\ErrorHandler' => $vendorDir . '/slim/slim/Slim/Handlers/ErrorHandler.php',
+    'Slim\\Handlers\\Strategies\\RequestHandler' => $vendorDir . '/slim/slim/Slim/Handlers/Strategies/RequestHandler.php',
     'Slim\\Handlers\\Strategies\\RequestResponse' => $vendorDir . '/slim/slim/Slim/Handlers/Strategies/RequestResponse.php',
     'Slim\\Handlers\\Strategies\\RequestResponseArgs' => $vendorDir . '/slim/slim/Slim/Handlers/Strategies/RequestResponseArgs.php',
-    'Slim\\Http\\Body' => $vendorDir . '/slim/slim/Slim/Http/Body.php',
-    'Slim\\Http\\Cookies' => $vendorDir . '/slim/slim/Slim/Http/Cookies.php',
-    'Slim\\Http\\Environment' => $vendorDir . '/slim/slim/Slim/Http/Environment.php',
-    'Slim\\Http\\Headers' => $vendorDir . '/slim/slim/Slim/Http/Headers.php',
-    'Slim\\Http\\Message' => $vendorDir . '/slim/slim/Slim/Http/Message.php',
-    'Slim\\Http\\Request' => $vendorDir . '/slim/slim/Slim/Http/Request.php',
-    'Slim\\Http\\RequestBody' => $vendorDir . '/slim/slim/Slim/Http/RequestBody.php',
-    'Slim\\Http\\Response' => $vendorDir . '/slim/slim/Slim/Http/Response.php',
-    'Slim\\Http\\Stream' => $vendorDir . '/slim/slim/Slim/Http/Stream.php',
-    'Slim\\Http\\UploadedFile' => $vendorDir . '/slim/slim/Slim/Http/UploadedFile.php',
-    'Slim\\Http\\Uri' => $vendorDir . '/slim/slim/Slim/Http/Uri.php',
+    'Slim\\Handlers\\Strategies\\RequestResponseNamedArgs' => $vendorDir . '/slim/slim/Slim/Handlers/Strategies/RequestResponseNamedArgs.php',
+    'Slim\\Interfaces\\AdvancedCallableResolverInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/AdvancedCallableResolverInterface.php',
     'Slim\\Interfaces\\CallableResolverInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/CallableResolverInterface.php',
-    'Slim\\Interfaces\\CollectionInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/CollectionInterface.php',
-    'Slim\\Interfaces\\Http\\CookiesInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/Http/CookiesInterface.php',
-    'Slim\\Interfaces\\Http\\EnvironmentInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/Http/EnvironmentInterface.php',
-    'Slim\\Interfaces\\Http\\HeadersInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/Http/HeadersInterface.php',
+    'Slim\\Interfaces\\DispatcherInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/DispatcherInterface.php',
+    'Slim\\Interfaces\\ErrorHandlerInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/ErrorHandlerInterface.php',
+    'Slim\\Interfaces\\ErrorRendererInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/ErrorRendererInterface.php',
     'Slim\\Interfaces\\InvocationStrategyInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/InvocationStrategyInterface.php',
+    'Slim\\Interfaces\\MiddlewareDispatcherInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/MiddlewareDispatcherInterface.php',
+    'Slim\\Interfaces\\Psr17FactoryInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/Psr17FactoryInterface.php',
+    'Slim\\Interfaces\\Psr17FactoryProviderInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/Psr17FactoryProviderInterface.php',
+    'Slim\\Interfaces\\RequestHandlerInvocationStrategyInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/RequestHandlerInvocationStrategyInterface.php',
+    'Slim\\Interfaces\\RouteCollectorInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/RouteCollectorInterface.php',
+    'Slim\\Interfaces\\RouteCollectorProxyInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/RouteCollectorProxyInterface.php',
     'Slim\\Interfaces\\RouteGroupInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/RouteGroupInterface.php',
     'Slim\\Interfaces\\RouteInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/RouteInterface.php',
-    'Slim\\Interfaces\\RouterInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/RouterInterface.php',
-    'Slim\\MiddlewareAwareTrait' => $vendorDir . '/slim/slim/Slim/MiddlewareAwareTrait.php',
-    'Slim\\Routable' => $vendorDir . '/slim/slim/Slim/Routable.php',
-    'Slim\\Route' => $vendorDir . '/slim/slim/Slim/Route.php',
-    'Slim\\RouteGroup' => $vendorDir . '/slim/slim/Slim/RouteGroup.php',
-    'Slim\\Router' => $vendorDir . '/slim/slim/Slim/Router.php',
+    'Slim\\Interfaces\\RouteParserInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/RouteParserInterface.php',
+    'Slim\\Interfaces\\RouteResolverInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/RouteResolverInterface.php',
+    'Slim\\Interfaces\\ServerRequestCreatorInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/ServerRequestCreatorInterface.php',
+    'Slim\\Logger' => $vendorDir . '/slim/slim/Slim/Logger.php',
+    'Slim\\MiddlewareDispatcher' => $vendorDir . '/slim/slim/Slim/MiddlewareDispatcher.php',
+    'Slim\\Middleware\\BodyParsingMiddleware' => $vendorDir . '/slim/slim/Slim/Middleware/BodyParsingMiddleware.php',
+    'Slim\\Middleware\\ContentLengthMiddleware' => $vendorDir . '/slim/slim/Slim/Middleware/ContentLengthMiddleware.php',
+    'Slim\\Middleware\\ErrorMiddleware' => $vendorDir . '/slim/slim/Slim/Middleware/ErrorMiddleware.php',
+    'Slim\\Middleware\\MethodOverrideMiddleware' => $vendorDir . '/slim/slim/Slim/Middleware/MethodOverrideMiddleware.php',
+    'Slim\\Middleware\\OutputBufferingMiddleware' => $vendorDir . '/slim/slim/Slim/Middleware/OutputBufferingMiddleware.php',
+    'Slim\\Middleware\\RoutingMiddleware' => $vendorDir . '/slim/slim/Slim/Middleware/RoutingMiddleware.php',
+    'Slim\\ResponseEmitter' => $vendorDir . '/slim/slim/Slim/ResponseEmitter.php',
+    'Slim\\Routing\\Dispatcher' => $vendorDir . '/slim/slim/Slim/Routing/Dispatcher.php',
+    'Slim\\Routing\\FastRouteDispatcher' => $vendorDir . '/slim/slim/Slim/Routing/FastRouteDispatcher.php',
+    'Slim\\Routing\\Route' => $vendorDir . '/slim/slim/Slim/Routing/Route.php',
+    'Slim\\Routing\\RouteCollector' => $vendorDir . '/slim/slim/Slim/Routing/RouteCollector.php',
+    'Slim\\Routing\\RouteCollectorProxy' => $vendorDir . '/slim/slim/Slim/Routing/RouteCollectorProxy.php',
+    'Slim\\Routing\\RouteContext' => $vendorDir . '/slim/slim/Slim/Routing/RouteContext.php',
+    'Slim\\Routing\\RouteGroup' => $vendorDir . '/slim/slim/Slim/Routing/RouteGroup.php',
+    'Slim\\Routing\\RouteParser' => $vendorDir . '/slim/slim/Slim/Routing/RouteParser.php',
+    'Slim\\Routing\\RouteResolver' => $vendorDir . '/slim/slim/Slim/Routing/RouteResolver.php',
+    'Slim\\Routing\\RouteRunner' => $vendorDir . '/slim/slim/Slim/Routing/RouteRunner.php',
+    'Slim\\Routing\\RoutingResults' => $vendorDir . '/slim/slim/Slim/Routing/RoutingResults.php',
     'Symfony\\Component\\Cache\\Adapter\\AbstractAdapter' => $vendorDir . '/symfony/cache/Adapter/AbstractAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\AdapterInterface' => $vendorDir . '/symfony/cache/Adapter/AdapterInterface.php',
     'Symfony\\Component\\Cache\\Adapter\\ApcuAdapter' => $vendorDir . '/symfony/cache/Adapter/ApcuAdapter.php',
diff --git a/advancedcontentfilter/vendor/composer/autoload_namespaces.php b/advancedcontentfilter/vendor/composer/autoload_namespaces.php
index c3cd0229..b7fc0125 100644
--- a/advancedcontentfilter/vendor/composer/autoload_namespaces.php
+++ b/advancedcontentfilter/vendor/composer/autoload_namespaces.php
@@ -6,5 +6,4 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    'Pimple' => array($vendorDir . '/pimple/pimple/src'),
 );
diff --git a/advancedcontentfilter/vendor/composer/autoload_psr4.php b/advancedcontentfilter/vendor/composer/autoload_psr4.php
index f466cc18..87606585 100644
--- a/advancedcontentfilter/vendor/composer/autoload_psr4.php
+++ b/advancedcontentfilter/vendor/composer/autoload_psr4.php
@@ -12,9 +12,9 @@ return array(
     'Slim\\' => array($vendorDir . '/slim/slim/Slim'),
     'Psr\\SimpleCache\\' => array($vendorDir . '/psr/simple-cache/src'),
     'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
-    'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src'),
+    'Psr\\Http\\Server\\' => array($vendorDir . '/psr/http-server-handler/src', $vendorDir . '/psr/http-server-middleware/src'),
+    'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-factory/src', $vendorDir . '/psr/http-message/src'),
     'Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
     'Psr\\Cache\\' => array($vendorDir . '/psr/cache/src'),
-    'Interop\\Container\\' => array($vendorDir . '/container-interop/container-interop/src/Interop/Container'),
     'FastRoute\\' => array($vendorDir . '/nikic/fast-route/src'),
 );
diff --git a/advancedcontentfilter/vendor/composer/autoload_real.php b/advancedcontentfilter/vendor/composer/autoload_real.php
index 6d7169ae..d6532d7d 100644
--- a/advancedcontentfilter/vendor/composer/autoload_real.php
+++ b/advancedcontentfilter/vendor/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitAdvancedContentFilterAddon
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/advancedcontentfilter/vendor/composer/autoload_static.php b/advancedcontentfilter/vendor/composer/autoload_static.php
index e7c2f8de..917d3d90 100644
--- a/advancedcontentfilter/vendor/composer/autoload_static.php
+++ b/advancedcontentfilter/vendor/composer/autoload_static.php
@@ -23,14 +23,11 @@ class ComposerStaticInitAdvancedContentFilterAddon
         array (
             'Psr\\SimpleCache\\' => 16,
             'Psr\\Log\\' => 8,
+            'Psr\\Http\\Server\\' => 16,
             'Psr\\Http\\Message\\' => 17,
             'Psr\\Container\\' => 14,
             'Psr\\Cache\\' => 10,
         ),
-        'I' => 
-        array (
-            'Interop\\Container\\' => 18,
-        ),
         'F' => 
         array (
             'FastRoute\\' => 10,
@@ -62,9 +59,15 @@ class ComposerStaticInitAdvancedContentFilterAddon
         array (
             0 => __DIR__ . '/..' . '/psr/log/Psr/Log',
         ),
+        'Psr\\Http\\Server\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/psr/http-server-handler/src',
+            1 => __DIR__ . '/..' . '/psr/http-server-middleware/src',
+        ),
         'Psr\\Http\\Message\\' => 
         array (
-            0 => __DIR__ . '/..' . '/psr/http-message/src',
+            0 => __DIR__ . '/..' . '/psr/http-factory/src',
+            1 => __DIR__ . '/..' . '/psr/http-message/src',
         ),
         'Psr\\Container\\' => 
         array (
@@ -74,26 +77,12 @@ class ComposerStaticInitAdvancedContentFilterAddon
         array (
             0 => __DIR__ . '/..' . '/psr/cache/src',
         ),
-        'Interop\\Container\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/container-interop/container-interop/src/Interop/Container',
-        ),
         'FastRoute\\' => 
         array (
             0 => __DIR__ . '/..' . '/nikic/fast-route/src',
         ),
     );
 
-    public static $prefixesPsr0 = array (
-        'P' => 
-        array (
-            'Pimple' => 
-            array (
-                0 => __DIR__ . '/..' . '/pimple/pimple/src',
-            ),
-        ),
-    );
-
     public static $classMap = array (
         'FastRoute\\BadRouteException' => __DIR__ . '/..' . '/nikic/fast-route/src/BadRouteException.php',
         'FastRoute\\DataGenerator' => __DIR__ . '/..' . '/nikic/fast-route/src/DataGenerator.php',
@@ -112,27 +101,6 @@ class ComposerStaticInitAdvancedContentFilterAddon
         'FastRoute\\RouteCollector' => __DIR__ . '/..' . '/nikic/fast-route/src/RouteCollector.php',
         'FastRoute\\RouteParser' => __DIR__ . '/..' . '/nikic/fast-route/src/RouteParser.php',
         'FastRoute\\RouteParser\\Std' => __DIR__ . '/..' . '/nikic/fast-route/src/RouteParser/Std.php',
-        'Interop\\Container\\ContainerInterface' => __DIR__ . '/..' . '/container-interop/container-interop/src/Interop/Container/ContainerInterface.php',
-        'Interop\\Container\\Exception\\ContainerException' => __DIR__ . '/..' . '/container-interop/container-interop/src/Interop/Container/Exception/ContainerException.php',
-        'Interop\\Container\\Exception\\NotFoundException' => __DIR__ . '/..' . '/container-interop/container-interop/src/Interop/Container/Exception/NotFoundException.php',
-        'Pimple\\Container' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Container.php',
-        'Pimple\\Exception\\ExpectedInvokableException' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Exception/ExpectedInvokableException.php',
-        'Pimple\\Exception\\FrozenServiceException' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Exception/FrozenServiceException.php',
-        'Pimple\\Exception\\InvalidServiceIdentifierException' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Exception/InvalidServiceIdentifierException.php',
-        'Pimple\\Exception\\UnknownIdentifierException' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Exception/UnknownIdentifierException.php',
-        'Pimple\\Psr11\\Container' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Psr11/Container.php',
-        'Pimple\\Psr11\\ServiceLocator' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php',
-        'Pimple\\ServiceIterator' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/ServiceIterator.php',
-        'Pimple\\ServiceProviderInterface' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/ServiceProviderInterface.php',
-        'Pimple\\Tests\\Fixtures\\Invokable' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Fixtures/Invokable.php',
-        'Pimple\\Tests\\Fixtures\\NonInvokable' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Fixtures/NonInvokable.php',
-        'Pimple\\Tests\\Fixtures\\PimpleServiceProvider' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Fixtures/PimpleServiceProvider.php',
-        'Pimple\\Tests\\Fixtures\\Service' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Fixtures/Service.php',
-        'Pimple\\Tests\\PimpleServiceProviderInterfaceTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/PimpleServiceProviderInterfaceTest.php',
-        'Pimple\\Tests\\PimpleTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/PimpleTest.php',
-        'Pimple\\Tests\\Psr11\\ContainerTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Psr11/ContainerTest.php',
-        'Pimple\\Tests\\Psr11\\ServiceLocatorTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Psr11/ServiceLocatorTest.php',
-        'Pimple\\Tests\\ServiceIteratorTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/ServiceIteratorTest.php',
         'Psr\\Cache\\CacheException' => __DIR__ . '/..' . '/psr/cache/src/CacheException.php',
         'Psr\\Cache\\CacheItemInterface' => __DIR__ . '/..' . '/psr/cache/src/CacheItemInterface.php',
         'Psr\\Cache\\CacheItemPoolInterface' => __DIR__ . '/..' . '/psr/cache/src/CacheItemPoolInterface.php',
@@ -141,12 +109,20 @@ class ComposerStaticInitAdvancedContentFilterAddon
         'Psr\\Container\\ContainerInterface' => __DIR__ . '/..' . '/psr/container/src/ContainerInterface.php',
         'Psr\\Container\\NotFoundExceptionInterface' => __DIR__ . '/..' . '/psr/container/src/NotFoundExceptionInterface.php',
         'Psr\\Http\\Message\\MessageInterface' => __DIR__ . '/..' . '/psr/http-message/src/MessageInterface.php',
+        'Psr\\Http\\Message\\RequestFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/RequestFactoryInterface.php',
         'Psr\\Http\\Message\\RequestInterface' => __DIR__ . '/..' . '/psr/http-message/src/RequestInterface.php',
+        'Psr\\Http\\Message\\ResponseFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/ResponseFactoryInterface.php',
         'Psr\\Http\\Message\\ResponseInterface' => __DIR__ . '/..' . '/psr/http-message/src/ResponseInterface.php',
+        'Psr\\Http\\Message\\ServerRequestFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/ServerRequestFactoryInterface.php',
         'Psr\\Http\\Message\\ServerRequestInterface' => __DIR__ . '/..' . '/psr/http-message/src/ServerRequestInterface.php',
+        'Psr\\Http\\Message\\StreamFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/StreamFactoryInterface.php',
         'Psr\\Http\\Message\\StreamInterface' => __DIR__ . '/..' . '/psr/http-message/src/StreamInterface.php',
+        'Psr\\Http\\Message\\UploadedFileFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/UploadedFileFactoryInterface.php',
         'Psr\\Http\\Message\\UploadedFileInterface' => __DIR__ . '/..' . '/psr/http-message/src/UploadedFileInterface.php',
+        'Psr\\Http\\Message\\UriFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/UriFactoryInterface.php',
         'Psr\\Http\\Message\\UriInterface' => __DIR__ . '/..' . '/psr/http-message/src/UriInterface.php',
+        'Psr\\Http\\Server\\MiddlewareInterface' => __DIR__ . '/..' . '/psr/http-server-middleware/src/MiddlewareInterface.php',
+        'Psr\\Http\\Server\\RequestHandlerInterface' => __DIR__ . '/..' . '/psr/http-server-handler/src/RequestHandlerInterface.php',
         'Psr\\Log\\AbstractLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/AbstractLogger.php',
         'Psr\\Log\\InvalidArgumentException' => __DIR__ . '/..' . '/psr/log/Psr/Log/InvalidArgumentException.php',
         'Psr\\Log\\LogLevel' => __DIR__ . '/..' . '/psr/log/Psr/Log/LogLevel.php',
@@ -155,57 +131,83 @@ class ComposerStaticInitAdvancedContentFilterAddon
         'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php',
         'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php',
         'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php',
-        'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
+        'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/DummyTest.php',
         'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
+        'Psr\\Log\\Test\\TestLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/TestLogger.php',
         'Psr\\SimpleCache\\CacheException' => __DIR__ . '/..' . '/psr/simple-cache/src/CacheException.php',
         'Psr\\SimpleCache\\CacheInterface' => __DIR__ . '/..' . '/psr/simple-cache/src/CacheInterface.php',
         'Psr\\SimpleCache\\InvalidArgumentException' => __DIR__ . '/..' . '/psr/simple-cache/src/InvalidArgumentException.php',
         'Slim\\App' => __DIR__ . '/..' . '/slim/slim/Slim/App.php',
         'Slim\\CallableResolver' => __DIR__ . '/..' . '/slim/slim/Slim/CallableResolver.php',
-        'Slim\\CallableResolverAwareTrait' => __DIR__ . '/..' . '/slim/slim/Slim/CallableResolverAwareTrait.php',
-        'Slim\\Collection' => __DIR__ . '/..' . '/slim/slim/Slim/Collection.php',
-        'Slim\\Container' => __DIR__ . '/..' . '/slim/slim/Slim/Container.php',
-        'Slim\\DefaultServicesProvider' => __DIR__ . '/..' . '/slim/slim/Slim/DefaultServicesProvider.php',
-        'Slim\\DeferredCallable' => __DIR__ . '/..' . '/slim/slim/Slim/DeferredCallable.php',
-        'Slim\\Exception\\ContainerException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/ContainerException.php',
-        'Slim\\Exception\\ContainerValueNotFoundException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/ContainerValueNotFoundException.php',
-        'Slim\\Exception\\InvalidMethodException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/InvalidMethodException.php',
-        'Slim\\Exception\\MethodNotAllowedException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/MethodNotAllowedException.php',
-        'Slim\\Exception\\NotFoundException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/NotFoundException.php',
-        'Slim\\Exception\\SlimException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/SlimException.php',
-        'Slim\\Handlers\\AbstractError' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/AbstractError.php',
-        'Slim\\Handlers\\AbstractHandler' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/AbstractHandler.php',
-        'Slim\\Handlers\\Error' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/Error.php',
-        'Slim\\Handlers\\NotAllowed' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/NotAllowed.php',
-        'Slim\\Handlers\\NotFound' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/NotFound.php',
-        'Slim\\Handlers\\PhpError' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/PhpError.php',
+        'Slim\\Error\\AbstractErrorRenderer' => __DIR__ . '/..' . '/slim/slim/Slim/Error/AbstractErrorRenderer.php',
+        'Slim\\Error\\Renderers\\HtmlErrorRenderer' => __DIR__ . '/..' . '/slim/slim/Slim/Error/Renderers/HtmlErrorRenderer.php',
+        'Slim\\Error\\Renderers\\JsonErrorRenderer' => __DIR__ . '/..' . '/slim/slim/Slim/Error/Renderers/JsonErrorRenderer.php',
+        'Slim\\Error\\Renderers\\PlainTextErrorRenderer' => __DIR__ . '/..' . '/slim/slim/Slim/Error/Renderers/PlainTextErrorRenderer.php',
+        'Slim\\Error\\Renderers\\XmlErrorRenderer' => __DIR__ . '/..' . '/slim/slim/Slim/Error/Renderers/XmlErrorRenderer.php',
+        'Slim\\Exception\\HttpBadRequestException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpBadRequestException.php',
+        'Slim\\Exception\\HttpException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpException.php',
+        'Slim\\Exception\\HttpForbiddenException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpForbiddenException.php',
+        'Slim\\Exception\\HttpGoneException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpGoneException.php',
+        'Slim\\Exception\\HttpInternalServerErrorException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpInternalServerErrorException.php',
+        'Slim\\Exception\\HttpMethodNotAllowedException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpMethodNotAllowedException.php',
+        'Slim\\Exception\\HttpNotFoundException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpNotFoundException.php',
+        'Slim\\Exception\\HttpNotImplementedException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpNotImplementedException.php',
+        'Slim\\Exception\\HttpSpecializedException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpSpecializedException.php',
+        'Slim\\Exception\\HttpUnauthorizedException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpUnauthorizedException.php',
+        'Slim\\Factory\\AppFactory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/AppFactory.php',
+        'Slim\\Factory\\Psr17\\GuzzlePsr17Factory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/GuzzlePsr17Factory.php',
+        'Slim\\Factory\\Psr17\\HttpSoftPsr17Factory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/HttpSoftPsr17Factory.php',
+        'Slim\\Factory\\Psr17\\LaminasDiactorosPsr17Factory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/LaminasDiactorosPsr17Factory.php',
+        'Slim\\Factory\\Psr17\\NyholmPsr17Factory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/NyholmPsr17Factory.php',
+        'Slim\\Factory\\Psr17\\Psr17Factory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/Psr17Factory.php',
+        'Slim\\Factory\\Psr17\\Psr17FactoryProvider' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/Psr17FactoryProvider.php',
+        'Slim\\Factory\\Psr17\\ServerRequestCreator' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/ServerRequestCreator.php',
+        'Slim\\Factory\\Psr17\\SlimHttpPsr17Factory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/SlimHttpPsr17Factory.php',
+        'Slim\\Factory\\Psr17\\SlimHttpServerRequestCreator' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/SlimHttpServerRequestCreator.php',
+        'Slim\\Factory\\Psr17\\SlimPsr17Factory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/SlimPsr17Factory.php',
+        'Slim\\Factory\\ServerRequestCreatorFactory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/ServerRequestCreatorFactory.php',
+        'Slim\\Handlers\\ErrorHandler' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/ErrorHandler.php',
+        'Slim\\Handlers\\Strategies\\RequestHandler' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/Strategies/RequestHandler.php',
         'Slim\\Handlers\\Strategies\\RequestResponse' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/Strategies/RequestResponse.php',
         'Slim\\Handlers\\Strategies\\RequestResponseArgs' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/Strategies/RequestResponseArgs.php',
-        'Slim\\Http\\Body' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Body.php',
-        'Slim\\Http\\Cookies' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Cookies.php',
-        'Slim\\Http\\Environment' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Environment.php',
-        'Slim\\Http\\Headers' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Headers.php',
-        'Slim\\Http\\Message' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Message.php',
-        'Slim\\Http\\Request' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Request.php',
-        'Slim\\Http\\RequestBody' => __DIR__ . '/..' . '/slim/slim/Slim/Http/RequestBody.php',
-        'Slim\\Http\\Response' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Response.php',
-        'Slim\\Http\\Stream' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Stream.php',
-        'Slim\\Http\\UploadedFile' => __DIR__ . '/..' . '/slim/slim/Slim/Http/UploadedFile.php',
-        'Slim\\Http\\Uri' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Uri.php',
+        'Slim\\Handlers\\Strategies\\RequestResponseNamedArgs' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/Strategies/RequestResponseNamedArgs.php',
+        'Slim\\Interfaces\\AdvancedCallableResolverInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/AdvancedCallableResolverInterface.php',
         'Slim\\Interfaces\\CallableResolverInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/CallableResolverInterface.php',
-        'Slim\\Interfaces\\CollectionInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/CollectionInterface.php',
-        'Slim\\Interfaces\\Http\\CookiesInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/Http/CookiesInterface.php',
-        'Slim\\Interfaces\\Http\\EnvironmentInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/Http/EnvironmentInterface.php',
-        'Slim\\Interfaces\\Http\\HeadersInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/Http/HeadersInterface.php',
+        'Slim\\Interfaces\\DispatcherInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/DispatcherInterface.php',
+        'Slim\\Interfaces\\ErrorHandlerInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/ErrorHandlerInterface.php',
+        'Slim\\Interfaces\\ErrorRendererInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/ErrorRendererInterface.php',
         'Slim\\Interfaces\\InvocationStrategyInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/InvocationStrategyInterface.php',
+        'Slim\\Interfaces\\MiddlewareDispatcherInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/MiddlewareDispatcherInterface.php',
+        'Slim\\Interfaces\\Psr17FactoryInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/Psr17FactoryInterface.php',
+        'Slim\\Interfaces\\Psr17FactoryProviderInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/Psr17FactoryProviderInterface.php',
+        'Slim\\Interfaces\\RequestHandlerInvocationStrategyInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/RequestHandlerInvocationStrategyInterface.php',
+        'Slim\\Interfaces\\RouteCollectorInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/RouteCollectorInterface.php',
+        'Slim\\Interfaces\\RouteCollectorProxyInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/RouteCollectorProxyInterface.php',
         'Slim\\Interfaces\\RouteGroupInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/RouteGroupInterface.php',
         'Slim\\Interfaces\\RouteInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/RouteInterface.php',
-        'Slim\\Interfaces\\RouterInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/RouterInterface.php',
-        'Slim\\MiddlewareAwareTrait' => __DIR__ . '/..' . '/slim/slim/Slim/MiddlewareAwareTrait.php',
-        'Slim\\Routable' => __DIR__ . '/..' . '/slim/slim/Slim/Routable.php',
-        'Slim\\Route' => __DIR__ . '/..' . '/slim/slim/Slim/Route.php',
-        'Slim\\RouteGroup' => __DIR__ . '/..' . '/slim/slim/Slim/RouteGroup.php',
-        'Slim\\Router' => __DIR__ . '/..' . '/slim/slim/Slim/Router.php',
+        'Slim\\Interfaces\\RouteParserInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/RouteParserInterface.php',
+        'Slim\\Interfaces\\RouteResolverInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/RouteResolverInterface.php',
+        'Slim\\Interfaces\\ServerRequestCreatorInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/ServerRequestCreatorInterface.php',
+        'Slim\\Logger' => __DIR__ . '/..' . '/slim/slim/Slim/Logger.php',
+        'Slim\\MiddlewareDispatcher' => __DIR__ . '/..' . '/slim/slim/Slim/MiddlewareDispatcher.php',
+        'Slim\\Middleware\\BodyParsingMiddleware' => __DIR__ . '/..' . '/slim/slim/Slim/Middleware/BodyParsingMiddleware.php',
+        'Slim\\Middleware\\ContentLengthMiddleware' => __DIR__ . '/..' . '/slim/slim/Slim/Middleware/ContentLengthMiddleware.php',
+        'Slim\\Middleware\\ErrorMiddleware' => __DIR__ . '/..' . '/slim/slim/Slim/Middleware/ErrorMiddleware.php',
+        'Slim\\Middleware\\MethodOverrideMiddleware' => __DIR__ . '/..' . '/slim/slim/Slim/Middleware/MethodOverrideMiddleware.php',
+        'Slim\\Middleware\\OutputBufferingMiddleware' => __DIR__ . '/..' . '/slim/slim/Slim/Middleware/OutputBufferingMiddleware.php',
+        'Slim\\Middleware\\RoutingMiddleware' => __DIR__ . '/..' . '/slim/slim/Slim/Middleware/RoutingMiddleware.php',
+        'Slim\\ResponseEmitter' => __DIR__ . '/..' . '/slim/slim/Slim/ResponseEmitter.php',
+        'Slim\\Routing\\Dispatcher' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/Dispatcher.php',
+        'Slim\\Routing\\FastRouteDispatcher' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/FastRouteDispatcher.php',
+        'Slim\\Routing\\Route' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/Route.php',
+        'Slim\\Routing\\RouteCollector' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RouteCollector.php',
+        'Slim\\Routing\\RouteCollectorProxy' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RouteCollectorProxy.php',
+        'Slim\\Routing\\RouteContext' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RouteContext.php',
+        'Slim\\Routing\\RouteGroup' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RouteGroup.php',
+        'Slim\\Routing\\RouteParser' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RouteParser.php',
+        'Slim\\Routing\\RouteResolver' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RouteResolver.php',
+        'Slim\\Routing\\RouteRunner' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RouteRunner.php',
+        'Slim\\Routing\\RoutingResults' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RoutingResults.php',
         'Symfony\\Component\\Cache\\Adapter\\AbstractAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/AbstractAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\AdapterInterface' => __DIR__ . '/..' . '/symfony/cache/Adapter/AdapterInterface.php',
         'Symfony\\Component\\Cache\\Adapter\\ApcuAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/ApcuAdapter.php',
@@ -294,7 +296,6 @@ class ComposerStaticInitAdvancedContentFilterAddon
         return \Closure::bind(function () use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitAdvancedContentFilterAddon::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitAdvancedContentFilterAddon::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInitAdvancedContentFilterAddon::$prefixesPsr0;
             $loader->classMap = ComposerStaticInitAdvancedContentFilterAddon::$classMap;
 
         }, null, ClassLoader::class);
diff --git a/advancedcontentfilter/vendor/composer/installed.json b/advancedcontentfilter/vendor/composer/installed.json
index 8e6b80dc..1a84a8fd 100644
--- a/advancedcontentfilter/vendor/composer/installed.json
+++ b/advancedcontentfilter/vendor/composer/installed.json
@@ -1,37 +1,4 @@
 [
-    {
-        "name": "container-interop/container-interop",
-        "version": "1.2.0",
-        "version_normalized": "1.2.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/container-interop/container-interop.git",
-            "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
-            "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
-            "shasum": ""
-        },
-        "require": {
-            "psr/container": "^1.0"
-        },
-        "time": "2017-02-14T19:40:03+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Interop\\Container\\": "src/Interop/Container/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
-        "homepage": "https://github.com/container-interop/container-interop"
-    },
     {
         "name": "nikic/fast-route",
         "version": "v1.3.0",
@@ -80,58 +47,6 @@
             "routing"
         ]
     },
-    {
-        "name": "pimple/pimple",
-        "version": "v3.2.3",
-        "version_normalized": "3.2.3.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/silexphp/Pimple.git",
-            "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/silexphp/Pimple/zipball/9e403941ef9d65d20cba7d54e29fe906db42cf32",
-            "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0",
-            "psr/container": "^1.0"
-        },
-        "require-dev": {
-            "symfony/phpunit-bridge": "^3.2"
-        },
-        "time": "2018-01-21T07:42:36+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "3.2.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Pimple": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            }
-        ],
-        "description": "Pimple, a simple Dependency Injection Container",
-        "homepage": "http://pimple.sensiolabs.org",
-        "keywords": [
-            "container",
-            "dependency injection"
-        ]
-    },
     {
         "name": "psr/cache",
         "version": "1.0.1",
@@ -182,27 +97,27 @@
     },
     {
         "name": "psr/container",
-        "version": "1.0.0",
-        "version_normalized": "1.0.0.0",
+        "version": "2.0.2",
+        "version_normalized": "2.0.2.0",
         "source": {
             "type": "git",
             "url": "https://github.com/php-fig/container.git",
-            "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+            "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-            "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+            "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+            "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.0"
+            "php": ">=7.4.0"
         },
-        "time": "2017-02-14T16:28:37+00:00",
+        "time": "2021-11-05T16:47:00+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "1.0.x-dev"
+                "dev-master": "2.0.x-dev"
             }
         },
         "installation-source": "dist",
@@ -218,7 +133,7 @@
         "authors": [
             {
                 "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
+                "homepage": "https://www.php-fig.org/"
             }
         ],
         "description": "Common Container Interface (PHP FIG PSR-11)",
@@ -232,24 +147,25 @@
         ]
     },
     {
-        "name": "psr/http-message",
-        "version": "1.0.1",
-        "version_normalized": "1.0.1.0",
+        "name": "psr/http-factory",
+        "version": "1.0.2",
+        "version_normalized": "1.0.2.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/php-fig/http-message.git",
-            "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+            "url": "https://github.com/php-fig/http-factory.git",
+            "reference": "e616d01114759c4c489f93b099585439f795fe35"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-            "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+            "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
+            "reference": "e616d01114759c4c489f93b099585439f795fe35",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.0"
+            "php": ">=7.0.0",
+            "psr/http-message": "^1.0 || ^2.0"
         },
-        "time": "2016-08-06T14:39:51+00:00",
+        "time": "2023-04-10T20:10:41+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -266,6 +182,59 @@
         "license": [
             "MIT"
         ],
+        "authors": [
+            {
+                "name": "PHP-FIG",
+                "homepage": "https://www.php-fig.org/"
+            }
+        ],
+        "description": "Common interfaces for PSR-7 HTTP message factories",
+        "keywords": [
+            "factory",
+            "http",
+            "message",
+            "psr",
+            "psr-17",
+            "psr-7",
+            "request",
+            "response"
+        ]
+    },
+    {
+        "name": "psr/http-message",
+        "version": "1.1",
+        "version_normalized": "1.1.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/php-fig/http-message.git",
+            "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+            "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+            "shasum": ""
+        },
+        "require": {
+            "php": "^7.2 || ^8.0"
+        },
+        "time": "2023-04-04T09:50:52+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.1.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Psr\\Http\\Message\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
         "authors": [
             {
                 "name": "PHP-FIG",
@@ -284,28 +253,138 @@
         ]
     },
     {
-        "name": "psr/log",
+        "name": "psr/http-server-handler",
         "version": "1.0.2",
         "version_normalized": "1.0.2.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/php-fig/log.git",
-            "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+            "url": "https://github.com/php-fig/http-server-handler.git",
+            "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
-            "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+            "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/84c4fb66179be4caaf8e97bd239203245302e7d4",
+            "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=7.0",
+            "psr/http-message": "^1.0 || ^2.0"
+        },
+        "time": "2023-04-10T20:06:20+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Psr\\Http\\Server\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "PHP-FIG",
+                "homepage": "https://www.php-fig.org/"
+            }
+        ],
+        "description": "Common interface for HTTP server-side request handler",
+        "keywords": [
+            "handler",
+            "http",
+            "http-interop",
+            "psr",
+            "psr-15",
+            "psr-7",
+            "request",
+            "response",
+            "server"
+        ]
+    },
+    {
+        "name": "psr/http-server-middleware",
+        "version": "1.0.2",
+        "version_normalized": "1.0.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/php-fig/http-server-middleware.git",
+            "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/c1481f747daaa6a0782775cd6a8c26a1bf4a3829",
+            "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=7.0",
+            "psr/http-message": "^1.0 || ^2.0",
+            "psr/http-server-handler": "^1.0"
+        },
+        "time": "2023-04-11T06:14:47+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Psr\\Http\\Server\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "PHP-FIG",
+                "homepage": "https://www.php-fig.org/"
+            }
+        ],
+        "description": "Common interface for HTTP server-side middleware",
+        "keywords": [
+            "http",
+            "http-interop",
+            "middleware",
+            "psr",
+            "psr-15",
+            "psr-7",
+            "request",
+            "response"
+        ]
+    },
+    {
+        "name": "psr/log",
+        "version": "1.1.4",
+        "version_normalized": "1.1.4.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/php-fig/log.git",
+            "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+            "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3.0"
         },
-        "time": "2016-10-10T12:19:37+00:00",
+        "time": "2021-05-03T11:20:27+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "1.0.x-dev"
+                "dev-master": "1.1.x-dev"
             }
         },
         "installation-source": "dist",
@@ -321,7 +400,7 @@
         "authors": [
             {
                 "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
+                "homepage": "https://www.php-fig.org/"
             }
         ],
         "description": "Common interface for logging libraries",
@@ -384,35 +463,54 @@
     },
     {
         "name": "slim/slim",
-        "version": "3.9.2",
-        "version_normalized": "3.9.2.0",
+        "version": "4.12.0",
+        "version_normalized": "4.12.0.0",
         "source": {
             "type": "git",
             "url": "https://github.com/slimphp/Slim.git",
-            "reference": "4086d0106cf5a7135c69fce4161fe355a8feb118"
+            "reference": "e9e99c2b24398b967841c6c4c3048622cc7e2b18"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/slimphp/Slim/zipball/4086d0106cf5a7135c69fce4161fe355a8feb118",
-            "reference": "4086d0106cf5a7135c69fce4161fe355a8feb118",
+            "url": "https://api.github.com/repos/slimphp/Slim/zipball/e9e99c2b24398b967841c6c4c3048622cc7e2b18",
+            "reference": "e9e99c2b24398b967841c6c4c3048622cc7e2b18",
             "shasum": ""
         },
         "require": {
-            "container-interop/container-interop": "^1.2",
-            "nikic/fast-route": "^1.0",
-            "php": ">=5.5.0",
-            "pimple/pimple": "^3.0",
-            "psr/container": "^1.0",
-            "psr/http-message": "^1.0"
-        },
-        "provide": {
-            "psr/http-message-implementation": "1.0"
+            "ext-json": "*",
+            "nikic/fast-route": "^1.3",
+            "php": "^7.4 || ^8.0",
+            "psr/container": "^1.0 || ^2.0",
+            "psr/http-factory": "^1.0",
+            "psr/http-message": "^1.1",
+            "psr/http-server-handler": "^1.0",
+            "psr/http-server-middleware": "^1.0",
+            "psr/log": "^1.1 || ^2.0 || ^3.0"
         },
         "require-dev": {
-            "phpunit/phpunit": "^4.0",
-            "squizlabs/php_codesniffer": "^2.5"
+            "adriansuter/php-autoload-override": "^1.4",
+            "ext-simplexml": "*",
+            "guzzlehttp/psr7": "^2.5",
+            "httpsoft/http-message": "^1.1",
+            "httpsoft/http-server-request": "^1.1",
+            "laminas/laminas-diactoros": "^2.17",
+            "nyholm/psr7": "^1.8",
+            "nyholm/psr7-server": "^1.0",
+            "phpspec/prophecy": "^1.17",
+            "phpspec/prophecy-phpunit": "^2.0",
+            "phpstan/phpstan": "^1.10",
+            "phpunit/phpunit": "^9.6",
+            "slim/http": "^1.3",
+            "slim/psr7": "^1.6",
+            "squizlabs/php_codesniffer": "^3.7"
         },
-        "time": "2017-11-26T19:13:09+00:00",
+        "suggest": {
+            "ext-simplexml": "Needed to support XML format in BodyParsingMiddleware",
+            "ext-xml": "Needed to support XML format in BodyParsingMiddleware",
+            "php-di/php-di": "PHP-DI is the recommended container library to be used with Slim",
+            "slim/psr7": "Slim PSR-7 implementation. See https://www.slimframework.com/docs/v4/start/installation.html for more information."
+        },
+        "time": "2023-07-23T04:54:29+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -425,49 +523,64 @@
             "MIT"
         ],
         "authors": [
-            {
-                "name": "Rob Allen",
-                "email": "rob@akrabat.com",
-                "homepage": "http://akrabat.com"
-            },
             {
                 "name": "Josh Lockhart",
                 "email": "hello@joshlockhart.com",
                 "homepage": "https://joshlockhart.com"
             },
-            {
-                "name": "Gabriel Manricks",
-                "email": "gmanricks@me.com",
-                "homepage": "http://gabrielmanricks.com"
-            },
             {
                 "name": "Andrew Smith",
                 "email": "a.smith@silentworks.co.uk",
                 "homepage": "http://silentworks.co.uk"
+            },
+            {
+                "name": "Rob Allen",
+                "email": "rob@akrabat.com",
+                "homepage": "http://akrabat.com"
+            },
+            {
+                "name": "Pierre Berube",
+                "email": "pierre@lgse.com",
+                "homepage": "http://www.lgse.com"
+            },
+            {
+                "name": "Gabriel Manricks",
+                "email": "gmanricks@me.com",
+                "homepage": "http://gabrielmanricks.com"
             }
         ],
         "description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs",
-        "homepage": "https://slimframework.com",
+        "homepage": "https://www.slimframework.com",
         "keywords": [
             "api",
             "framework",
             "micro",
             "router"
+        ],
+        "funding": [
+            {
+                "url": "https://opencollective.com/slimphp",
+                "type": "open_collective"
+            },
+            {
+                "url": "https://tidelift.com/funding/github/packagist/slim/slim",
+                "type": "tidelift"
+            }
         ]
     },
     {
         "name": "symfony/cache",
-        "version": "v3.4.8",
-        "version_normalized": "3.4.8.0",
+        "version": "v3.4.47",
+        "version_normalized": "3.4.47.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/cache.git",
-            "reference": "13255ddd056e49f3154747943f8ee175d555d394"
+            "reference": "a7a14c4832760bd1fbd31be2859ffedc9b6ff813"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/cache/zipball/13255ddd056e49f3154747943f8ee175d555d394",
-            "reference": "13255ddd056e49f3154747943f8ee175d555d394",
+            "url": "https://api.github.com/repos/symfony/cache/zipball/a7a14c4832760bd1fbd31be2859ffedc9b6ff813",
+            "reference": "a7a14c4832760bd1fbd31be2859ffedc9b6ff813",
             "shasum": ""
         },
         "require": {
@@ -486,17 +599,12 @@
         },
         "require-dev": {
             "cache/integration-tests": "dev-master",
-            "doctrine/cache": "~1.6",
-            "doctrine/dbal": "~2.4",
-            "predis/predis": "~1.0"
+            "doctrine/cache": "^1.6",
+            "doctrine/dbal": "^2.4|^3.0",
+            "predis/predis": "^1.0"
         },
-        "time": "2018-04-02T14:35:16+00:00",
+        "time": "2020-10-24T10:57:07+00:00",
         "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "3.4-dev"
-            }
-        },
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
@@ -525,34 +633,44 @@
         "keywords": [
             "caching",
             "psr6"
+        ],
+        "funding": [
+            {
+                "url": "https://symfony.com/sponsor",
+                "type": "custom"
+            },
+            {
+                "url": "https://github.com/fabpot",
+                "type": "github"
+            },
+            {
+                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                "type": "tidelift"
+            }
         ]
     },
     {
         "name": "symfony/expression-language",
-        "version": "v3.4.8",
-        "version_normalized": "3.4.8.0",
+        "version": "v3.4.47",
+        "version_normalized": "3.4.47.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/expression-language.git",
-            "reference": "867e4d1f5d4e52435a8ffff6b24fd6a801582241"
+            "reference": "de38e66398fca1fcb9c48e80279910e6889cb28f"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/expression-language/zipball/867e4d1f5d4e52435a8ffff6b24fd6a801582241",
-            "reference": "867e4d1f5d4e52435a8ffff6b24fd6a801582241",
+            "url": "https://api.github.com/repos/symfony/expression-language/zipball/de38e66398fca1fcb9c48e80279910e6889cb28f",
+            "reference": "de38e66398fca1fcb9c48e80279910e6889cb28f",
             "shasum": ""
         },
         "require": {
             "php": "^5.5.9|>=7.0.8",
-            "symfony/cache": "~3.1|~4.0"
+            "symfony/cache": "~3.1|~4.0",
+            "symfony/polyfill-php70": "~1.6"
         },
-        "time": "2018-01-03T07:37:34+00:00",
+        "time": "2020-10-24T10:57:07+00:00",
         "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "3.4-dev"
-            }
-        },
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
@@ -577,41 +695,59 @@
             }
         ],
         "description": "Symfony ExpressionLanguage Component",
-        "homepage": "https://symfony.com"
+        "homepage": "https://symfony.com",
+        "funding": [
+            {
+                "url": "https://symfony.com/sponsor",
+                "type": "custom"
+            },
+            {
+                "url": "https://github.com/fabpot",
+                "type": "github"
+            },
+            {
+                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                "type": "tidelift"
+            }
+        ]
     },
     {
         "name": "symfony/polyfill-apcu",
-        "version": "v1.7.0",
-        "version_normalized": "1.7.0.0",
+        "version": "v1.28.0",
+        "version_normalized": "1.28.0.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/polyfill-apcu.git",
-            "reference": "e8ae2136ddb53dea314df56fcd88e318ab936c00"
+            "reference": "c6c2c0f5f4cb0b100c5dfea807ef5cd27bbe9899"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/e8ae2136ddb53dea314df56fcd88e318ab936c00",
-            "reference": "e8ae2136ddb53dea314df56fcd88e318ab936c00",
+            "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/c6c2c0f5f4cb0b100c5dfea807ef5cd27bbe9899",
+            "reference": "c6c2c0f5f4cb0b100c5dfea807ef5cd27bbe9899",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.3"
+            "php": ">=7.1"
         },
-        "time": "2018-01-30T19:27:44+00:00",
+        "time": "2023-01-26T09:26:14+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "1.7-dev"
+                "dev-main": "1.28-dev"
+            },
+            "thanks": {
+                "name": "symfony/polyfill",
+                "url": "https://github.com/symfony/polyfill"
             }
         },
         "installation-source": "dist",
         "autoload": {
-            "psr-4": {
-                "Symfony\\Polyfill\\Apcu\\": ""
-            },
             "files": [
                 "bootstrap.php"
-            ]
+            ],
+            "psr-4": {
+                "Symfony\\Polyfill\\Apcu\\": ""
+            }
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
@@ -635,6 +771,86 @@
             "polyfill",
             "portable",
             "shim"
+        ],
+        "funding": [
+            {
+                "url": "https://symfony.com/sponsor",
+                "type": "custom"
+            },
+            {
+                "url": "https://github.com/fabpot",
+                "type": "github"
+            },
+            {
+                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                "type": "tidelift"
+            }
+        ]
+    },
+    {
+        "name": "symfony/polyfill-php70",
+        "version": "v1.20.0",
+        "version_normalized": "1.20.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/polyfill-php70.git",
+            "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/5f03a781d984aae42cebd18e7912fa80f02ee644",
+            "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=7.1"
+        },
+        "time": "2020-10-23T14:02:19+00:00",
+        "type": "metapackage",
+        "extra": {
+            "branch-alias": {
+                "dev-main": "1.20-dev"
+            },
+            "thanks": {
+                "name": "symfony/polyfill",
+                "url": "https://github.com/symfony/polyfill"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Nicolas Grekas",
+                "email": "p@tchwork.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
+        "homepage": "https://symfony.com",
+        "keywords": [
+            "compatibility",
+            "polyfill",
+            "portable",
+            "shim"
+        ],
+        "funding": [
+            {
+                "url": "https://symfony.com/sponsor",
+                "type": "custom"
+            },
+            {
+                "url": "https://github.com/fabpot",
+                "type": "github"
+            },
+            {
+                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                "type": "tidelift"
+            }
         ]
     }
 ]
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/.gitignore b/advancedcontentfilter/vendor/container-interop/container-interop/.gitignore
deleted file mode 100644
index b2395aa0..00000000
--- a/advancedcontentfilter/vendor/container-interop/container-interop/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-composer.lock
-composer.phar
-/vendor/
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/LICENSE b/advancedcontentfilter/vendor/container-interop/container-interop/LICENSE
deleted file mode 100644
index 7671d902..00000000
--- a/advancedcontentfilter/vendor/container-interop/container-interop/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2013 container-interop
-
-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/advancedcontentfilter/vendor/container-interop/container-interop/README.md b/advancedcontentfilter/vendor/container-interop/container-interop/README.md
deleted file mode 100644
index cdd7a44c..00000000
--- a/advancedcontentfilter/vendor/container-interop/container-interop/README.md
+++ /dev/null
@@ -1,148 +0,0 @@
-# Container Interoperability
-
-[![Latest Stable Version](https://poser.pugx.org/container-interop/container-interop/v/stable.png)](https://packagist.org/packages/container-interop/container-interop)
-[![Total Downloads](https://poser.pugx.org/container-interop/container-interop/downloads.svg)](https://packagist.org/packages/container-interop/container-interop)
-
-## Deprecation warning!
-
-Starting Feb. 13th 2017, container-interop is officially deprecated in favor of [PSR-11](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-11-container.md).
-Container-interop has been the test-bed of PSR-11. From v1.2, container-interop directly extends PSR-11 interfaces.
-Therefore, all containers implementing container-interop are now *de-facto* compatible with PSR-11.
-
-- Projects implementing container-interop interfaces are encouraged to directly implement PSR-11 interfaces instead.
-- Projects consuming container-interop interfaces are very strongly encouraged to directly type-hint on PSR-11 interfaces, in order to be compatible with PSR-11 containers that are not compatible with container-interop.
-
-Regarding the delegate lookup feature, that is present in container-interop and not in PSR-11, the feature is actually a design pattern. It is therefore not deprecated. Documentation regarding this design pattern will be migrated from this repository into a separate website in the future.
-
-## About
-
-*container-interop* tries to identify and standardize features in *container* objects (service locators,
-dependency injection containers, etc.) to achieve interoperability.
-
-Through discussions and trials, we try to create a standard, made of common interfaces but also recommendations.
-
-If PHP projects that provide container implementations begin to adopt these common standards, then PHP
-applications and projects that use containers can depend on the common interfaces instead of specific
-implementations. This facilitates a high-level of interoperability and flexibility that allows users to consume
-*any* container implementation that can be adapted to these interfaces.
-
-The work done in this project is not officially endorsed by the [PHP-FIG](http://www.php-fig.org/), but it is being
-worked on by members of PHP-FIG and other good developers. We adhere to the spirit and ideals of PHP-FIG, and hope
-this project will pave the way for one or more future PSRs.
-
-
-## Installation
-
-You can install this package through Composer:
-
-```json
-composer require container-interop/container-interop
-```
-
-The packages adheres to the [SemVer](http://semver.org/) specification, and there will be full backward compatibility
-between minor versions.
-
-## Standards
-
-### Available
-
-- [`ContainerInterface`](src/Interop/Container/ContainerInterface.php).
-[Description](docs/ContainerInterface.md) [Meta Document](docs/ContainerInterface-meta.md).
-Describes the interface of a container that exposes methods to read its entries.
-- [*Delegate lookup feature*](docs/Delegate-lookup.md).
-[Meta Document](docs/Delegate-lookup-meta.md).
-Describes the ability for a container to delegate the lookup of its dependencies to a third-party container. This
-feature lets several containers work together in a single application.
-
-### Proposed
-
-View open [request for comments](https://github.com/container-interop/container-interop/labels/RFC)
-
-## Compatible projects
-
-### Projects implementing `ContainerInterface`
-
-- [Acclimate](https://github.com/jeremeamia/acclimate-container): Adapters for
-  Aura.Di, Laravel, Nette DI, Pimple, Symfony DI, ZF2 Service manager, ZF2
-  Dependency injection and any container using `ArrayAccess`
-- [Aura.Di](https://github.com/auraphp/Aura.Di)
-- [auryn-container-interop](https://github.com/elazar/auryn-container-interop)
-- [Burlap](https://github.com/codeeverything/burlap)
-- [Chernozem](https://github.com/pyrsmk/Chernozem)
-- [Data Manager](https://github.com/chrismichaels84/data-manager)
-- [Disco](https://github.com/bitexpert/disco)
-- [InDI](https://github.com/idealogica/indi)
-- [League/Container](http://container.thephpleague.com/)
-- [Mouf](http://mouf-php.com)
-- [Njasm Container](https://github.com/njasm/container)
-- [PHP-DI](http://php-di.org)
-- [Picotainer](https://github.com/thecodingmachine/picotainer)
-- [PimpleInterop](https://github.com/moufmouf/pimple-interop)
-- [Pimple3-ContainerInterop](https://github.com/Sam-Burns/pimple3-containerinterop) (using Pimple v3)
-- [SitePoint Container](https://github.com/sitepoint/Container)
-- [Thruster Container](https://github.com/ThrusterIO/container) (PHP7 only)
-- [Ultra-Lite Container](https://github.com/ultra-lite/container)
-- [Unbox](https://github.com/mindplay-dk/unbox)
-- [XStatic](https://github.com/jeremeamia/xstatic)
-- [Zend\ServiceManager](https://github.com/zendframework/zend-servicemanager)
-- [Zit](https://github.com/inxilpro/Zit)
-
-### Projects implementing the *delegate lookup* feature
-
-- [Aura.Di](https://github.com/auraphp/Aura.Di)
-- [Burlap](https://github.com/codeeverything/burlap)
-- [Chernozem](https://github.com/pyrsmk/Chernozem)
-- [InDI](https://github.com/idealogica/indi)
-- [League/Container](http://container.thephpleague.com/)
-- [Mouf](http://mouf-php.com)
-- [Picotainer](https://github.com/thecodingmachine/picotainer)
-- [PHP-DI](http://php-di.org)
-- [PimpleInterop](https://github.com/moufmouf/pimple-interop)
-- [Ultra-Lite Container](https://github.com/ultra-lite/container)
-
-### Middlewares implementing `ContainerInterface`
-
-- [Alias-Container](https://github.com/thecodingmachine/alias-container): add
-  aliases support to any container
-- [Prefixer-Container](https://github.com/thecodingmachine/prefixer-container):
-  dynamically prefix identifiers
-- [Lazy-Container](https://github.com/snapshotpl/lazy-container): lazy services
-
-### Projects using `ContainerInterface`
-
-The list below contains only a sample of all the projects consuming `ContainerInterface`. For a more complete list have a look [here](http://packanalyst.com/class?q=Interop%5CContainer%5CContainerInterface).
-
-| | Downloads |
-| --- | --- |
-| [Adroit](https://github.com/bitexpert/adroit) | ![](https://img.shields.io/packagist/dt/bitexpert/adroit.svg) |
-| [Behat](https://github.com/Behat/Behat/pull/974) | ![](https://img.shields.io/packagist/dt/behat/behat.svg) |
-| [blast-facades](https://github.com/phpthinktank/blast-facades): Minimize complexity and represent dependencies as facades. | ![](https://img.shields.io/packagist/dt/blast/facades.svg) |
-| [interop.silex.di](https://github.com/thecodingmachine/interop.silex.di): an extension to [Silex](http://silex.sensiolabs.org/) that adds support for any *container-interop* compatible container | ![](https://img.shields.io/packagist/dt/mouf/interop.silex.di.svg) |
-| [mindplay/walkway](https://github.com/mindplay-dk/walkway): a modular request router | ![](https://img.shields.io/packagist/dt/mindplay/walkway.svg) |
-| [mindplay/middleman](https://github.com/mindplay-dk/middleman): minimalist PSR-7 middleware dispatcher | ![](https://img.shields.io/packagist/dt/mindplay/middleman.svg) |
-| [PHP-DI/Invoker](https://github.com/PHP-DI/Invoker): extensible and configurable invoker/dispatcher | ![](https://img.shields.io/packagist/dt/php-di/invoker.svg) |
-| [Prophiler](https://github.com/fabfuel/prophiler) | ![](https://img.shields.io/packagist/dt/fabfuel/prophiler.svg) |
-| [Silly](https://github.com/mnapoli/silly): CLI micro-framework | ![](https://img.shields.io/packagist/dt/mnapoli/silly.svg) |
-| [Slim v3](https://github.com/slimphp/Slim) | ![](https://img.shields.io/packagist/dt/slim/slim.svg) |
-| [Splash](http://mouf-php.com/packages/mouf/mvc.splash-common/version/8.0-dev/README.md) | ![](https://img.shields.io/packagist/dt/mouf/mvc.splash-common.svg) |
-| [Woohoo Labs. Harmony](https://github.com/woohoolabs/harmony): a flexible micro-framework | ![](https://img.shields.io/packagist/dt/woohoolabs/harmony.svg) |
-| [zend-expressive](https://github.com/zendframework/zend-expressive) | ![](https://img.shields.io/packagist/dt/zendframework/zend-expressive.svg) |
-
-
-## Workflow
-
-Everyone is welcome to join and contribute.
-
-The general workflow looks like this:
-
-1. Someone opens a discussion (GitHub issue) to suggest an interface
-1. Feedback is gathered
-1. The interface is added to a development branch
-1. We release alpha versions so that the interface can be experimented with
-1. Discussions and edits ensue until the interface is deemed stable by a general consensus
-1. A new minor version of the package is released
-
-We try to not break BC by creating new interfaces instead of editing existing ones.
-
-While we currently work on interfaces, we are open to anything that might help towards interoperability, may that
-be code, best practices, etc.
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/composer.json b/advancedcontentfilter/vendor/container-interop/container-interop/composer.json
deleted file mode 100644
index 855f7667..00000000
--- a/advancedcontentfilter/vendor/container-interop/container-interop/composer.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "name": "container-interop/container-interop",
-    "type": "library",
-    "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
-    "homepage": "https://github.com/container-interop/container-interop",
-    "license": "MIT",
-    "autoload": {
-        "psr-4": {
-            "Interop\\Container\\": "src/Interop/Container/"
-        }
-    },
-    "require": {
-        "psr/container": "^1.0"
-    }
-}
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/docs/ContainerInterface-meta.md b/advancedcontentfilter/vendor/container-interop/container-interop/docs/ContainerInterface-meta.md
deleted file mode 100644
index 59f3d559..00000000
--- a/advancedcontentfilter/vendor/container-interop/container-interop/docs/ContainerInterface-meta.md
+++ /dev/null
@@ -1,114 +0,0 @@
-# ContainerInterface Meta Document
-
-## Introduction
-
-This document describes the process and discussions that lead to the `ContainerInterface`.
-Its goal is to explain the reasons behind each decision.
-
-## Goal
-
-The goal set by `ContainerInterface` is to standardize how frameworks and libraries make use of a
-container to obtain objects and parameters.
-
-By standardizing such a behavior, frameworks and libraries using the `ContainerInterface`
-could work with any compatible container.
-That would allow end users to choose their own container based on their own preferences.
-
-It is important to distinguish the two usages of a container:
-
-- configuring entries
-- fetching entries
-
-Most of the time, those two sides are not used by the same party.
-While it is often end users who tend to configure entries, it is generally the framework that fetch
-entries to build the application.
-
-This is why this interface focuses only on how entries can be fetched from a container.
-
-## Interface name
-
-The interface name has been thoroughly discussed and was decided by a vote.
-
-The list of options considered with their respective votes are:
-
-- `ContainerInterface`: +8
-- `ProviderInterface`: +2
-- `LocatorInterface`: 0
-- `ReadableContainerInterface`: -5
-- `ServiceLocatorInterface`: -6
-- `ObjectFactory`: -6
-- `ObjectStore`: -8
-- `ConsumerInterface`: -9
-
-[Full results of the vote](https://github.com/container-interop/container-interop/wiki/%231-interface-name:-Vote)
-
-The complete discussion can be read in [the issue #1](https://github.com/container-interop/container-interop/issues/1).
-
-## Interface methods
-
-The choice of which methods the interface would contain was made after a statistical analysis of existing containers.
-The results of this analysis are available [in this document](https://gist.github.com/mnapoli/6159681).
-
-The summary of the analysis showed that:
-
-- all containers offer a method to get an entry by its id
-- a large majority name such method `get()`
-- for all containers, the `get()` method has 1 mandatory parameter of type string
-- some containers have an optional additional argument for `get()`, but it doesn't have the same purpose between containers
-- a large majority of the containers offer a method to test if it can return an entry by its id
-- a majority name such method `has()`
-- for all containers offering `has()`, the method has exactly 1 parameter of type string
-- a large majority of the containers throw an exception rather than returning null when an entry is not found in `get()`
-- a large majority of the containers don't implement `ArrayAccess`
-
-The question of whether to include methods to define entries has been discussed in
-[issue #1](https://github.com/container-interop/container-interop/issues/1).
-It has been judged that such methods do not belong in the interface described here because it is out of its scope
-(see the "Goal" section).
-
-As a result, the `ContainerInterface` contains two methods:
-
-- `get()`, returning anything, with one mandatory string parameter. Should throw an exception if the entry is not found.
-- `has()`, returning a boolean, with one mandatory string parameter.
-
-### Number of parameters in `get()` method
-
-While `ContainerInterface` only defines one mandatory parameter in `get()`, it is not incompatible with
-existing containers that have additional optional parameters. PHP allows an implementation to offer more parameters
-as long as they are optional, because the implementation *does* satisfy the interface.
-
-This issue has been discussed in [issue #6](https://github.com/container-interop/container-interop/issues/6).
-
-### Type of the `$id` parameter
-
-The type of the `$id` parameter in `get()` and `has()` has been discussed in
-[issue #6](https://github.com/container-interop/container-interop/issues/6).
-While `string` is used in all the containers that were analyzed, it was suggested that allowing
-anything (such as objects) could allow containers to offer a more advanced query API.
-
-An example given was to use the container as an object builder. The `$id` parameter would then be an
-object that would describe how to create an instance.
-
-The conclusion of the discussion was that this was beyond the scope of getting entries from a container without
-knowing how the container provided them, and it was more fit for a factory.
-
-## Contributors
-
-Are listed here all people that contributed in the discussions or votes, by alphabetical order:
-
-- [Amy Stephen](https://github.com/AmyStephen)
-- [David Négrier](https://github.com/moufmouf)
-- [Don Gilbert](https://github.com/dongilbert)
-- [Jason Judge](https://github.com/judgej)
-- [Jeremy Lindblom](https://github.com/jeremeamia)
-- [Marco Pivetta](https://github.com/Ocramius)
-- [Matthieu Napoli](https://github.com/mnapoli)
-- [Paul M. Jones](https://github.com/pmjones)
-- [Stephan Hochdörfer](https://github.com/shochdoerfer)
-- [Taylor Otwell](https://github.com/taylorotwell)
-
-## Relevant links
-
-- [`ContainerInterface.php`](https://github.com/container-interop/container-interop/blob/master/src/Interop/Container/ContainerInterface.php)
-- [List of all issues](https://github.com/container-interop/container-interop/issues?labels=ContainerInterface&milestone=&page=1&state=closed)
-- [Vote for the interface name](https://github.com/container-interop/container-interop/wiki/%231-interface-name:-Vote)
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/docs/ContainerInterface.md b/advancedcontentfilter/vendor/container-interop/container-interop/docs/ContainerInterface.md
deleted file mode 100644
index bda973d6..00000000
--- a/advancedcontentfilter/vendor/container-interop/container-interop/docs/ContainerInterface.md
+++ /dev/null
@@ -1,158 +0,0 @@
-Container interface
-===================
-
-This document describes a common interface for dependency injection containers.
-
-The goal set by `ContainerInterface` is to standardize how frameworks and libraries make use of a
-container to obtain objects and parameters (called *entries* in the rest of this document).
-
-The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD",
-"SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be
-interpreted as described in [RFC 2119][].
-
-The word `implementor` in this document is to be interpreted as someone
-implementing the `ContainerInterface` in a dependency injection-related library or framework.
-Users of dependency injections containers (DIC) are referred to as `user`.
-
-[RFC 2119]: http://tools.ietf.org/html/rfc2119
-
-1. Specification
------------------
-
-### 1.1 Basics
-
-- The `Interop\Container\ContainerInterface` exposes two methods : `get` and `has`.
-
-- `get` takes one mandatory parameter: an entry identifier. It MUST be a string.
-  A call to `get` can return anything (a *mixed* value), or throws an exception if the identifier
-  is not known to the container. Two successive calls to `get` with the same
-  identifier SHOULD return the same value. However, depending on the `implementor`
-  design and/or `user` configuration, different values might be returned, so
-  `user` SHOULD NOT rely on getting the same value on 2 successive calls.
-  While `ContainerInterface` only defines one mandatory parameter in `get()`, implementations
-  MAY accept additional optional parameters.
-
-- `has` takes one unique parameter: an entry identifier. It MUST return `true`
-  if an entry identifier is known to the container and `false` if it is not.
-  `has($id)` returning true does not mean that `get($id)` will not throw an exception.
-  It does however mean that `get($id)` will not throw a `NotFoundException`.
-
-### 1.2 Exceptions
-
-Exceptions directly thrown by the container MUST implement the
-[`Interop\Container\Exception\ContainerException`](../src/Interop/Container/Exception/ContainerException.php).
-
-A call to the `get` method with a non-existing id SHOULD throw a
-[`Interop\Container\Exception\NotFoundException`](../src/Interop/Container/Exception/NotFoundException.php).
-
-### 1.3 Additional features
-
-This section describes additional features that MAY be added to a container. Containers are not
-required to implement these features to respect the ContainerInterface.
-
-#### 1.3.1 Delegate lookup feature
-
-The goal of the *delegate lookup* feature is to allow several containers to share entries.
-Containers implementing this feature can perform dependency lookups in other containers.
-
-Containers implementing this feature will offer a greater lever of interoperability
-with other containers. Implementation of this feature is therefore RECOMMENDED.
-
-A container implementing this feature:
-
-- MUST implement the `ContainerInterface`
-- MUST provide a way to register a delegate container (using a constructor parameter, or a setter,
-  or any possible way). The delegate container MUST implement the `ContainerInterface`.
-
-When a container is configured to use a delegate container for dependencies:
-
-- Calls to the `get` method should only return an entry if the entry is part of the container.
-  If the entry is not part of the container, an exception should be thrown
-  (as requested by the `ContainerInterface`).
-- Calls to the `has` method should only return `true` if the entry is part of the container.
-  If the entry is not part of the container, `false` should be returned.
-- If the fetched entry has dependencies, **instead** of performing
-  the dependency lookup in the container, the lookup is performed on the *delegate container*.
-
-Important! By default, the lookup SHOULD be performed on the delegate container **only**, not on the container itself.
-
-It is however allowed for containers to provide exception cases for special entries, and a way to lookup
-into the same container (or another container) instead of the delegate container.
-
-2. Package
-----------
-
-The interfaces and classes described as well as relevant exception are provided as part of the
-[container-interop/container-interop](https://packagist.org/packages/container-interop/container-interop) package.
-
-3. `Interop\Container\ContainerInterface`
------------------------------------------
-
-```php
-<?php
-namespace Interop\Container;
-
-use Interop\Container\Exception\ContainerException;
-use Interop\Container\Exception\NotFoundException;
-
-/**
- * Describes the interface of a container that exposes methods to read its entries.
- */
-interface ContainerInterface
-{
-    /**
-     * Finds an entry of the container by its identifier and returns it.
-     *
-     * @param string $id Identifier of the entry to look for.
-     *
-     * @throws NotFoundException  No entry was found for this identifier.
-     * @throws ContainerException Error while retrieving the entry.
-     *
-     * @return mixed Entry.
-     */
-    public function get($id);
-
-    /**
-     * Returns true if the container can return an entry for the given identifier.
-     * Returns false otherwise.
-     *
-     * `has($id)` returning true does not mean that `get($id)` will not throw an exception.
-     * It does however mean that `get($id)` will not throw a `NotFoundException`.
-     *
-     * @param string $id Identifier of the entry to look for.
-     *
-     * @return boolean
-     */
-    public function has($id);
-}
-```
-
-4. `Interop\Container\Exception\ContainerException`
----------------------------------------------------
-
-```php
-<?php
-namespace Interop\Container\Exception;
-
-/**
- * Base interface representing a generic exception in a container.
- */
-interface ContainerException
-{
-}
-```
-
-5. `Interop\Container\Exception\NotFoundException`
----------------------------------------------------
-
-```php
-<?php
-namespace Interop\Container\Exception;
-
-/**
- * No entry was found in the container.
- */
-interface NotFoundException extends ContainerException
-{
-}
-```
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/docs/Delegate-lookup-meta.md b/advancedcontentfilter/vendor/container-interop/container-interop/docs/Delegate-lookup-meta.md
deleted file mode 100644
index 6048b73e..00000000
--- a/advancedcontentfilter/vendor/container-interop/container-interop/docs/Delegate-lookup-meta.md
+++ /dev/null
@@ -1,259 +0,0 @@
-Delegate lookup feature Meta Document
-=====================================
-
-1. Summary
-----------
-
-This document describes the *delegate lookup feature*.
-Containers are not required to implement this feature to respect the `ContainerInterface`.
-However, containers implementing this feature will offer a greater lever of interoperability
-with other containers, allowing multiple containers to share entries in the same application.
-Implementation of this feature is therefore recommanded.
-
-2. Why Bother?
---------------
-
-The [`ContainerInterface`](../src/Interop/Container/ContainerInterface.php) ([meta doc](ContainerInterface.md))
-standardizes how frameworks and libraries make use of a container to obtain objects and parameters.
-
-By standardizing such a behavior, frameworks and libraries relying on the `ContainerInterface`
-could work with any compatible container.
-That would allow end users to choose their own container based on their own preferences.
-
-The `ContainerInterface` is also enough if we want to have several containers side-by-side in the same
-application. For instance, this is what the [CompositeContainer](https://github.com/jeremeamia/acclimate-container/blob/master/src/CompositeContainer.php) 
-class of [Acclimate](https://github.com/jeremeamia/acclimate-container) is designed for:
-
-![Side by side containers](images/side_by_side_containers.png)
-
-However, an instance in container 1 cannot reference an instance in container 2.
-
-It would be better if an instance of container 1 could reference an instance in container 2,
-and the opposite should be true. 
-
-![Interoperating containers](images/interoperating_containers.png)
-
-In the sample above, entry 1 in container 1 is referencing entry 3 in container 2.
-
-3. Scope
---------
-
-### 3.1 Goals
-
-The goal of the *delegate lookup* feature is to allow several containers to share entries.
-
-4. Approaches
--------------
-
-### 4.1 Chosen Approach
-
-Containers implementing this feature can perform dependency lookups in other containers.
-
-A container implementing this feature:
-
-- must implement the `ContainerInterface`
-- must provide a way to register a *delegate container* (using a constructor parameter, or a setter, or any
-possible way). The *delegate container* must implement the `ContainerInterface`.
-
-When a *delegate container* is configured on a container:
-
-- Calls to the `get` method should only return an entry if the entry is part of the container.
-If the entry is not part of the container, an exception should be thrown (as required in the `ContainerInterface`).
-- Calls to the `has` method should only return *true* if the entry is part of the container.
-If the entry is not part of the container, *false* should be returned.
- - Finally, the important part: if the entry we are fetching has dependencies,
-**instead** of perfoming the dependency lookup in the container, the lookup is performed on the *delegate container*.
-
-Important! By default, the lookup should be performed on the delegate container **only**, not on the container itself.
-
-It is however allowed for containers to provide exception cases for special entries, and a way to lookup into 
-the same container (or another container) instead of the delegate container.
-
-### 4.2 Typical usage
-
-The *delegate container* will usually be a composite container. A composite container is a container that
-contains several other containers. When performing a lookup on a composite container, the inner containers are 
-queried until one container returns an entry.
-An inner container implementing the *delegate lookup feature* will return entries it contains, but if these
-entries have dependencies, the dependencies lookup calls will be performed on the composite container, giving
-a chance to all containers to answer.
-
-Interestingly enough, the order in which containers are added in the composite container matters. Indeed,
-the first containers to be added in the composite container can "override" the entries of containers with
-lower priority.
-
-![Containers priority](images/priority.png)
-
-In the example above, "container 2" contains a controller "myController" and the controller is referencing an 
-"entityManager" entry. "Container 1" contains also an entry named "entityManager".
-Without the *delegate lookup* feature, when requesting the "myController" instance to container 2, it would take 
-in charge the instanciation of both entries.
-
-However, using the *delegate lookup* feature, here is what happens when we ask the composite container for the 
-"myController" instance:
-
-- The composite container asks container 1 if if contains the "myController" instance. The answer is no.
-- The composite container asks container 2 if if contains the "myController" instance. The answer is yes.
-- The composite container performs a `get` call on container 2 for the "myController" instance.
-- Container 2 sees that "myController" has a dependency on "entityManager".
-- Container 2 delegates the lookup of "entityManager" to the composite container.
-- The composite container asks container 1 if if contains the "entityManager" instance. The answer is yes.
-- The composite container performs a `get` call on container 1 for the "entityManager" instance.
-
-In the end, we get a controller instanciated by container 2 that references an entityManager instanciated
-by container 1.
-
-### 4.3 Alternative: the fallback strategy
-
-The first proposed approach we tried was to perform all the lookups in the "local" container,
-and if a lookup fails in the container, to use the delegate container. In this scenario, the
-delegate container is used in "fallback" mode.
-
-This strategy has been described in @moufmouf blog post: http://mouf-php.com/container-interop-whats-next (solution 1).
-It was also discussed [here](https://github.com/container-interop/container-interop/pull/8#issuecomment-33570697) and
-[here](https://github.com/container-interop/container-interop/pull/20#issuecomment-56599631).
-
-Problems with this strategy:
-
-- Heavy problem regarding infinite loops
-- Unable to overload a container entry with the delegate container entry
-
-### 4.4 Alternative: force implementing an interface
-
-The first proposed approach was to develop a `ParentAwareContainerInterface` interface.
-It was proposed here: https://github.com/container-interop/container-interop/pull/8
-
-The interface would have had the behaviour of the delegate lookup feature but would have forced the addition of
-a `setParentContainter` method:
-
-```php
-interface ParentAwareContainerInterface extends ReadableContainerInterface {
-    /**
-     * Sets the parent container associated to that container. This container will call
-     * the parent container to fetch dependencies.
-     *
-     * @param ContainerInterface $container
-     */
-    public function setParentContainer(ContainerInterface $container);
-}
-```
-
-The interface idea was first questioned by @Ocramius [here](https://github.com/container-interop/container-interop/pull/8#issuecomment-51721777).
-@Ocramius expressed the idea that an interface should not contain setters, otherwise, it is forcing implementation
-details on the class implementing the interface. 
-Then @mnapoli made a proposal for a "convention" [here](https://github.com/container-interop/container-interop/pull/8#issuecomment-51841079),
-this idea was further discussed until all participants in the discussion agreed to remove the interface idea
-and replace it with a "standard" feature.
-
-**Pros:**
-
-If we had had an interface, we could have delegated the registration of the delegate/composite container to the
-the delegate/composite container itself.
-For instance:
-
-```php
-$containerA = new ContainerA();
-$containerB = new ContainerB();
-
-$compositeContainer = new CompositeContainer([$containerA, $containerB]);
-
-// The call to 'setParentContainer' is delegated to the CompositeContainer
-// It is not the responsibility of the user anymore.
-class CompositeContainer {
-	...
-	
-	public function __construct($containers) {
-		foreach ($containers as $container) {
-			if ($container instanceof ParentAwareContainerInterface) {
-				$container->setParentContainer($this);
-			}
-		}
-		...
-	}
-}
-
-``` 
-
-**Cons:**
-
-Cons have been extensively discussed [here](https://github.com/container-interop/container-interop/pull/8#issuecomment-51721777).
-Basically, forcing a setter into an interface is a bad idea. Setters are similar to constructor arguments,
-and it's a bad idea to standardize a constructor: how the delegate container is configured into a container is an implementation detail. This outweights the benefits of the interface.
-
-### 4.4 Alternative: no exception case for delegate lookups
-
-Originally, the proposed wording for delegate lookup calls was:
-
-> Important! The lookup MUST be performed on the delegate container **only**, not on the container itself.
-
-This was later replaced by:
-
-> Important! By default, the lookup SHOULD be performed on the delegate container **only**, not on the container itself.
->
-> It is however allowed for containers to provide exception cases for special entries, and a way to lookup 
-> into the same container (or another container) instead of the delegate container.
-
-Exception cases have been allowed to avoid breaking dependencies with some services that must be provided
-by the container (on @njasm proposal). This was proposed here: https://github.com/container-interop/container-interop/pull/20#issuecomment-56597235
-
-### 4.5 Alternative: having one of the containers act as the composite container
-
-In real-life scenarios, we usually have a big framework (Symfony 2, Zend Framework 2, etc...) and we want to
-add another DI container to this container. Most of the time, the "big" framework will be responsible for
-creating the controller's instances, using it's own DI container. Until *container-interop* is fully adopted,
-the "big" framework will not be aware of the existence of a composite container that it should use instead
-of its own container.
-
-For this real-life use cases, @mnapoli and @moufmouf proposed to extend the "big" framework's DI container
-to make it act as a composite container.
-
-This has been discussed [here](https://github.com/container-interop/container-interop/pull/8#issuecomment-40367194) 
-and [here](http://mouf-php.com/container-interop-whats-next#solution4).
-
-This was implemented in Symfony 2 using:
-
-- [interop.symfony.di](https://github.com/thecodingmachine/interop.symfony.di/tree/v0.1.0)
-- [framework interop](https://github.com/mnapoli/framework-interop/)
-
-This was implemented in Silex using:
-
-- [interop.silex.di](https://github.com/thecodingmachine/interop.silex.di)
-
-Having a container act as the composite container is not part of the delegate lookup standard because it is
-simply a temporary design pattern used to make existing frameworks that do not support yet ContainerInterop
-play nice with other DI containers.
-
-
-5. Implementations
-------------------
-
-The following projects already implement the delegate lookup feature:
-
-- [Mouf](http://mouf-php.com), through the [`setDelegateLookupContainer` method](https://github.com/thecodingmachine/mouf/blob/2.0/src/Mouf/MoufManager.php#L2120)
-- [PHP-DI](http://php-di.org/), through the [`$wrapperContainer` parameter of the constructor](https://github.com/mnapoli/PHP-DI/blob/master/src/DI/Container.php#L72)
-- [pimple-interop](https://github.com/moufmouf/pimple-interop), through the [`$container` parameter of the constructor](https://github.com/moufmouf/pimple-interop/blob/master/src/Interop/Container/Pimple/PimpleInterop.php#L62)
-
-6. People
----------
-
-Are listed here all people that contributed in the discussions, by alphabetical order:
-
-- [Alexandru Pătrănescu](https://github.com/drealecs)
-- [Ben Peachey](https://github.com/potherca)
-- [David Négrier](https://github.com/moufmouf)
-- [Jeremy Lindblom](https://github.com/jeremeamia)
-- [Marco Pivetta](https://github.com/Ocramius)
-- [Matthieu Napoli](https://github.com/mnapoli)
-- [Nelson J Morais](https://github.com/njasm)
-- [Phil Sturgeon](https://github.com/philsturgeon)
-- [Stephan Hochdörfer](https://github.com/shochdoerfer)
-
-7. Relevant Links
------------------
-
-_**Note:** Order descending chronologically._
-
-- [Pull request on the delegate lookup feature](https://github.com/container-interop/container-interop/pull/20)
-- [Pull request on the interface idea](https://github.com/container-interop/container-interop/pull/8)
-- [Original article exposing the delegate lookup idea along many others](http://mouf-php.com/container-interop-whats-next)
-
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/docs/Delegate-lookup.md b/advancedcontentfilter/vendor/container-interop/container-interop/docs/Delegate-lookup.md
deleted file mode 100644
index f64a8f78..00000000
--- a/advancedcontentfilter/vendor/container-interop/container-interop/docs/Delegate-lookup.md
+++ /dev/null
@@ -1,60 +0,0 @@
-Delegate lookup feature
-=======================
-
-This document describes a standard for dependency injection containers.
-
-The goal set by the *delegate lookup* feature is to allow several containers to share entries.
-Containers implementing this feature can perform dependency lookups in other containers.
-
-Containers implementing this feature will offer a greater lever of interoperability
-with other containers. Implementation of this feature is therefore RECOMMENDED.
-
-The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD",
-"SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be
-interpreted as described in [RFC 2119][].
-
-The word `implementor` in this document is to be interpreted as someone
-implementing the delegate lookup feature in a dependency injection-related library or framework.
-Users of dependency injections containers (DIC) are referred to as `user`.
-
-[RFC 2119]: http://tools.ietf.org/html/rfc2119
-
-1. Vocabulary
--------------
-
-In a dependency injection container, the container is used to fetch entries.
-Entries can have dependencies on other entries. Usually, these other entries are fetched by the container.
-
-The *delegate lookup* feature is the ability for a container to fetch dependencies in
-another container. In the rest of the document, the word "container" will reference the container
-implemented by the implementor. The word "delegate container" will reference the container we are
-fetching the dependencies from.
-
-2. Specification
-----------------
-
-A container implementing the *delegate lookup* feature:
-
-- MUST implement the [`ContainerInterface`](ContainerInterface.md)
-- MUST provide a way to register a delegate container (using a constructor parameter, or a setter,
-  or any possible way). The delegate container MUST implement the [`ContainerInterface`](ContainerInterface.md).
-
-When a container is configured to use a delegate container for dependencies:
-
-- Calls to the `get` method should only return an entry if the entry is part of the container.
-  If the entry is not part of the container, an exception should be thrown
-  (as requested by the [`ContainerInterface`](ContainerInterface.md)).
-- Calls to the `has` method should only return `true` if the entry is part of the container.
-  If the entry is not part of the container, `false` should be returned.
-- If the fetched entry has dependencies, **instead** of performing
-  the dependency lookup in the container, the lookup is performed on the *delegate container*.
-
-Important: By default, the dependency lookups SHOULD be performed on the delegate container **only**, not on the container itself.
-
-It is however allowed for containers to provide exception cases for special entries, and a way to lookup
-into the same container (or another container) instead of the delegate container.
-
-3. Package / Interface
-----------------------
-
-This feature is not tied to any code, interface or package.
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/docs/images/interoperating_containers.png b/advancedcontentfilter/vendor/container-interop/container-interop/docs/images/interoperating_containers.png
deleted file mode 100644
index 1d3fdd0ddbea28d77c08cfb65834ec11357be5fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25738
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
ba{GKI!OyCrz`^VB|3qY^lpy62#)1C_3-D%H

diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/docs/images/priority.png b/advancedcontentfilter/vendor/container-interop/container-interop/docs/images/priority.png
deleted file mode 100644
index d02cb7d1f1ed29c6fa87a269cdd8955e0e907a4c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16252
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

diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/docs/images/side_by_side_containers.png b/advancedcontentfilter/vendor/container-interop/container-interop/docs/images/side_by_side_containers.png
deleted file mode 100644
index 87884bc2927069abb7f66dfa3e5e71e9c95865a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16265
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

diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/src/Interop/Container/ContainerInterface.php b/advancedcontentfilter/vendor/container-interop/container-interop/src/Interop/Container/ContainerInterface.php
deleted file mode 100644
index a75468f6..00000000
--- a/advancedcontentfilter/vendor/container-interop/container-interop/src/Interop/Container/ContainerInterface.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
- */
-
-namespace Interop\Container;
-
-use Psr\Container\ContainerInterface as PsrContainerInterface;
-
-/**
- * Describes the interface of a container that exposes methods to read its entries.
- */
-interface ContainerInterface extends PsrContainerInterface
-{
-}
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/src/Interop/Container/Exception/ContainerException.php b/advancedcontentfilter/vendor/container-interop/container-interop/src/Interop/Container/Exception/ContainerException.php
deleted file mode 100644
index 3964061a..00000000
--- a/advancedcontentfilter/vendor/container-interop/container-interop/src/Interop/Container/Exception/ContainerException.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
- */
-
-namespace Interop\Container\Exception;
-
-use Psr\Container\ContainerExceptionInterface as PsrContainerException;
-
-/**
- * Base interface representing a generic exception in a container.
- */
-interface ContainerException extends PsrContainerException
-{
-}
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/src/Interop/Container/Exception/NotFoundException.php b/advancedcontentfilter/vendor/container-interop/container-interop/src/Interop/Container/Exception/NotFoundException.php
deleted file mode 100644
index 031b3ab4..00000000
--- a/advancedcontentfilter/vendor/container-interop/container-interop/src/Interop/Container/Exception/NotFoundException.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
- */
-
-namespace Interop\Container\Exception;
-
-use Psr\Container\NotFoundExceptionInterface as PsrNotFoundException;
-
-/**
- * No entry was found in the container.
- */
-interface NotFoundException extends ContainerException, PsrNotFoundException
-{
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/.gitignore b/advancedcontentfilter/vendor/pimple/pimple/.gitignore
deleted file mode 100644
index c089b095..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-phpunit.xml
-composer.lock
-/vendor/
diff --git a/advancedcontentfilter/vendor/pimple/pimple/.travis.yml b/advancedcontentfilter/vendor/pimple/pimple/.travis.yml
deleted file mode 100644
index 196f7fc1..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/.travis.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-language: php
-
-env:
-  matrix:
-    - PIMPLE_EXT=no
-    - PIMPLE_EXT=yes
-  global:
-    - REPORT_EXIT_STATUS=1
-
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-
-before_script:
-  - composer self-update
-  - COMPOSER_ROOT_VERSION=dev-master composer install
-  - if [ "$PIMPLE_EXT" == "yes" ]; then sh -c "cd ext/pimple && phpize && ./configure && make && sudo make install"; fi
-  - if [ "$PIMPLE_EXT" == "yes" ]; then echo "extension=pimple.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`; fi
-
-script:
-  - cd ext/pimple
-  - if [ "$PIMPLE_EXT" == "yes" ]; then yes n | make test | tee output ; grep -E 'Tests failed +. +0' output; fi
-  - if [ "$PIMPLE_EXT" == "yes" ]; then export SYMFONY_DEPRECATIONS_HELPER=weak; fi
-  - cd ../..
-  - ./vendor/bin/simple-phpunit
-
-matrix:
-  include:
-    - php: hhvm
-      dist: trusty
-      env: PIMPLE_EXT=no
-  exclude:
-    - php: 7.0
-      env: PIMPLE_EXT=yes
-    - php: 7.1
-      env: PIMPLE_EXT=yes
diff --git a/advancedcontentfilter/vendor/pimple/pimple/CHANGELOG b/advancedcontentfilter/vendor/pimple/pimple/CHANGELOG
deleted file mode 100644
index ba56760c..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/CHANGELOG
+++ /dev/null
@@ -1,59 +0,0 @@
-* 3.2.3 (2017-XX-XX)
-
- * n/a
-
-* 3.2.2 (2017-07-23)
-
- * reverted extending a protected closure throws an exception (deprecated it instead)
-
-* 3.2.1 (2017-07-17)
-
- * fixed PHP error
-
-* 3.2.0 (2017-07-17)
-
- * added a PSR-11 service locator
- * added a PSR-11 wrapper
- * added ServiceIterator
- * fixed extending a protected closure (now throws InvalidServiceIdentifierException)
-
-* 3.1.0 (2017-07-03)
-
- * deprecated the C extension
- * added support for PSR-11 exceptions
-
-* 3.0.2 (2015-09-11)
-
- * refactored the C extension
- * minor non-significant changes
-
-* 3.0.1 (2015-07-30)
-
- * simplified some code
- * fixed a segfault in the C extension
-
-* 3.0.0 (2014-07-24)
-
- * removed the Pimple class alias (use Pimple\Container instead)
-
-* 2.1.1 (2014-07-24)
-
- * fixed compiler warnings for the C extension
- * fixed code when dealing with circular references
-
-* 2.1.0 (2014-06-24)
-
- * moved the Pimple to Pimple\Container (with a BC layer -- Pimple is now a
-   deprecated alias which will be removed in Pimple 3.0)
- * added Pimple\ServiceProviderInterface (and Pimple::register())
-
-* 2.0.0 (2014-02-10)
-
- * changed extend to automatically re-assign the extended service and keep it as shared or factory
-   (to keep BC, extend still returns the extended service)
- * changed services to be shared by default (use factory() for factory
-   services)
-
-* 1.0.0
-
- * initial version
diff --git a/advancedcontentfilter/vendor/pimple/pimple/README.rst b/advancedcontentfilter/vendor/pimple/pimple/README.rst
deleted file mode 100644
index a03b6d3a..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/README.rst
+++ /dev/null
@@ -1,326 +0,0 @@
-Pimple
-======
-
-.. caution::
-
-    This is the documentation for Pimple 3.x. If you are using Pimple 1.x, read
-    the `Pimple 1.x documentation`_. Reading the Pimple 1.x code is also a good
-    way to learn more about how to create a simple Dependency Injection
-    Container (recent versions of Pimple are more focused on performance).
-
-Pimple is a small Dependency Injection Container for PHP.
-
-Installation
-------------
-
-Before using Pimple in your project, add it to your ``composer.json`` file:
-
-.. code-block:: bash
-
-    $ ./composer.phar require pimple/pimple "^3.0"
-
-Usage
------
-
-Creating a container is a matter of creating a ``Container`` instance:
-
-.. code-block:: php
-
-    use Pimple\Container;
-
-    $container = new Container();
-
-As many other dependency injection containers, Pimple manages two different
-kind of data: **services** and **parameters**.
-
-Defining Services
-~~~~~~~~~~~~~~~~~
-
-A service is an object that does something as part of a larger system. Examples
-of services: a database connection, a templating engine, or a mailer. Almost
-any **global** object can be a service.
-
-Services are defined by **anonymous functions** that return an instance of an
-object:
-
-.. code-block:: php
-
-    // define some services
-    $container['session_storage'] = function ($c) {
-        return new SessionStorage('SESSION_ID');
-    };
-
-    $container['session'] = function ($c) {
-        return new Session($c['session_storage']);
-    };
-
-Notice that the anonymous function has access to the current container
-instance, allowing references to other services or parameters.
-
-As objects are only created when you get them, the order of the definitions
-does not matter.
-
-Using the defined services is also very easy:
-
-.. code-block:: php
-
-    // get the session object
-    $session = $container['session'];
-
-    // the above call is roughly equivalent to the following code:
-    // $storage = new SessionStorage('SESSION_ID');
-    // $session = new Session($storage);
-
-Defining Factory Services
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-By default, each time you get a service, Pimple returns the **same instance**
-of it. If you want a different instance to be returned for all calls, wrap your
-anonymous function with the ``factory()`` method
-
-.. code-block:: php
-
-    $container['session'] = $container->factory(function ($c) {
-        return new Session($c['session_storage']);
-    });
-
-Now, each call to ``$container['session']`` returns a new instance of the
-session.
-
-Defining Parameters
-~~~~~~~~~~~~~~~~~~~
-
-Defining a parameter allows to ease the configuration of your container from
-the outside and to store global values:
-
-.. code-block:: php
-
-    // define some parameters
-    $container['cookie_name'] = 'SESSION_ID';
-    $container['session_storage_class'] = 'SessionStorage';
-
-If you change the ``session_storage`` service definition like below:
-
-.. code-block:: php
-
-    $container['session_storage'] = function ($c) {
-        return new $c['session_storage_class']($c['cookie_name']);
-    };
-
-You can now easily change the cookie name by overriding the
-``cookie_name`` parameter instead of redefining the service
-definition.
-
-Protecting Parameters
-~~~~~~~~~~~~~~~~~~~~~
-
-Because Pimple sees anonymous functions as service definitions, you need to
-wrap anonymous functions with the ``protect()`` method to store them as
-parameters:
-
-.. code-block:: php
-
-    $container['random_func'] = $container->protect(function () {
-        return rand();
-    });
-
-Modifying Services after Definition
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-In some cases you may want to modify a service definition after it has been
-defined. You can use the ``extend()`` method to define additional code to be
-run on your service just after it is created:
-
-.. code-block:: php
-
-    $container['session_storage'] = function ($c) {
-        return new $c['session_storage_class']($c['cookie_name']);
-    };
-
-    $container->extend('session_storage', function ($storage, $c) {
-        $storage->...();
-
-        return $storage;
-    });
-
-The first argument is the name of the service to extend, the second a function
-that gets access to the object instance and the container.
-
-Extending a Container
-~~~~~~~~~~~~~~~~~~~~~
-
-If you use the same libraries over and over, you might want to reuse some
-services from one project to the next one; package your services into a
-**provider** by implementing ``Pimple\ServiceProviderInterface``:
-
-.. code-block:: php
-
-    use Pimple\Container;
-
-    class FooProvider implements Pimple\ServiceProviderInterface
-    {
-        public function register(Container $pimple)
-        {
-            // register some services and parameters
-            // on $pimple
-        }
-    }
-
-Then, register the provider on a Container:
-
-.. code-block:: php
-
-    $pimple->register(new FooProvider());
-
-Fetching the Service Creation Function
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-When you access an object, Pimple automatically calls the anonymous function
-that you defined, which creates the service object for you. If you want to get
-raw access to this function, you can use the ``raw()`` method:
-
-.. code-block:: php
-
-    $container['session'] = function ($c) {
-        return new Session($c['session_storage']);
-    };
-
-    $sessionFunction = $container->raw('session');
-
-PSR-11 compatibility
---------------------
-
-For historical reasons, the ``Container`` class does not implement the PSR-11
-``ContainerInterface``. However, Pimple provides a helper class that will let
-you decouple your code from the Pimple container class.
-
-The PSR-11 container class
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The ``Pimple\Psr11\Container`` class lets you access the content of an
-underlying Pimple container using ``Psr\Container\ContainerInterface``
-methods:
-
-.. code-block:: php
-
-    use Pimple\Container;
-    use Pimple\Psr11\Container as PsrContainer;
-
-    $container = new Container();
-    $container['service'] = function ($c) {
-        return new Service();
-    };
-    $psr11 = new PsrContainer($container);
-
-    $controller = function (PsrContainer $container) {
-        $service = $container->get('service');
-    };
-    $controller($psr11);
-
-Using the PSR-11 ServiceLocator
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Sometimes, a service needs access to several other services without being sure
-that all of them will actually be used. In those cases, you may want the
-instantiation of the services to be lazy.
-
-The traditional solution is to inject the entire service container to get only
-the services really needed. However, this is not recommended because it gives
-services a too broad access to the rest of the application and it hides their
-actual dependencies.
-
-The ``ServiceLocator`` is intended to solve this problem by giving access to a
-set of predefined services while instantiating them only when actually needed.
-
-It also allows you to make your services available under a different name than
-the one used to register them. For instance, you may want to use an object
-that expects an instance of ``EventDispatcherInterface`` to be available under
-the name ``event_dispatcher`` while your event dispatcher has been
-registered under the name ``dispatcher``:
-
-.. code-block:: php
-
-    use Monolog\Logger;
-    use Pimple\Psr11\ServiceLocator;
-    use Psr\Container\ContainerInterface;
-    use Symfony\Component\EventDispatcher\EventDispatcher;
-
-    class MyService
-    {
-        /**
-         * "logger" must be an instance of Psr\Log\LoggerInterface
-         * "event_dispatcher" must be an instance of Symfony\Component\EventDispatcher\EventDispatcherInterface
-         */
-        private $services;
-
-        public function __construct(ContainerInterface $services)
-        {
-            $this->services = $services;
-        }
-    }
-
-    $container['logger'] = function ($c) {
-        return new Monolog\Logger();
-    };
-    $container['dispatcher'] = function () {
-        return new EventDispatcher();
-    };
-
-    $container['service'] = function ($c) {
-        $locator = new ServiceLocator($c, array('logger', 'event_dispatcher' => 'dispatcher'));
-
-        return new MyService($locator);
-    };
-
-Referencing a Collection of Services Lazily
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Passing a collection of services instances in an array may prove inefficient
-if the class that consumes the collection only needs to iterate over it at a
-later stage, when one of its method is called. It can also lead to problems
-if there is a circular dependency between one of the services stored in the
-collection and the class that consumes it.
-
-The ``ServiceIterator`` class helps you solve these issues. It receives a
-list of service names during instantiation and will retrieve the services
-when iterated over:
-
-.. code-block:: php
-
-    use Pimple\Container;
-    use Pimple\ServiceIterator;
-
-    class AuthorizationService
-    {
-        private $voters;
-
-        public function __construct($voters)
-        {
-            $this->voters = $voters;
-        }
-
-        public function canAccess($resource)
-        {
-            foreach ($this->voters as $voter) {
-                if (true === $voter->canAccess($resource) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-    }
-
-    $container = new Container();
-
-    $container['voter1'] = function ($c) {
-        return new SomeVoter();
-    }
-    $container['voter2'] = function ($c) {
-        return new SomeOtherVoter($c['auth']);
-    }
-    $container['auth'] = function ($c) {
-        return new AuthorizationService(new ServiceIterator($c, array('voter1', 'voter2'));
-    }
-
-.. _Pimple 1.x documentation: https://github.com/silexphp/Pimple/tree/1.1
diff --git a/advancedcontentfilter/vendor/pimple/pimple/composer.json b/advancedcontentfilter/vendor/pimple/pimple/composer.json
deleted file mode 100644
index dabf190a..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/composer.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "name": "pimple/pimple",
-    "type": "library",
-    "description": "Pimple, a simple Dependency Injection Container",
-    "keywords": ["dependency injection", "container"],
-    "homepage": "http://pimple.sensiolabs.org",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.0",
-        "psr/container": "^1.0"
-    },
-    "require-dev": {
-        "symfony/phpunit-bridge": "^3.2"
-    },
-    "autoload": {
-        "psr-0": { "Pimple": "src/" }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.2.x-dev"
-        }
-    }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/.gitignore b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/.gitignore
deleted file mode 100644
index 1861088a..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/.gitignore
+++ /dev/null
@@ -1,30 +0,0 @@
-*.sw*
-.deps
-Makefile
-Makefile.fragments
-Makefile.global
-Makefile.objects
-acinclude.m4
-aclocal.m4
-build/
-config.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.nice
-config.status
-config.sub
-configure
-configure.in
-install-sh
-libtool
-ltmain.sh
-missing
-mkinstalldirs
-run-tests.php
-*.loT
-.libs/
-modules/
-*.la
-*.lo
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/README.md b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/README.md
deleted file mode 100644
index 7b39eb29..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-This is Pimple 2 implemented in C
-
-* PHP >= 5.3
-* Not tested under Windows, might work
-
-Install
-=======
-
-    > phpize
-    > ./configure
-    > make
-    > make install
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/config.m4 b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/config.m4
deleted file mode 100644
index 3a6e9aae..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/config.m4
+++ /dev/null
@@ -1,63 +0,0 @@
-dnl $Id$
-dnl config.m4 for extension pimple
-
-dnl Comments in this file start with the string 'dnl'.
-dnl Remove where necessary. This file will not work
-dnl without editing.
-
-dnl If your extension references something external, use with:
-
-dnl PHP_ARG_WITH(pimple, for pimple support,
-dnl Make sure that the comment is aligned:
-dnl [  --with-pimple             Include pimple support])
-
-dnl Otherwise use enable:
-
-PHP_ARG_ENABLE(pimple, whether to enable pimple support,
-dnl Make sure that the comment is aligned:
-[  --enable-pimple           Enable pimple support])
-
-if test "$PHP_PIMPLE" != "no"; then
-  dnl Write more examples of tests here...
-
-  dnl # --with-pimple -> check with-path
-  dnl SEARCH_PATH="/usr/local /usr"     # you might want to change this
-  dnl SEARCH_FOR="/include/pimple.h"  # you most likely want to change this
-  dnl if test -r $PHP_PIMPLE/$SEARCH_FOR; then # path given as parameter
-  dnl   PIMPLE_DIR=$PHP_PIMPLE
-  dnl else # search default path list
-  dnl   AC_MSG_CHECKING([for pimple files in default path])
-  dnl   for i in $SEARCH_PATH ; do
-  dnl     if test -r $i/$SEARCH_FOR; then
-  dnl       PIMPLE_DIR=$i
-  dnl       AC_MSG_RESULT(found in $i)
-  dnl     fi
-  dnl   done
-  dnl fi
-  dnl
-  dnl if test -z "$PIMPLE_DIR"; then
-  dnl   AC_MSG_RESULT([not found])
-  dnl   AC_MSG_ERROR([Please reinstall the pimple distribution])
-  dnl fi
-
-  dnl # --with-pimple -> add include path
-  dnl PHP_ADD_INCLUDE($PIMPLE_DIR/include)
-
-  dnl # --with-pimple -> check for lib and symbol presence
-  dnl LIBNAME=pimple # you may want to change this
-  dnl LIBSYMBOL=pimple # you most likely want to change this
-
-  dnl PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
-  dnl [
-  dnl   PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $PIMPLE_DIR/lib, PIMPLE_SHARED_LIBADD)
-  dnl   AC_DEFINE(HAVE_PIMPLELIB,1,[ ])
-  dnl ],[
-  dnl   AC_MSG_ERROR([wrong pimple lib version or lib not found])
-  dnl ],[
-  dnl   -L$PIMPLE_DIR/lib -lm
-  dnl ])
-  dnl
-  dnl PHP_SUBST(PIMPLE_SHARED_LIBADD)
-
-  PHP_NEW_EXTENSION(pimple, pimple.c, $ext_shared)
-fi
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/config.w32 b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/config.w32
deleted file mode 100644
index 39857b32..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/config.w32
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-// vim:ft=javascript
-
-// If your extension references something external, use ARG_WITH
-// ARG_WITH("pimple", "for pimple support", "no");
-
-// Otherwise, use ARG_ENABLE
-// ARG_ENABLE("pimple", "enable pimple support", "no");
-
-if (PHP_PIMPLE != "no") {
-	EXTENSION("pimple", "pimple.c");
-}
-
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/php_pimple.h b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/php_pimple.h
deleted file mode 100644
index eed7c173..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/php_pimple.h
+++ /dev/null
@@ -1,137 +0,0 @@
-
-/*
- * This file is part of Pimple.
- *
- * Copyright (c) 2014 Fabien Potencier
- *
- * 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.
- */
-
-#ifndef PHP_PIMPLE_H
-#define PHP_PIMPLE_H
-
-extern zend_module_entry pimple_module_entry;
-#define phpext_pimple_ptr &pimple_module_entry
-
-#ifdef PHP_WIN32
-#	define PHP_PIMPLE_API __declspec(dllexport)
-#elif defined(__GNUC__) && __GNUC__ >= 4
-#	define PHP_PIMPLE_API __attribute__ ((visibility("default")))
-#else
-#	define PHP_PIMPLE_API
-#endif
-
-#ifdef ZTS
-#include "TSRM.h"
-#endif
-
-#define PIMPLE_VERSION "3.2.3-DEV"
-
-#define PIMPLE_NS "Pimple"
-#define PSR_CONTAINER_NS "Psr\\Container"
-#define PIMPLE_EXCEPTION_NS "Pimple\\Exception"
-
-#define PIMPLE_DEFAULT_ZVAL_CACHE_NUM   5
-#define PIMPLE_DEFAULT_ZVAL_VALUES_NUM 10
-
-#define PIMPLE_DEPRECATE do { \
-	int er = EG(error_reporting); \
-	EG(error_reporting) = 0;\
-	php_error(E_DEPRECATED, "The Pimple C extension is deprecated since version 3.1 and will be removed in 4.0."); \
-	EG(error_reporting) = er; \
-} while (0);
-
-zend_module_entry *get_module(void);
-
-PHP_MINIT_FUNCTION(pimple);
-PHP_MINFO_FUNCTION(pimple);
-
-PHP_METHOD(FrozenServiceException, __construct);
-PHP_METHOD(InvalidServiceIdentifierException, __construct);
-PHP_METHOD(UnknownIdentifierException, __construct);
-
-PHP_METHOD(Pimple, __construct);
-PHP_METHOD(Pimple, factory);
-PHP_METHOD(Pimple, protect);
-PHP_METHOD(Pimple, raw);
-PHP_METHOD(Pimple, extend);
-PHP_METHOD(Pimple, keys);
-PHP_METHOD(Pimple, register);
-PHP_METHOD(Pimple, offsetSet);
-PHP_METHOD(Pimple, offsetUnset);
-PHP_METHOD(Pimple, offsetGet);
-PHP_METHOD(Pimple, offsetExists);
-
-PHP_METHOD(PimpleClosure, invoker);
-
-typedef struct _pimple_bucket_value {
-	zval *value; /* Must be the first element */
-	zval *raw;
-	zend_object_handle handle_num;
-	enum {
-		PIMPLE_IS_PARAM   = 0,
-		PIMPLE_IS_SERVICE = 2
-	} type;
-	zend_bool initialized;
-	zend_fcall_info_cache fcc;
-} pimple_bucket_value;
-
-typedef struct _pimple_object {
-	zend_object zobj;
-	HashTable values;
-	HashTable factories;
-	HashTable protected;
-} pimple_object;
-
-typedef struct _pimple_closure_object {
-	zend_object zobj;
-	zval *callable;
-	zval *factory;
-} pimple_closure_object;
-
-static const char sensiolabs_logo[] = "<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHYAAAAUCAMAAABvRTlyAAAAz1BMVEUAAAAAAAAAAAAsThWB5j4AAACD6T8AAACC6D+C6D6C6D+C6D4AAAAAAACC6D4AAAAAAACC6D8AAAAAAAAAAAAAAAAAAAAAAACC6D4AAAAAAAAAAACC6D4AAAAAAAAAAAAAAAAAAAAAAACC6D8AAACC6D4AAAAAAAAAAAAAAAAAAACC6D8AAACC6D6C6D+B6D+C6D+C6D+C6D8AAACC6D6C6D4AAACC6D/K/2KC6D+B6D6C6D6C6D+C6D8sTxUyWRhEeiEAAACC6D+C5z6B6D7drnEVAAAAQXRSTlMAE3oCNSUuDHFHzxaF9UFsu+irX+zlKzYimaJXktyOSFD6BolxqT7QGMMdarMIpuO28r9EolXKgR16OphfXYd4V14GtB4AAAMpSURBVEjHvVSJctowEF1jjME2RziMwUCoMfd9heZqG4n//6buLpJjkmYm03byZmxJa2nf6u2uQcG2bfhqRN4LoTKBzyGDm68M7mAwcOEdjo4zhA/Rf9Go/CVtTgiRhXfIC3EDH8F/eUX1/9KexRo+QgOdtHDsEe/sM7QT32/+K61Z1LFXcXJxN4pTbu1aTQUzuy2PIA0rDo0/0Aa5XFaJvKaVTrubywXvaa1Wq4Vu/Snr3Y7Aojh4VccwykW2N2oQ8wmjyut6+Q1t5ywIG5Npj1sh5E0B7YOzFDjfuRfaOh3O+MbbVNfTWS9COZk3Obd2su5d0a6IU9KLREbw8gEehWSr1r2sPWciXLG38r5NdW0xu9eioU87omjC9yNaMi5GNf6WppVSOqXCFkmCvMB3p9SROLoYQn5pDgQOujA1xjYvqH+plUdkwnmII8VxR/PKYkrfLLomhVlE3b/LhNbNr7hp0H2JaOc4v8dFB58HSsFTSafaqtY1sT3GO8wsy5rhokYPlRJdjPMajyYqTt1EHF/2uqSWQWmAjCUSmQ1MS3g8Btf1XOsy7YIC0CB1b5Xw1Vhba0zbxiCAQLH9TNPmHJXQUtJAN0KcDsoqLxsNvJrJExa7mKIdp2lRE2WexiS4pqWk/0jROlw6K6bV9YOBDGAuqMJ0bnuUKGB0L27bxgRhGEbzihbhxxXaQC88Vkwq8ldCi86RApWUb0Q+4VDosBCc+1s81lUdnBavH4Zp2mm3O44USwOfvSo9oBiwpFg71lMS1VKJLKljS3j9p+fOTvXXlsSNuEv6YPaZda9uRope0VJfKdo7fPiYfSmvFjXQbkhY0d9hCbBWIktRgEDieDhf1N3wbbkmNNgRy8hyl620yGQat/grV3HMpc2HDKTVmOPFz6ylPCKt/nXcAyV260jaAowwIW0YuBzrOgb/KrddZS9OmJaLgpWK4JX2DDuklcLZSDGcn8Vmx9YDNvT6UsjyBApRyFQVX7Vxm9TGxE16nmfRd8/zQoDmggQOTRh5Hv8pMt9Q/L2JmSwkMCE7dA4BuDjHJwfu0Om4QAhOjrN5XkIatglfiN/bUPdCQFjTYgAAAABJRU5ErkJggg==\">";
-
-static void pimple_exception_call_parent_constructor(zval *this_ptr, const char *format, const char *arg1 TSRMLS_DC);
-
-static int pimple_zval_to_pimpleval(zval *_zval, pimple_bucket_value *_pimple_bucket_value TSRMLS_DC);
-static int pimple_zval_is_valid_callback(zval *_zval, pimple_bucket_value *_pimple_bucket_value TSRMLS_DC);
-
-static void pimple_bucket_dtor(pimple_bucket_value *bucket);
-static void pimple_free_bucket(pimple_bucket_value *bucket);
-
-static zval *pimple_object_read_dimension(zval *object, zval *offset, int type TSRMLS_DC);
-static void pimple_object_write_dimension(zval *object, zval *offset, zval *value TSRMLS_DC);
-static int pimple_object_has_dimension(zval *object, zval *offset, int check_empty TSRMLS_DC);
-static void pimple_object_unset_dimension(zval *object, zval *offset TSRMLS_DC);
-static zend_object_value pimple_object_create(zend_class_entry *ce TSRMLS_DC);
-static void pimple_free_object_storage(pimple_object *obj TSRMLS_DC);
-
-static void pimple_closure_free_object_storage(pimple_closure_object *obj TSRMLS_DC);
-static zend_object_value pimple_closure_object_create(zend_class_entry *ce TSRMLS_DC);
-static zend_function *pimple_closure_get_constructor(zval * TSRMLS_DC);
-static int pimple_closure_get_closure(zval *obj, zend_class_entry **ce_ptr, union _zend_function **fptr_ptr, zval **zobj_ptr TSRMLS_DC);
-
-#ifdef ZTS
-#define PIMPLE_G(v) TSRMG(pimple_globals_id, zend_pimple_globals *, v)
-#else
-#define PIMPLE_G(v) (pimple_globals.v)
-#endif
-
-#endif	/* PHP_PIMPLE_H */
-
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/pimple.c b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/pimple.c
deleted file mode 100644
index c80499b3..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/pimple.c
+++ /dev/null
@@ -1,1114 +0,0 @@
-
-/*
- * This file is part of Pimple.
- *
- * Copyright (c) 2014 Fabien Potencier
- *
- * 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "php.h"
-#include "php_ini.h"
-#include "ext/standard/info.h"
-#include "php_pimple.h"
-#include "pimple_compat.h"
-#include "zend_interfaces.h"
-#include "zend.h"
-#include "Zend/zend_closures.h"
-#include "ext/spl/spl_exceptions.h"
-#include "Zend/zend_exceptions.h"
-#include "main/php_output.h"
-#include "SAPI.h"
-
-static zend_class_entry *pimple_ce_PsrContainerInterface;
-static zend_class_entry *pimple_ce_PsrContainerExceptionInterface;
-static zend_class_entry *pimple_ce_PsrNotFoundExceptionInterface;
-
-static zend_class_entry *pimple_ce_ExpectedInvokableException;
-static zend_class_entry *pimple_ce_FrozenServiceException;
-static zend_class_entry *pimple_ce_InvalidServiceIdentifierException;
-static zend_class_entry *pimple_ce_UnknownIdentifierException;
-
-static zend_class_entry *pimple_ce;
-static zend_object_handlers pimple_object_handlers;
-static zend_class_entry *pimple_closure_ce;
-static zend_class_entry *pimple_serviceprovider_ce;
-static zend_object_handlers pimple_closure_object_handlers;
-static zend_internal_function pimple_closure_invoker_function;
-
-#define FETCH_DIM_HANDLERS_VARS 	pimple_object *pimple_obj = NULL; \
-									ulong index; \
-									pimple_obj = (pimple_object *)zend_object_store_get_object(object TSRMLS_CC); \
-
-#define PIMPLE_OBJECT_HANDLE_INHERITANCE_OBJECT_HANDLERS	do { \
-	if (ce != pimple_ce) { \
-		zend_hash_find(&ce->function_table, ZEND_STRS("offsetget"), (void **)&function); \
-		if (function->common.scope != ce) { /* if the function is not defined in this actual class */ \
-			pimple_object_handlers.read_dimension = pimple_object_read_dimension; /* then overwrite the handler to use custom one */ \
-		} \
-		zend_hash_find(&ce->function_table, ZEND_STRS("offsetset"), (void **)&function); \
-		if (function->common.scope != ce) { \
-			pimple_object_handlers.write_dimension = pimple_object_write_dimension; \
-		} \
-		zend_hash_find(&ce->function_table, ZEND_STRS("offsetexists"), (void **)&function); \
-		if (function->common.scope != ce) { \
-			pimple_object_handlers.has_dimension = pimple_object_has_dimension; \
-		} \
-		zend_hash_find(&ce->function_table, ZEND_STRS("offsetunset"), (void **)&function); \
-		if (function->common.scope != ce) { \
-			pimple_object_handlers.unset_dimension = pimple_object_unset_dimension; \
-		} \
-	} else { \
-		pimple_object_handlers.read_dimension = pimple_object_read_dimension; \
-		pimple_object_handlers.write_dimension = pimple_object_write_dimension; \
-		pimple_object_handlers.has_dimension = pimple_object_has_dimension; \
-		pimple_object_handlers.unset_dimension = pimple_object_unset_dimension; \
-	}\
-											} while(0);
-
-#define PIMPLE_CALL_CB	do { \
-			zend_fcall_info_argn(&fci TSRMLS_CC, 1, &object); \
-			fci.size           = sizeof(fci); \
-			fci.object_ptr     = retval->fcc.object_ptr; \
-			fci.function_name  = retval->value; \
-			fci.no_separation  = 1; \
-			fci.retval_ptr_ptr = &retval_ptr_ptr; \
-\
-			zend_call_function(&fci, &retval->fcc TSRMLS_CC); \
-			efree(fci.params); \
-			if (EG(exception)) { \
-				return EG(uninitialized_zval_ptr); \
-			} \
-						} while(0);
-
-
-/* Psr\Container\ContainerInterface */
-ZEND_BEGIN_ARG_INFO_EX(arginfo_pimple_PsrContainerInterface_get, 0, 0, 1)
-ZEND_ARG_INFO(0, id)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_pimple_PsrContainerInterface_has, 0, 0, 1)
-ZEND_ARG_INFO(0, id)
-ZEND_END_ARG_INFO()
-
-static const zend_function_entry pimple_ce_PsrContainerInterface_functions[] = {
-	PHP_ABSTRACT_ME(ContainerInterface, get, arginfo_pimple_PsrContainerInterface_get)
-	PHP_ABSTRACT_ME(ContainerInterface, has, arginfo_pimple_PsrContainerInterface_has)
-	PHP_FE_END
-};
-
-/* Psr\Container\ContainerExceptionInterface */
-static const zend_function_entry pimple_ce_PsrContainerExceptionInterface_functions[] = {
-	PHP_FE_END
-};
-
-/* Psr\Container\NotFoundExceptionInterface */
-static const zend_function_entry pimple_ce_PsrNotFoundExceptionInterface_functions[] = {
-	PHP_FE_END
-};
-
-/* Pimple\Exception\FrozenServiceException */
-ZEND_BEGIN_ARG_INFO_EX(arginfo_FrozenServiceException___construct, 0, 0, 1)
-ZEND_ARG_INFO(0, id)
-ZEND_END_ARG_INFO()
-
-static const zend_function_entry pimple_ce_FrozenServiceException_functions[] = {
-	PHP_ME(FrozenServiceException, __construct, arginfo_FrozenServiceException___construct, ZEND_ACC_PUBLIC)
-	PHP_FE_END
-};
-
-/* Pimple\Exception\InvalidServiceIdentifierException */
-ZEND_BEGIN_ARG_INFO_EX(arginfo_InvalidServiceIdentifierException___construct, 0, 0, 1)
-ZEND_ARG_INFO(0, id)
-ZEND_END_ARG_INFO()
-
-static const zend_function_entry pimple_ce_InvalidServiceIdentifierException_functions[] = {
-	PHP_ME(InvalidServiceIdentifierException, __construct, arginfo_InvalidServiceIdentifierException___construct, ZEND_ACC_PUBLIC)
-	PHP_FE_END
-};
-
-/* Pimple\Exception\UnknownIdentifierException */
-ZEND_BEGIN_ARG_INFO_EX(arginfo_UnknownIdentifierException___construct, 0, 0, 1)
-ZEND_ARG_INFO(0, id)
-ZEND_END_ARG_INFO()
-
-static const zend_function_entry pimple_ce_UnknownIdentifierException_functions[] = {
-	PHP_ME(UnknownIdentifierException, __construct, arginfo_UnknownIdentifierException___construct, ZEND_ACC_PUBLIC)
-	PHP_FE_END
-};
-
-/* Pimple\Container */
-ZEND_BEGIN_ARG_INFO_EX(arginfo___construct, 0, 0, 0)
-ZEND_ARG_ARRAY_INFO(0, value, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_offsetset, 0, 0, 2)
-ZEND_ARG_INFO(0, offset)
-ZEND_ARG_INFO(0, value)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_offsetget, 0, 0, 1)
-ZEND_ARG_INFO(0, offset)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_offsetexists, 0, 0, 1)
-ZEND_ARG_INFO(0, offset)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_offsetunset, 0, 0, 1)
-ZEND_ARG_INFO(0, offset)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_factory, 0, 0, 1)
-ZEND_ARG_INFO(0, callable)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_protect, 0, 0, 1)
-ZEND_ARG_INFO(0, callable)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_raw, 0, 0, 1)
-ZEND_ARG_INFO(0, id)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_extend, 0, 0, 2)
-ZEND_ARG_INFO(0, id)
-ZEND_ARG_INFO(0, callable)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_keys, 0, 0, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_register, 0, 0, 1)
-ZEND_ARG_OBJ_INFO(0, provider, Pimple\\ServiceProviderInterface, 0)
-ZEND_ARG_ARRAY_INFO(0, values, 1)
-ZEND_END_ARG_INFO()
-
-static const zend_function_entry pimple_ce_functions[] = {
-	PHP_ME(Pimple, __construct,	arginfo___construct, ZEND_ACC_PUBLIC)
-	PHP_ME(Pimple, factory,         arginfo_factory,         ZEND_ACC_PUBLIC)
-	PHP_ME(Pimple, protect,         arginfo_protect,         ZEND_ACC_PUBLIC)
-	PHP_ME(Pimple, raw,             arginfo_raw,             ZEND_ACC_PUBLIC)
-	PHP_ME(Pimple, extend,          arginfo_extend,          ZEND_ACC_PUBLIC)
-	PHP_ME(Pimple, keys,            arginfo_keys,            ZEND_ACC_PUBLIC)
-	PHP_ME(Pimple, register,		arginfo_register,		 ZEND_ACC_PUBLIC)
-
-	PHP_ME(Pimple, offsetSet,       arginfo_offsetset,       ZEND_ACC_PUBLIC)
-	PHP_ME(Pimple, offsetGet,       arginfo_offsetget,       ZEND_ACC_PUBLIC)
-	PHP_ME(Pimple, offsetExists,    arginfo_offsetexists,    ZEND_ACC_PUBLIC)
-	PHP_ME(Pimple, offsetUnset,     arginfo_offsetunset,     ZEND_ACC_PUBLIC)
-	PHP_FE_END
-};
-
-/* Pimple\ServiceProviderInterface */
-ZEND_BEGIN_ARG_INFO_EX(arginfo_serviceprovider_register, 0, 0, 1)
-ZEND_ARG_OBJ_INFO(0, pimple, Pimple\\Container, 0)
-ZEND_END_ARG_INFO()
-
-static const zend_function_entry pimple_serviceprovider_iface_ce_functions[] = {
-	PHP_ABSTRACT_ME(ServiceProviderInterface, register, arginfo_serviceprovider_register)
-	PHP_FE_END
-};
-
-/* parent::__construct(sprintf("Something with %s", $arg1)) */
-static void pimple_exception_call_parent_constructor(zval *this_ptr, const char *format, const char *arg1 TSRMLS_DC)
-{
-	zend_class_entry *ce = Z_OBJCE_P(this_ptr);
-	char *message = NULL;
-	int message_len;
-	zval *constructor_arg;
-
-	message_len = spprintf(&message, 0, format, arg1);
-	ALLOC_INIT_ZVAL(constructor_arg);
-	ZVAL_STRINGL(constructor_arg, message, message_len, 1);
-
-	zend_call_method_with_1_params(&this_ptr, ce, &ce->parent->constructor, "__construct", NULL, constructor_arg);
-
-	efree(message);
-	zval_ptr_dtor(&constructor_arg);
-}
-
-/**
- * Pass a single string parameter to exception constructor and throw
- */
-static void pimple_throw_exception_string(zend_class_entry *ce, const char *message, zend_uint message_len TSRMLS_DC)
-{
-	zval *exception, *param;
-
-	ALLOC_INIT_ZVAL(exception);
-	object_init_ex(exception, ce);
-
-	ALLOC_INIT_ZVAL(param);
-	ZVAL_STRINGL(param, message, message_len, 1);
-
-	zend_call_method_with_1_params(&exception, ce, &ce->constructor, "__construct", NULL, param);
-
-	zend_throw_exception_object(exception TSRMLS_CC);
-
-	zval_ptr_dtor(&param);
-}
-
-static void pimple_closure_free_object_storage(pimple_closure_object *obj TSRMLS_DC)
-{
-	zend_object_std_dtor(&obj->zobj TSRMLS_CC);
-	if (obj->factory) {
-		zval_ptr_dtor(&obj->factory);
-	}
-	if (obj->callable) {
-		zval_ptr_dtor(&obj->callable);
-	}
-	efree(obj);
-}
-
-static void pimple_free_object_storage(pimple_object *obj TSRMLS_DC)
-{
-	zend_hash_destroy(&obj->factories);
-	zend_hash_destroy(&obj->protected);
-	zend_hash_destroy(&obj->values);
-	zend_object_std_dtor(&obj->zobj TSRMLS_CC);
-	efree(obj);
-}
-
-static void pimple_free_bucket(pimple_bucket_value *bucket)
-{
-	if (bucket->raw) {
-		zval_ptr_dtor(&bucket->raw);
-	}
-}
-
-static zend_object_value pimple_closure_object_create(zend_class_entry *ce TSRMLS_DC)
-{
-	zend_object_value retval;
-	pimple_closure_object *pimple_closure_obj = NULL;
-
-	pimple_closure_obj = ecalloc(1, sizeof(pimple_closure_object));
-	ZEND_OBJ_INIT(&pimple_closure_obj->zobj, ce);
-
-	pimple_closure_object_handlers.get_constructor = pimple_closure_get_constructor;
-	retval.handlers = &pimple_closure_object_handlers;
-	retval.handle   = zend_objects_store_put(pimple_closure_obj, (zend_objects_store_dtor_t) zend_objects_destroy_object, (zend_objects_free_object_storage_t) pimple_closure_free_object_storage, NULL TSRMLS_CC);
-
-	return retval;
-}
-
-static zend_function *pimple_closure_get_constructor(zval *obj TSRMLS_DC)
-{
-	zend_error(E_ERROR, "Pimple\\ContainerClosure is an internal class and cannot be instantiated");
-
-	return NULL;
-}
-
-static int pimple_closure_get_closure(zval *obj, zend_class_entry **ce_ptr, union _zend_function **fptr_ptr, zval **zobj_ptr TSRMLS_DC)
-{
-	*zobj_ptr = obj;
-	*ce_ptr   = Z_OBJCE_P(obj);
-	*fptr_ptr = (zend_function *)&pimple_closure_invoker_function;
-
-	return SUCCESS;
-}
-
-static zend_object_value pimple_object_create(zend_class_entry *ce TSRMLS_DC)
-{
-	zend_object_value retval;
-	pimple_object *pimple_obj  = NULL;
-	zend_function *function    = NULL;
-
-	pimple_obj = emalloc(sizeof(pimple_object));
-	ZEND_OBJ_INIT(&pimple_obj->zobj, ce);
-
-	PIMPLE_OBJECT_HANDLE_INHERITANCE_OBJECT_HANDLERS
-
-	retval.handlers = &pimple_object_handlers;
-	retval.handle   = zend_objects_store_put(pimple_obj, (zend_objects_store_dtor_t) zend_objects_destroy_object, (zend_objects_free_object_storage_t) pimple_free_object_storage, NULL TSRMLS_CC);
-
-	zend_hash_init(&pimple_obj->factories, PIMPLE_DEFAULT_ZVAL_CACHE_NUM, NULL, (dtor_func_t)pimple_bucket_dtor, 0);
-	zend_hash_init(&pimple_obj->protected, PIMPLE_DEFAULT_ZVAL_CACHE_NUM, NULL, (dtor_func_t)pimple_bucket_dtor, 0);
-	zend_hash_init(&pimple_obj->values, PIMPLE_DEFAULT_ZVAL_VALUES_NUM, NULL, (dtor_func_t)pimple_bucket_dtor, 0);
-
-	return retval;
-}
-
-static void pimple_object_write_dimension(zval *object, zval *offset, zval *value TSRMLS_DC)
-{
-	FETCH_DIM_HANDLERS_VARS
-
-	pimple_bucket_value pimple_value = {0}, *found_value = NULL;
-	ulong hash;
-
-	pimple_zval_to_pimpleval(value, &pimple_value TSRMLS_CC);
-
-	if (!offset) {/* $p[] = 'foo' when not overloaded */
-		zend_hash_next_index_insert(&pimple_obj->values, (void *)&pimple_value, sizeof(pimple_bucket_value), NULL);
-		Z_ADDREF_P(value);
-		return;
-	}
-
-	switch (Z_TYPE_P(offset)) {
-	case IS_STRING:
-		hash = zend_hash_func(Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1);
-		zend_hash_quick_find(&pimple_obj->values, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hash, (void **)&found_value);
-		if (found_value && found_value->type == PIMPLE_IS_SERVICE && found_value->initialized == 1) {
-			pimple_free_bucket(&pimple_value);
-			pimple_throw_exception_string(pimple_ce_FrozenServiceException, Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC);
-			return;
-		}
-		if (zend_hash_quick_update(&pimple_obj->values, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hash, (void *)&pimple_value, sizeof(pimple_bucket_value), NULL) == FAILURE) {
-			pimple_free_bucket(&pimple_value);
-			return;
-		}
-		Z_ADDREF_P(value);
-	break;
-	case IS_DOUBLE:
-	case IS_BOOL:
-	case IS_LONG:
-		if (Z_TYPE_P(offset) == IS_DOUBLE) {
-			index = (ulong)Z_DVAL_P(offset);
-		} else {
-			index = Z_LVAL_P(offset);
-		}
-		zend_hash_index_find(&pimple_obj->values, index, (void **)&found_value);
-		if (found_value && found_value->type == PIMPLE_IS_SERVICE && found_value->initialized == 1) {
-			pimple_free_bucket(&pimple_value);
-			convert_to_string(offset);
-			pimple_throw_exception_string(pimple_ce_FrozenServiceException, Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC);
-			return;
-		}
-		if (zend_hash_index_update(&pimple_obj->values, index, (void *)&pimple_value, sizeof(pimple_bucket_value), NULL) == FAILURE) {
-			pimple_free_bucket(&pimple_value);
-			return;
-		}
-		Z_ADDREF_P(value);
-	break;
-	case IS_NULL: /* $p[] = 'foo' when overloaded */
-		zend_hash_next_index_insert(&pimple_obj->values, (void *)&pimple_value, sizeof(pimple_bucket_value), NULL);
-		Z_ADDREF_P(value);
-	break;
-	default:
-		pimple_free_bucket(&pimple_value);
-		zend_error(E_WARNING, "Unsupported offset type");
-	}
-}
-
-static void pimple_object_unset_dimension(zval *object, zval *offset TSRMLS_DC)
-{
-	FETCH_DIM_HANDLERS_VARS
-
-	switch (Z_TYPE_P(offset)) {
-	case IS_STRING:
-		zend_symtable_del(&pimple_obj->values, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1);
-		zend_symtable_del(&pimple_obj->factories, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1);
-		zend_symtable_del(&pimple_obj->protected, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1);
-	break;
-	case IS_DOUBLE:
-	case IS_BOOL:
-	case IS_LONG:
-		if (Z_TYPE_P(offset) == IS_DOUBLE) {
-			index = (ulong)Z_DVAL_P(offset);
-		} else {
-			index = Z_LVAL_P(offset);
-		}
-		zend_hash_index_del(&pimple_obj->values, index);
-		zend_hash_index_del(&pimple_obj->factories, index);
-		zend_hash_index_del(&pimple_obj->protected, index);
-	break;
-	default:
-		zend_error(E_WARNING, "Unsupported offset type");
-	}
-}
-
-static int pimple_object_has_dimension(zval *object, zval *offset, int check_empty TSRMLS_DC)
-{
-	FETCH_DIM_HANDLERS_VARS
-
-	pimple_bucket_value *retval = NULL;
-
-	switch (Z_TYPE_P(offset)) {
-	case IS_STRING:
-		if (zend_symtable_find(&pimple_obj->values, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void **)&retval) == SUCCESS) {
-			switch (check_empty) {
-			case 0: /* isset */
-				return 1; /* Differs from PHP behavior (Z_TYPE_P(retval->value) != IS_NULL;) */
-			case 1: /* empty */
-			default:
-				return zend_is_true(retval->value);
-			}
-		}
-		return 0;
-	break;
-	case IS_DOUBLE:
-	case IS_BOOL:
-	case IS_LONG:
-		if (Z_TYPE_P(offset) == IS_DOUBLE) {
-			index = (ulong)Z_DVAL_P(offset);
-		} else {
-			index = Z_LVAL_P(offset);
-		}
-		if (zend_hash_index_find(&pimple_obj->values, index, (void **)&retval) == SUCCESS) {
-			switch (check_empty) {
-				case 0: /* isset */
-					return 1; /* Differs from PHP behavior (Z_TYPE_P(retval->value) != IS_NULL;)*/
-				case 1: /* empty */
-				default:
-					return zend_is_true(retval->value);
-			}
-		}
-		return 0;
-	break;
-	default:
-		zend_error(E_WARNING, "Unsupported offset type");
-		return 0;
-	}
-}
-
-static zval *pimple_object_read_dimension(zval *object, zval *offset, int type TSRMLS_DC)
-{
-	FETCH_DIM_HANDLERS_VARS
-
-	pimple_bucket_value *retval = NULL;
-	zend_fcall_info fci         = {0};
-	zval *retval_ptr_ptr        = NULL;
-
-	switch (Z_TYPE_P(offset)) {
-	case IS_STRING:
-		if (zend_symtable_find(&pimple_obj->values, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void **)&retval) == FAILURE) {
-			pimple_throw_exception_string(pimple_ce_UnknownIdentifierException, Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC);
-
-			return EG(uninitialized_zval_ptr);
-		}
-	break;
-	case IS_DOUBLE:
-	case IS_BOOL:
-	case IS_LONG:
-		if (Z_TYPE_P(offset) == IS_DOUBLE) {
-			index = (ulong)Z_DVAL_P(offset);
-		} else {
-			index = Z_LVAL_P(offset);
-		}
-		if (zend_hash_index_find(&pimple_obj->values, index, (void **)&retval) == FAILURE) {
-			return EG(uninitialized_zval_ptr);
-		}
-	break;
-	case IS_NULL: /* $p[][3] = 'foo' first dim access */
-		return EG(uninitialized_zval_ptr);
-	break;
-	default:
-		zend_error(E_WARNING, "Unsupported offset type");
-		return EG(uninitialized_zval_ptr);
-	}
-
-	if(retval->type == PIMPLE_IS_PARAM) {
-		return retval->value;
-	}
-
-	if (zend_hash_index_exists(&pimple_obj->protected, retval->handle_num)) {
-		/* Service is protected, return the value every time */
-		return retval->value;
-	}
-
-	if (zend_hash_index_exists(&pimple_obj->factories, retval->handle_num)) {
-		/* Service is a factory, call it every time and never cache its result */
-		PIMPLE_CALL_CB
-		Z_DELREF_P(retval_ptr_ptr); /* fetch dim addr will increment refcount */
-		return retval_ptr_ptr;
-	}
-
-	if (retval->initialized == 1) {
-		/* Service has already been called, return its cached value */
-		return retval->value;
-	}
-
-	ALLOC_INIT_ZVAL(retval->raw);
-	MAKE_COPY_ZVAL(&retval->value, retval->raw);
-
-	PIMPLE_CALL_CB
-
-	retval->initialized = 1;
-	zval_ptr_dtor(&retval->value);
-	retval->value = retval_ptr_ptr;
-
-	return retval->value;
-}
-
-static int pimple_zval_is_valid_callback(zval *_zval, pimple_bucket_value *_pimple_bucket_value TSRMLS_DC)
-{
-	if (Z_TYPE_P(_zval) != IS_OBJECT) {
-		return FAILURE;
-	}
-
-	if (_pimple_bucket_value->fcc.called_scope) {
-		return SUCCESS;
-	}
-
-	if (Z_OBJ_HANDLER_P(_zval, get_closure) && Z_OBJ_HANDLER_P(_zval, get_closure)(_zval, &_pimple_bucket_value->fcc.calling_scope, &_pimple_bucket_value->fcc.function_handler, &_pimple_bucket_value->fcc.object_ptr TSRMLS_CC) == SUCCESS) {
-		_pimple_bucket_value->fcc.called_scope = _pimple_bucket_value->fcc.calling_scope;
-		return SUCCESS;
-	} else {
-		return FAILURE;
-	}
-}
-
-static int pimple_zval_to_pimpleval(zval *_zval, pimple_bucket_value *_pimple_bucket_value TSRMLS_DC)
-{
-	_pimple_bucket_value->value = _zval;
-
-	if (Z_TYPE_P(_zval) != IS_OBJECT) {
-		return PIMPLE_IS_PARAM;
-	}
-
-	if (pimple_zval_is_valid_callback(_zval, _pimple_bucket_value TSRMLS_CC) == SUCCESS) {
-		_pimple_bucket_value->type       = PIMPLE_IS_SERVICE;
-		_pimple_bucket_value->handle_num = Z_OBJ_HANDLE_P(_zval);
-	}
-
-	return PIMPLE_IS_SERVICE;
-}
-
-static void pimple_bucket_dtor(pimple_bucket_value *bucket)
-{
-	zval_ptr_dtor(&bucket->value);
-	pimple_free_bucket(bucket);
-}
-
-PHP_METHOD(FrozenServiceException, __construct)
-{
-	char *id = NULL;
-	int id_len;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &id, &id_len) == FAILURE) {
-		return;
-	}
-	pimple_exception_call_parent_constructor(getThis(), "Cannot override frozen service \"%s\".", id TSRMLS_CC);
-}
-
-PHP_METHOD(InvalidServiceIdentifierException, __construct)
-{
-	char *id = NULL;
-	int id_len;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &id, &id_len) == FAILURE) {
-		return;
-	}
-	pimple_exception_call_parent_constructor(getThis(), "Identifier \"%s\" does not contain an object definition.", id TSRMLS_CC);
-}
-
-PHP_METHOD(UnknownIdentifierException, __construct)
-{
-	char *id = NULL;
-	int id_len;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &id, &id_len) == FAILURE) {
-		return;
-	}
-	pimple_exception_call_parent_constructor(getThis(), "Identifier \"%s\" is not defined.", id TSRMLS_CC);
-}
-
-PHP_METHOD(Pimple, protect)
-{
-	zval *protected     = NULL;
-	pimple_object *pobj = NULL;
-	pimple_bucket_value bucket = {0};
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &protected) == FAILURE) {
-		return;
-	}
-
-	if (pimple_zval_is_valid_callback(protected, &bucket TSRMLS_CC) == FAILURE) {
-		pimple_free_bucket(&bucket);
-		zend_throw_exception(pimple_ce_ExpectedInvokableException, "Callable is not a Closure or invokable object.", 0 TSRMLS_CC);
-		return;
-	}
-
-	pimple_zval_to_pimpleval(protected, &bucket TSRMLS_CC);
-	pobj = (pimple_object *)zend_object_store_get_object(getThis() TSRMLS_CC);
-
-	if (zend_hash_index_update(&pobj->protected, bucket.handle_num, (void *)&bucket, sizeof(pimple_bucket_value), NULL) == SUCCESS) {
-		Z_ADDREF_P(protected);
-		RETURN_ZVAL(protected, 1 , 0);
-	} else {
-		pimple_free_bucket(&bucket);
-	}
-	RETURN_FALSE;
-}
-
-PHP_METHOD(Pimple, raw)
-{
-	zval *offset = NULL;
-	pimple_object *pobj        = NULL;
-	pimple_bucket_value *value = NULL;
-	ulong index;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &offset) == FAILURE) {
-		return;
-	}
-
-	pobj = zend_object_store_get_object(getThis() TSRMLS_CC);
-
-	switch (Z_TYPE_P(offset)) {
-		case IS_STRING:
-			if (zend_symtable_find(&pobj->values, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void *)&value) == FAILURE) {
-				pimple_throw_exception_string(pimple_ce_UnknownIdentifierException, Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC);
-				RETURN_NULL();
-			}
-		break;
-		case IS_DOUBLE:
-		case IS_BOOL:
-		case IS_LONG:
-			if (Z_TYPE_P(offset) == IS_DOUBLE) {
-				index = (ulong)Z_DVAL_P(offset);
-			} else {
-				index = Z_LVAL_P(offset);
-			}
-			if (zend_hash_index_find(&pobj->values, index, (void *)&value) == FAILURE) {
-				RETURN_NULL();
-			}
-		break;
-		case IS_NULL:
-		default:
-			zend_error(E_WARNING, "Unsupported offset type");
-	}
-
-	if (value->raw) {
-		RETVAL_ZVAL(value->raw, 1, 0);
-	} else {
-		RETVAL_ZVAL(value->value, 1, 0);
-	}
-}
-
-PHP_METHOD(Pimple, extend)
-{
-	zval *offset = NULL, *callable = NULL, *pimple_closure_obj = NULL;
-	pimple_bucket_value bucket = {0}, *value = NULL;
-	pimple_object *pobj          = NULL;
-	pimple_closure_object *pcobj = NULL;
-	ulong index;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz", &offset, &callable) == FAILURE) {
-		return;
-	}
-
-	pobj = zend_object_store_get_object(getThis() TSRMLS_CC);
-
-	switch (Z_TYPE_P(offset)) {
-		case IS_STRING:
-			if (zend_symtable_find(&pobj->values, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void *)&value) == FAILURE) {
-				pimple_throw_exception_string(pimple_ce_UnknownIdentifierException, Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC);
-				RETURN_NULL();
-			}
-
-			if (value->type != PIMPLE_IS_SERVICE) {
-				pimple_throw_exception_string(pimple_ce_InvalidServiceIdentifierException, Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC);
-				RETURN_NULL();
-			}
-			if (zend_hash_index_exists(&pobj->protected, value->handle_num)) {
-				int er = EG(error_reporting);
-				EG(error_reporting) = 0;
-				php_error(E_DEPRECATED, "How Pimple behaves when extending protected closures will be fixed in Pimple 4. Are you sure \"%s\" should be protected?", Z_STRVAL_P(offset));
-				EG(error_reporting) = er;
-			}
-		break;
-		case IS_DOUBLE:
-		case IS_BOOL:
-		case IS_LONG:
-			if (Z_TYPE_P(offset) == IS_DOUBLE) {
-				index = (ulong)Z_DVAL_P(offset);
-			} else {
-				index = Z_LVAL_P(offset);
-			}
-			if (zend_hash_index_find(&pobj->values, index, (void *)&value) == FAILURE) {
-				convert_to_string(offset);
-				pimple_throw_exception_string(pimple_ce_UnknownIdentifierException, Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC);
-				RETURN_NULL();
-			}
-			if (value->type != PIMPLE_IS_SERVICE) {
-				convert_to_string(offset);
-				pimple_throw_exception_string(pimple_ce_InvalidServiceIdentifierException, Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC);
-				RETURN_NULL();
-			}
-			if (zend_hash_index_exists(&pobj->protected, value->handle_num)) {
-				int er = EG(error_reporting);
-				EG(error_reporting) = 0;
-				php_error(E_DEPRECATED, "How Pimple behaves when extending protected closures will be fixed in Pimple 4. Are you sure \"%ld\" should be protected?", index);
-				EG(error_reporting) = er;
-			}
-		break;
-		case IS_NULL:
-		default:
-			zend_error(E_WARNING, "Unsupported offset type");
-	}
-
-	if (pimple_zval_is_valid_callback(callable, &bucket TSRMLS_CC) == FAILURE) {
-		pimple_free_bucket(&bucket);
-		zend_throw_exception(pimple_ce_ExpectedInvokableException, "Extension service definition is not a Closure or invokable object.", 0 TSRMLS_CC);
-		RETURN_NULL();
-	}
-	pimple_free_bucket(&bucket);
-
-	ALLOC_INIT_ZVAL(pimple_closure_obj);
-	object_init_ex(pimple_closure_obj, pimple_closure_ce);
-
-	pcobj = zend_object_store_get_object(pimple_closure_obj TSRMLS_CC);
-	pcobj->callable = callable;
-	pcobj->factory  = value->value;
-	Z_ADDREF_P(callable);
-	Z_ADDREF_P(value->value);
-
-	if (zend_hash_index_exists(&pobj->factories, value->handle_num)) {
-		pimple_zval_to_pimpleval(pimple_closure_obj, &bucket TSRMLS_CC);
-		zend_hash_index_del(&pobj->factories, value->handle_num);
-		zend_hash_index_update(&pobj->factories, bucket.handle_num, (void *)&bucket, sizeof(pimple_bucket_value), NULL);
-		Z_ADDREF_P(pimple_closure_obj);
-	}
-
-	pimple_object_write_dimension(getThis(), offset, pimple_closure_obj TSRMLS_CC);
-
-	RETVAL_ZVAL(pimple_closure_obj, 1, 1);
-}
-
-PHP_METHOD(Pimple, keys)
-{
-	HashPosition pos;
-	pimple_object *pobj = NULL;
-	zval **value        = NULL;
-	zval *endval        = NULL;
-	char *str_index     = NULL;
-	int str_len;
-	ulong num_index;
-
-	if (zend_parse_parameters_none() == FAILURE) {
-		return;
-	}
-
-	pobj = zend_object_store_get_object(getThis() TSRMLS_CC);
-	array_init_size(return_value, zend_hash_num_elements(&pobj->values));
-
-	zend_hash_internal_pointer_reset_ex(&pobj->values, &pos);
-
-	while(zend_hash_get_current_data_ex(&pobj->values, (void **)&value, &pos) == SUCCESS) {
-		MAKE_STD_ZVAL(endval);
-		switch (zend_hash_get_current_key_ex(&pobj->values, &str_index, (uint *)&str_len, &num_index, 0, &pos)) {
-			case HASH_KEY_IS_STRING:
-				ZVAL_STRINGL(endval, str_index, str_len - 1, 1);
-				zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &endval, sizeof(zval *), NULL);
-			break;
-			case HASH_KEY_IS_LONG:
-				ZVAL_LONG(endval, num_index);
-				zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &endval, sizeof(zval *), NULL);
-			break;
-		}
-	zend_hash_move_forward_ex(&pobj->values, &pos);
-	}
-}
-
-PHP_METHOD(Pimple, factory)
-{
-	zval *factory       = NULL;
-	pimple_object *pobj = NULL;
-	pimple_bucket_value bucket = {0};
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &factory) == FAILURE) {
-		return;
-	}
-
-	if (pimple_zval_is_valid_callback(factory, &bucket TSRMLS_CC) == FAILURE) {
-		pimple_free_bucket(&bucket);
-		zend_throw_exception(pimple_ce_ExpectedInvokableException, "Service definition is not a Closure or invokable object.", 0 TSRMLS_CC);
-		return;
-	}
-
-	pimple_zval_to_pimpleval(factory, &bucket TSRMLS_CC);
-	pobj = (pimple_object *)zend_object_store_get_object(getThis() TSRMLS_CC);
-
-	if (zend_hash_index_update(&pobj->factories, bucket.handle_num, (void *)&bucket, sizeof(pimple_bucket_value), NULL) == SUCCESS) {
-		Z_ADDREF_P(factory);
-		RETURN_ZVAL(factory, 1 , 0);
-	} else {
-		pimple_free_bucket(&bucket);
-	}
-
-	RETURN_FALSE;
-}
-
-PHP_METHOD(Pimple, offsetSet)
-{
-	zval *offset = NULL, *value = NULL;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz", &offset, &value) == FAILURE) {
-		return;
-	}
-
-	pimple_object_write_dimension(getThis(), offset, value TSRMLS_CC);
-}
-
-PHP_METHOD(Pimple, offsetGet)
-{
-	zval *offset = NULL, *retval = NULL;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &offset) == FAILURE) {
-		return;
-	}
-
-	retval = pimple_object_read_dimension(getThis(), offset, 0 TSRMLS_CC);
-
-	RETVAL_ZVAL(retval, 1, 0);
-}
-
-PHP_METHOD(Pimple, offsetUnset)
-{
-	zval *offset = NULL;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &offset) == FAILURE) {
-		return;
-	}
-
-	pimple_object_unset_dimension(getThis(), offset TSRMLS_CC);
-}
-
-PHP_METHOD(Pimple, offsetExists)
-{
-	zval *offset = NULL;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &offset) == FAILURE) {
-		return;
-	}
-
-	RETVAL_BOOL(pimple_object_has_dimension(getThis(), offset, 1 TSRMLS_CC));
-}
-
-PHP_METHOD(Pimple, register)
-{
-	zval *provider;
-	zval **data;
-	zval *retval = NULL;
-	zval key;
-
-	HashTable *array = NULL;
-	HashPosition pos;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|h", &provider, pimple_serviceprovider_ce, &array) == FAILURE) {
-		return;
-	}
-
-	RETVAL_ZVAL(getThis(), 1, 0);
-
-	zend_call_method_with_1_params(&provider, Z_OBJCE_P(provider), NULL, "register", &retval, getThis());
-
-	if (retval) {
-		zval_ptr_dtor(&retval);
-	}
-
-	if (!array) {
-		return;
-	}
-
-	zend_hash_internal_pointer_reset_ex(array, &pos);
-
-	while(zend_hash_get_current_data_ex(array, (void **)&data, &pos) == SUCCESS) {
-		zend_hash_get_current_key_zval_ex(array, &key, &pos);
-		pimple_object_write_dimension(getThis(), &key, *data TSRMLS_CC);
-		zend_hash_move_forward_ex(array, &pos);
-	}
-}
-
-PHP_METHOD(Pimple, __construct)
-{
-	zval *values = NULL, **pData = NULL, offset;
-	HashPosition pos;
-	char *str_index = NULL;
-	zend_uint str_length;
-	ulong num_index;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!", &values) == FAILURE) {
-		return;
-	}
-
-	PIMPLE_DEPRECATE
-
-	if (!values) {
-		return;
-	}
-
-	zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(values), &pos);
-	while (zend_hash_has_more_elements_ex(Z_ARRVAL_P(values), &pos) == SUCCESS) {
-			zend_hash_get_current_data_ex(Z_ARRVAL_P(values), (void **)&pData, &pos);
-			zend_hash_get_current_key_ex(Z_ARRVAL_P(values), &str_index, &str_length, &num_index, 0, &pos);
-			INIT_ZVAL(offset);
-			if (zend_hash_get_current_key_type_ex(Z_ARRVAL_P(values), &pos) == HASH_KEY_IS_LONG) {
-				ZVAL_LONG(&offset, num_index);
-			} else {
-				ZVAL_STRINGL(&offset, str_index, (str_length - 1), 0);
-			}
-		pimple_object_write_dimension(getThis(), &offset, *pData TSRMLS_CC);
-		zend_hash_move_forward_ex(Z_ARRVAL_P(values), &pos);
-	}
-}
-
-/*
- * This is PHP code snippet handling extend()s calls :
-
-  $extended = function ($c) use ($callable, $factory) {
-      return $callable($factory($c), $c);
-  };
-
- */
-PHP_METHOD(PimpleClosure, invoker)
-{
-	pimple_closure_object *pcobj = NULL;
-	zval *arg = NULL, *retval = NULL, *newretval = NULL;
-	zend_fcall_info fci        = {0};
-	zval **args[2];
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &arg) == FAILURE) {
-		return;
-	}
-
-	pcobj = zend_object_store_get_object(getThis() TSRMLS_CC);
-
-	fci.function_name = pcobj->factory;
-	args[0] = &arg;
-	zend_fcall_info_argp(&fci TSRMLS_CC, 1, args);
-	fci.retval_ptr_ptr = &retval;
-	fci.size = sizeof(fci);
-
-	if (zend_call_function(&fci, NULL TSRMLS_CC) == FAILURE || EG(exception)) {
-		efree(fci.params);
-		return; /* Should here return default zval */
-	}
-
-	efree(fci.params);
-	memset(&fci, 0, sizeof(fci));
-	fci.size = sizeof(fci);
-
-	fci.function_name = pcobj->callable;
-	args[0] = &retval;
-	args[1] = &arg;
-	zend_fcall_info_argp(&fci TSRMLS_CC, 2, args);
-	fci.retval_ptr_ptr = &newretval;
-
-	if (zend_call_function(&fci, NULL TSRMLS_CC) == FAILURE || EG(exception)) {
-		efree(fci.params);
-		zval_ptr_dtor(&retval);
-		return;
-	}
-
-	efree(fci.params);
-	zval_ptr_dtor(&retval);
-
-	RETVAL_ZVAL(newretval, 1 ,1);
-}
-
-PHP_MINIT_FUNCTION(pimple)
-{
-	zend_class_entry tmp_ce_PsrContainerInterface, tmp_ce_PsrContainerExceptionInterface, tmp_ce_PsrNotFoundExceptionInterface;
-	zend_class_entry tmp_ce_ExpectedInvokableException, tmp_ce_FrozenServiceException, tmp_ce_InvalidServiceIdentifierException, tmp_ce_UnknownIdentifierException;
-	zend_class_entry tmp_pimple_ce, tmp_pimple_closure_ce, tmp_pimple_serviceprovider_iface_ce;
-
-	/* Psr\Container namespace */
-	INIT_NS_CLASS_ENTRY(tmp_ce_PsrContainerInterface,          PSR_CONTAINER_NS, "ContainerInterface",           pimple_ce_PsrContainerInterface_functions);
-	INIT_NS_CLASS_ENTRY(tmp_ce_PsrContainerExceptionInterface, PSR_CONTAINER_NS, "ContainerExceptionInterface", pimple_ce_PsrContainerExceptionInterface_functions);
-	INIT_NS_CLASS_ENTRY(tmp_ce_PsrNotFoundExceptionInterface,  PSR_CONTAINER_NS, "NotFoundExceptionInterface",  pimple_ce_PsrNotFoundExceptionInterface_functions);
-
-	pimple_ce_PsrContainerInterface          = zend_register_internal_interface(&tmp_ce_PsrContainerInterface TSRMLS_CC);
-	pimple_ce_PsrContainerExceptionInterface = zend_register_internal_interface(&tmp_ce_PsrContainerExceptionInterface TSRMLS_CC);
-	pimple_ce_PsrNotFoundExceptionInterface  = zend_register_internal_interface(&tmp_ce_PsrNotFoundExceptionInterface TSRMLS_CC);
-
-	zend_class_implements(pimple_ce_PsrNotFoundExceptionInterface TSRMLS_CC, 1, pimple_ce_PsrContainerExceptionInterface);
-
-	/* Pimple\Exception namespace */
-	INIT_NS_CLASS_ENTRY(tmp_ce_ExpectedInvokableException,        PIMPLE_EXCEPTION_NS, "ExpectedInvokableException",         NULL);
-	INIT_NS_CLASS_ENTRY(tmp_ce_FrozenServiceException,            PIMPLE_EXCEPTION_NS, "FrozenServiceException",             pimple_ce_FrozenServiceException_functions);
-	INIT_NS_CLASS_ENTRY(tmp_ce_InvalidServiceIdentifierException, PIMPLE_EXCEPTION_NS, "InvalidServiceIdentifierException", pimple_ce_InvalidServiceIdentifierException_functions);
-	INIT_NS_CLASS_ENTRY(tmp_ce_UnknownIdentifierException,        PIMPLE_EXCEPTION_NS, "UnknownIdentifierException",         pimple_ce_UnknownIdentifierException_functions);
-
-	pimple_ce_ExpectedInvokableException        = zend_register_internal_class_ex(&tmp_ce_ExpectedInvokableException, spl_ce_InvalidArgumentException, NULL TSRMLS_CC);
-	pimple_ce_FrozenServiceException            = zend_register_internal_class_ex(&tmp_ce_FrozenServiceException, spl_ce_RuntimeException, NULL TSRMLS_CC);
-	pimple_ce_InvalidServiceIdentifierException = zend_register_internal_class_ex(&tmp_ce_InvalidServiceIdentifierException, spl_ce_InvalidArgumentException, NULL TSRMLS_CC);
-	pimple_ce_UnknownIdentifierException        = zend_register_internal_class_ex(&tmp_ce_UnknownIdentifierException, spl_ce_InvalidArgumentException, NULL TSRMLS_CC);
-
-	zend_class_implements(pimple_ce_ExpectedInvokableException TSRMLS_CC,        1, pimple_ce_PsrContainerExceptionInterface);
-	zend_class_implements(pimple_ce_FrozenServiceException TSRMLS_CC,            1, pimple_ce_PsrContainerExceptionInterface);
-	zend_class_implements(pimple_ce_InvalidServiceIdentifierException TSRMLS_CC, 1, pimple_ce_PsrContainerExceptionInterface);
-	zend_class_implements(pimple_ce_UnknownIdentifierException TSRMLS_CC,        1, pimple_ce_PsrNotFoundExceptionInterface);
-
-    /* Pimple namespace */
-	INIT_NS_CLASS_ENTRY(tmp_pimple_ce, PIMPLE_NS, "Container", pimple_ce_functions);
-	INIT_NS_CLASS_ENTRY(tmp_pimple_closure_ce, PIMPLE_NS, "ContainerClosure", NULL);
-	INIT_NS_CLASS_ENTRY(tmp_pimple_serviceprovider_iface_ce, PIMPLE_NS, "ServiceProviderInterface", pimple_serviceprovider_iface_ce_functions);
-
-	tmp_pimple_ce.create_object         = pimple_object_create;
-	tmp_pimple_closure_ce.create_object = pimple_closure_object_create;
-
-	pimple_ce = zend_register_internal_class(&tmp_pimple_ce TSRMLS_CC);
-	zend_class_implements(pimple_ce TSRMLS_CC, 1, zend_ce_arrayaccess);
-
-	pimple_closure_ce = zend_register_internal_class(&tmp_pimple_closure_ce TSRMLS_CC);
-	pimple_closure_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
-
-	pimple_serviceprovider_ce = zend_register_internal_interface(&tmp_pimple_serviceprovider_iface_ce TSRMLS_CC);
-
-	memcpy(&pimple_closure_object_handlers, zend_get_std_object_handlers(), sizeof(*zend_get_std_object_handlers()));
-	pimple_object_handlers                     = std_object_handlers;
-	pimple_closure_object_handlers.get_closure = pimple_closure_get_closure;
-
-	pimple_closure_invoker_function.function_name     = "Pimple closure internal invoker";
-	pimple_closure_invoker_function.fn_flags         |= ZEND_ACC_CLOSURE;
-	pimple_closure_invoker_function.handler           = ZEND_MN(PimpleClosure_invoker);
-	pimple_closure_invoker_function.num_args          = 1;
-	pimple_closure_invoker_function.required_num_args = 1;
-	pimple_closure_invoker_function.scope             = pimple_closure_ce;
-	pimple_closure_invoker_function.type              = ZEND_INTERNAL_FUNCTION;
-	pimple_closure_invoker_function.module            = &pimple_module_entry;
-
-	return SUCCESS;
-}
-
-PHP_MINFO_FUNCTION(pimple)
-{
-	php_info_print_table_start();
-	php_info_print_table_header(2, "SensioLabs Pimple C support", "enabled");
-	php_info_print_table_row(2, "Pimple supported version", PIMPLE_VERSION);
-	php_info_print_table_end();
-
-	php_info_print_box_start(0);
-	php_write((void *)ZEND_STRL("SensioLabs Pimple C support developed by Julien Pauli") TSRMLS_CC);
-	if (!sapi_module.phpinfo_as_text) {
-		php_write((void *)ZEND_STRL(sensiolabs_logo) TSRMLS_CC);
-	}
-	php_info_print_box_end();
-}
-
-zend_module_entry pimple_module_entry = {
-	STANDARD_MODULE_HEADER,
-	"pimple",
-	NULL,
-	PHP_MINIT(pimple),
-	NULL,
-	NULL,
-	NULL,
-	PHP_MINFO(pimple),
-	PIMPLE_VERSION,
-	STANDARD_MODULE_PROPERTIES
-};
-
-#ifdef COMPILE_DL_PIMPLE
-ZEND_GET_MODULE(pimple)
-#endif
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/pimple_compat.h b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/pimple_compat.h
deleted file mode 100644
index d234e174..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/pimple_compat.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-/*
- * This file is part of Pimple.
- *
- * Copyright (c) 2014 Fabien Potencier
- *
- * 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.
- */
-
-#ifndef PIMPLE_COMPAT_H_
-#define PIMPLE_COMPAT_H_
-
-#include "Zend/zend_extensions.h" /* for ZEND_EXTENSION_API_NO */
-
-#define PHP_5_0_X_API_NO		220040412
-#define PHP_5_1_X_API_NO		220051025
-#define PHP_5_2_X_API_NO		220060519
-#define PHP_5_3_X_API_NO		220090626
-#define PHP_5_4_X_API_NO		220100525
-#define PHP_5_5_X_API_NO		220121212
-#define PHP_5_6_X_API_NO		220131226
-
-#define IS_PHP_56 ZEND_EXTENSION_API_NO == PHP_5_6_X_API_NO
-#define IS_AT_LEAST_PHP_56 ZEND_EXTENSION_API_NO >= PHP_5_6_X_API_NO
-
-#define IS_PHP_55 ZEND_EXTENSION_API_NO == PHP_5_5_X_API_NO
-#define IS_AT_LEAST_PHP_55 ZEND_EXTENSION_API_NO >= PHP_5_5_X_API_NO
-
-#define IS_PHP_54 ZEND_EXTENSION_API_NO == PHP_5_4_X_API_NO
-#define IS_AT_LEAST_PHP_54 ZEND_EXTENSION_API_NO >= PHP_5_4_X_API_NO
-
-#define IS_PHP_53 ZEND_EXTENSION_API_NO == PHP_5_3_X_API_NO
-#define IS_AT_LEAST_PHP_53 ZEND_EXTENSION_API_NO >= PHP_5_3_X_API_NO
-
-#if IS_PHP_53
-#define object_properties_init(obj, ce) do { \
-		 zend_hash_copy(obj->properties, &ce->default_properties, zval_copy_property_ctor(ce), NULL, sizeof(zval *)); \
-		} while (0);
-#endif
-
-#define ZEND_OBJ_INIT(obj, ce) do { \
-		zend_object_std_init(obj, ce TSRMLS_CC); \
-		object_properties_init((obj), (ce)); \
-	} while(0);
-
-#if IS_PHP_53 || IS_PHP_54
-static void zend_hash_get_current_key_zval_ex(const HashTable *ht, zval *key, HashPosition *pos) {
-    Bucket *p;
-
-    p = pos ? (*pos) : ht->pInternalPointer;
-
-    if (!p) {
-        Z_TYPE_P(key) = IS_NULL;
-    } else if (p->nKeyLength) {
-        Z_TYPE_P(key) = IS_STRING;
-        Z_STRVAL_P(key) = estrndup(p->arKey, p->nKeyLength - 1);
-        Z_STRLEN_P(key) = p->nKeyLength - 1;
-    } else {
-        Z_TYPE_P(key) = IS_LONG;
-        Z_LVAL_P(key) = p->h;
-    }
-}
-#endif
-
-#endif /* PIMPLE_COMPAT_H_ */
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/001.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/001.phpt
deleted file mode 100644
index 0809ea23..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/001.phpt
+++ /dev/null
@@ -1,45 +0,0 @@
---TEST--
-Test for read_dim/write_dim handlers
---SKIPIF--
-<?php if (!extension_loaded("pimple")) print "skip"; ?>
---FILE--
-<?php 
-$p = new Pimple\Container();
-$p[42] = 'foo';
-$p['foo'] = 42;
-
-echo $p[42];
-echo "\n";
-echo $p['foo'];
-echo "\n";
-try {
-	var_dump($p['nonexistant']);
-	echo "Exception excpected";
-} catch (InvalidArgumentException $e) { }
-
-$p[54.2] = 'foo2';
-echo $p[54];
-echo "\n";
-$p[242.99] = 'foo99';
-echo $p[242];
-
-echo "\n";
-
-$p[5] = 'bar';
-$p[5] = 'baz';
-echo $p[5];
-
-echo "\n";
-
-$p['str'] = 'str';
-$p['str'] = 'strstr';
-echo $p['str'];
-?>
-
---EXPECTF--
-foo
-42
-foo2
-foo99
-baz
-strstr
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/002.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/002.phpt
deleted file mode 100644
index 7b56d2c1..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/002.phpt
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--
-Test for constructor
---SKIPIF--
-<?php if (!extension_loaded("pimple")) print "skip"; ?>
---FILE--
-<?php 
-$p = new Pimple\Container();
-var_dump($p[42]);
-
-$p = new Pimple\Container(array(42=>'foo'));
-var_dump($p[42]);
-?>
---EXPECT--
-NULL
-string(3) "foo"
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/003.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/003.phpt
deleted file mode 100644
index a22cfa35..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/003.phpt
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-Test empty dimensions
---SKIPIF--
-<?php if (!extension_loaded("pimple")) print "skip"; ?>
---FILE--
-<?php 
-$p = new Pimple\Container();
-$p[] = 42;
-var_dump($p[0]);
-$p[41] = 'foo';
-$p[] = 'bar';
-var_dump($p[42]);
-?>
---EXPECT--
-int(42)
-string(3) "bar"
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/004.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/004.phpt
deleted file mode 100644
index 1e1d2513..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/004.phpt
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-Test has/unset dim handlers
---SKIPIF--
-<?php if (!extension_loaded("pimple")) print "skip"; ?>
---FILE--
-<?php 
-$p = new Pimple\Container();
-$p[] = 42;
-var_dump($p[0]);
-unset($p[0]);
-var_dump($p[0]);
-$p['foo'] = 'bar';
-var_dump(isset($p['foo']));
-unset($p['foo']);
-try {
-	var_dump($p['foo']);
-	echo "Excpected exception";
-} catch (InvalidArgumentException $e) { }
-var_dump(isset($p['bar']));
-$p['bar'] = NULL;
-var_dump(isset($p['bar']));
-var_dump(empty($p['bar']));
-?>
---EXPECT--
-int(42)
-NULL
-bool(true)
-bool(false)
-bool(true)
-bool(true)
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/005.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/005.phpt
deleted file mode 100644
index 0479ee05..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/005.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-Test simple class inheritance
---SKIPIF--
-<?php if (!extension_loaded("pimple")) print "skip"; ?>
---FILE--
-<?php 
-class MyPimple extends Pimple\Container
-{
-	public $someAttr = 'fooAttr';
-
-    public function offsetget($o)
-    {
-        var_dump("hit");
-        return parent::offsetget($o);
-    }
-}
-
-$p = new MyPimple;
-$p[42] = 'foo';
-echo $p[42];
-echo "\n";
-echo $p->someAttr;
-?>
---EXPECT--
-string(3) "hit"
-foo
-fooAttr
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/006.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/006.phpt
deleted file mode 100644
index cfe8a119..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/006.phpt
+++ /dev/null
@@ -1,51 +0,0 @@
---TEST--
-Test complex class inheritance
---SKIPIF--
-<?php if (!extension_loaded("pimple")) print "skip"; ?>
---FILE--
-<?php 
-class MyPimple extends Pimple\Container
-{
-    public function offsetget($o)
-    {
-        var_dump("hit offsetget in " . __CLASS__);
-        return parent::offsetget($o);
-    }
-}
-
-class TestPimple extends MyPimple
-{
-    public function __construct($values)
-    {
-        array_shift($values);
-        parent::__construct($values);
-    }
-    
-    public function offsetget($o)
-    {
-        var_dump('hit offsetget in ' . __CLASS__);
-        return parent::offsetget($o);
-    }
-    
-    public function offsetset($o, $v)
-    {
-        var_dump('hit offsetset');
-        return parent::offsetset($o, $v);
-    }
-}
-
-$defaultValues = array('foo' => 'bar', 88 => 'baz');
-
-$p = new TestPimple($defaultValues);
-$p[42] = 'foo';
-var_dump($p[42]);
-var_dump($p[0]);
-?>
---EXPECT--
-string(13) "hit offsetset"
-string(27) "hit offsetget in TestPimple"
-string(25) "hit offsetget in MyPimple"
-string(3) "foo"
-string(27) "hit offsetget in TestPimple"
-string(25) "hit offsetget in MyPimple"
-string(3) "baz"
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/007.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/007.phpt
deleted file mode 100644
index 5aac6838..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/007.phpt
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-Test for read_dim/write_dim handlers
---SKIPIF--
-<?php if (!extension_loaded("pimple")) print "skip"; ?>
---FILE--
-<?php 
-$p = new Pimple\Container();
-$p[42] = 'foo';
-$p['foo'] = 42;
-
-echo $p[42];
-echo "\n";
-echo $p['foo'];
-echo "\n";
-try {
-	var_dump($p['nonexistant']);
-	echo "Exception excpected";
-} catch (InvalidArgumentException $e) { }
-?>
---EXPECTF--
-foo
-42
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/008.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/008.phpt
deleted file mode 100644
index db7eeec4..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/008.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-Test frozen services
---SKIPIF--
-<?php if (!extension_loaded("pimple")) print "skip"; ?>
---FILE--
-<?php 
-$p = new Pimple\Container();
-$p[42] = 'foo';
-$p[42] = 'bar';
-
-$p['foo'] = function () { };
-$p['foo'] = function () { };
-
-$a = $p['foo'];
-
-try {
-	$p['foo'] = function () { };
-	echo "Exception excpected";
-} catch (RuntimeException $e) { }
-
-$p[42] = function() { };
-$a = $p[42];
-
-try {
-	$p[42] = function () { };
-	echo "Exception excpected";
-} catch (RuntimeException $e) { }
-?>
---EXPECTF--
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/009.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/009.phpt
deleted file mode 100644
index bb05ea29..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/009.phpt
+++ /dev/null
@@ -1,13 +0,0 @@
---TEST--
-Test service is called as callback, and only once
---SKIPIF--
-<?php if (!extension_loaded("pimple")) print "skip"; ?>
---FILE--
-<?php 
-$p = new Pimple\Container();
-$p['foo'] = function($arg) use ($p) { var_dump($p === $arg); };
-$a = $p['foo'];
-$b = $p['foo']; /* should return not calling the callback */
-?>
---EXPECTF--
-bool(true)
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/010.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/010.phpt
deleted file mode 100644
index badce014..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/010.phpt
+++ /dev/null
@@ -1,45 +0,0 @@
---TEST--
-Test service is called as callback for every callback type
---SKIPIF--
-<?php if (!extension_loaded("pimple")) print "skip"; ?>
---FILE--
-<?php
-function callme()
-{
-    return 'called';
-}
-
-$a = function() { return 'called'; };
-
-class Foo
-{
-    public static function bar()
-    {
-        return 'called';
-    }
-}
- 
-$p = new Pimple\Container();
-$p['foo'] = 'callme';
-echo $p['foo'] . "\n";
-
-$p['bar'] = $a;
-echo $p['bar'] . "\n";
-
-$p['baz'] = "Foo::bar";
-echo $p['baz'] . "\n";
-
-$p['foobar'] = array('Foo', 'bar');
-var_dump($p['foobar']);
-
-?>
---EXPECTF--
-callme
-called
-Foo::bar
-array(2) {
-  [0]=>
-  string(3) "Foo"
-  [1]=>
-  string(3) "bar"
-}
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/011.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/011.phpt
deleted file mode 100644
index 6682ab8e..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/011.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-Test service callback throwing an exception
---SKIPIF--
-<?php if (!extension_loaded("pimple")) print "skip"; ?>
---FILE--
-<?php
-class CallBackException extends RuntimeException { }
-
-$p = new Pimple\Container();
-$p['foo'] = function () { throw new CallBackException; };
-try {
-	echo $p['foo'] . "\n";
-	echo "should not come here";
-} catch (CallBackException $e) {
-	echo "all right!";
-}
-?>
---EXPECTF--
-all right!
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/012.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/012.phpt
deleted file mode 100644
index 4c6ac486..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/012.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-Test service factory
---SKIPIF--
-<?php if (!extension_loaded("pimple")) print "skip"; ?>
---FILE--
-<?php
-
-$p = new Pimple\Container();
-
-$p->factory($f = function() { var_dump('called-1'); return 'ret-1';});
-
-$p[] = $f;
-
-$p[] = function () { var_dump('called-2'); return 'ret-2'; };
-
-var_dump($p[0]);
-var_dump($p[0]);
-var_dump($p[1]);
-var_dump($p[1]);
-?>
---EXPECTF--
-string(8) "called-1"
-string(5) "ret-1"
-string(8) "called-1"
-string(5) "ret-1"
-string(8) "called-2"
-string(5) "ret-2"
-string(5) "ret-2"
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/013.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/013.phpt
deleted file mode 100644
index f419958c..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/013.phpt
+++ /dev/null
@@ -1,33 +0,0 @@
---TEST--
-Test keys()
---SKIPIF--
-<?php if (!extension_loaded("pimple")) print "skip"; ?>
---FILE--
-<?php
-
-$p = new Pimple\Container();
-
-var_dump($p->keys());
-
-$p['foo'] = 'bar';
-$p[] = 'foo';
-
-var_dump($p->keys());
-
-unset($p['foo']);
-
-var_dump($p->keys());
-?>
---EXPECTF--
-array(0) {
-}
-array(2) {
-  [0]=>
-  string(3) "foo"
-  [1]=>
-  int(0)
-}
-array(1) {
-  [0]=>
-  int(0)
-}
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/014.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/014.phpt
deleted file mode 100644
index ac937213..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/014.phpt
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-Test raw()
---SKIPIF--
-<?php if (!extension_loaded("pimple")) print "skip"; ?>
---FILE--
-<?php
-
-$p = new Pimple\Container();
-$f = function () { var_dump('called-2'); return 'ret-2'; };
-
-$p['foo'] = $f;
-$p[42]    = $f;
-
-var_dump($p['foo']);
-var_dump($p->raw('foo'));
-var_dump($p[42]);
-
-unset($p['foo']);
-
-try {
-	$p->raw('foo');
-	echo "expected exception";
-} catch (InvalidArgumentException $e) { }
---EXPECTF--
-string(8) "called-2"
-string(5) "ret-2"
-object(Closure)#%i (0) {
-}
-string(8) "called-2"
-string(5) "ret-2"
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/015.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/015.phpt
deleted file mode 100644
index 314f008a..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/015.phpt
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-Test protect()
---SKIPIF--
-<?php if (!extension_loaded("pimple")) print "skip"; ?>
---FILE--
-<?php
-
-$p = new Pimple\Container();
-$f = function () { return 'foo'; };
-$p['foo'] = $f;
-
-$p->protect($f);
-
-var_dump($p['foo']);
---EXPECTF--
-object(Closure)#%i (0) {
-}
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/016.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/016.phpt
deleted file mode 100644
index e55edb0a..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/016.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-Test extend()
---SKIPIF--
-<?php if (!extension_loaded("pimple")) print "skip"; ?>
---FILE--
-<?php
-/*
- This is part of Pimple::extend() code :
-
-          $extended = function ($c) use ($callable, $factory) {
-             return $callable($factory($c), $c);
-          };
-*/
-
-$p = new Pimple\Container();
-$p[12] = function ($v) { var_dump($v); return 'foo';}; /* $factory in code above */
-
-$c = $p->extend(12, function ($w) { var_dump($w); return 'bar'; }); /* $callable in code above */
-
-var_dump($c('param'));
---EXPECTF--
-string(5) "param"
-string(3) "foo"
-string(3) "bar"
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/017.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/017.phpt
deleted file mode 100644
index bac23ce0..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/017.phpt
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-Test extend() with exception in service extension
---SKIPIF--
-<?php if (!extension_loaded("pimple")) print "skip"; ?>
---FILE--
-<?php
-
-$p = new Pimple\Container();
-$p[12] = function ($v) { return 'foo';};
-
-$c = $p->extend(12, function ($w) { throw new BadMethodCallException; });
-
-try {
-	$p[12];
-	echo "Exception expected";
-} catch (BadMethodCallException $e) { }
---EXPECTF--
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/017_1.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/017_1.phpt
deleted file mode 100644
index 8f881d6e..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/017_1.phpt
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-Test extend() with exception in service factory
---SKIPIF--
-<?php if (!extension_loaded("pimple")) print "skip"; ?>
---FILE--
-<?php
-
-$p = new Pimple\Container();
-$p[12] = function ($v) { throw new BadMethodCallException; };
-
-$c = $p->extend(12, function ($w) { return 'foobar'; });
-
-try {
-	$p[12];
-	echo "Exception expected";
-} catch (BadMethodCallException $e) { }
---EXPECTF--
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/018.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/018.phpt
deleted file mode 100644
index 27c12a14..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/018.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-Test register()
---SKIPIF--
-<?php if (!extension_loaded("pimple")) print "skip"; ?>
---FILE--
-<?php
-
-class Foo implements Pimple\ServiceProviderInterface
-{
-    public function register(Pimple\Container $p)
-    {
-        var_dump($p);
-    }
-}
-
-$p = new Pimple\Container();
-$p->register(new Foo, array(42 => 'bar'));
-
-var_dump($p[42]);
---EXPECTF--
-object(Pimple\Container)#1 (0) {
-}
-string(3) "bar"
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/019.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/019.phpt
deleted file mode 100644
index 28a9aeca..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/019.phpt
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-Test register() returns static and is a fluent interface
---SKIPIF--
-<?php if (!extension_loaded("pimple")) print "skip"; ?>
---FILE--
-<?php
-
-class Foo implements Pimple\ServiceProviderInterface
-{
-    public function register(Pimple\Container $p)
-    {
-    }
-}
-
-$p = new Pimple\Container();
-var_dump($p === $p->register(new Foo));
---EXPECTF--
-bool(true)
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/bench.phpb b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/bench.phpb
deleted file mode 100644
index 8f983e65..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/bench.phpb
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-if (!class_exists('Pimple\Container')) {
-    require_once __DIR__ . '/../../../src/Pimple/Container.php';
-} else {
-    echo "pimple-c extension detected, using...\n\n";
-}
-
-$time = microtime(true);
-
-function foo() { }
-$factory = function () { };
-
-for ($i=0; $i<10000; $i++) {
-
-$p = new Pimple\Container;
-
-$p['foo'] = 'bar';
-
-if (!isset($p[3])) {
-    $p[3] = $p['foo'];
-    $p[]  = 'bar';
-}
-
-$p[2] = 42;
-
-if (isset($p[2])) {
-	unset($p[2]);
-}
-
-$p[42] = $p['foo'];
-
-$p['cb'] = function($arg) { };
-
-$p[] = $p['cb'];
-
-echo $p['cb'];
-echo $p['cb'];
-echo $p['cb'];
-
-//$p->factory($factory);
-
-$p['factory'] = $factory;
-
-echo $p['factory'];
-echo $p['factory'];
-echo $p['factory'];
-
-}
-
-echo microtime(true)  - $time;
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/bench_shared.phpb b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/bench_shared.phpb
deleted file mode 100644
index aec541f0..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/bench_shared.phpb
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-if (!class_exists('Pimple\Container')) {
-    require_once __DIR__ . '/../../../src/Pimple/Container.php';
-} else {
-    echo "pimple-c extension detected, using...\n\n";
-}
-
-$time = microtime(true);
-
-
-$service = function ($arg) { return "I'm a service"; };
-
-for ($i=0; $i<10000; $i++) {
-
-$p = new Pimple\Container;
-$p['my_service'] = $service;
-
-$a = $p['my_service'];
-$b = $p['my_service'];
-
-}
-
-echo microtime(true) - $time;
-?>
diff --git a/advancedcontentfilter/vendor/pimple/pimple/phpunit.xml.dist b/advancedcontentfilter/vendor/pimple/pimple/phpunit.xml.dist
deleted file mode 100644
index 5c8d487f..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/phpunit.xml.dist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <testsuites>
-        <testsuite name="Pimple Test Suite">
-            <directory>./src/Pimple/Tests</directory>
-        </testsuite>
-    </testsuites>
-</phpunit>
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Container.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Container.php
deleted file mode 100644
index 707b92b8..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Container.php
+++ /dev/null
@@ -1,298 +0,0 @@
-<?php
-
-/*
- * This file is part of Pimple.
- *
- * Copyright (c) 2009 Fabien Potencier
- *
- * 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.
- */
-
-namespace Pimple;
-
-use Pimple\Exception\ExpectedInvokableException;
-use Pimple\Exception\FrozenServiceException;
-use Pimple\Exception\InvalidServiceIdentifierException;
-use Pimple\Exception\UnknownIdentifierException;
-
-/**
- * Container main class.
- *
- * @author Fabien Potencier
- */
-class Container implements \ArrayAccess
-{
-    private $values = array();
-    private $factories;
-    private $protected;
-    private $frozen = array();
-    private $raw = array();
-    private $keys = array();
-
-    /**
-     * Instantiates the container.
-     *
-     * Objects and parameters can be passed as argument to the constructor.
-     *
-     * @param array $values The parameters or objects
-     */
-    public function __construct(array $values = array())
-    {
-        $this->factories = new \SplObjectStorage();
-        $this->protected = new \SplObjectStorage();
-
-        foreach ($values as $key => $value) {
-            $this->offsetSet($key, $value);
-        }
-    }
-
-    /**
-     * Sets a parameter or an object.
-     *
-     * Objects must be defined as Closures.
-     *
-     * Allowing any PHP callable leads to difficult to debug problems
-     * as function names (strings) are callable (creating a function with
-     * the same name as an existing parameter would break your container).
-     *
-     * @param string $id    The unique identifier for the parameter or object
-     * @param mixed  $value The value of the parameter or a closure to define an object
-     *
-     * @throws FrozenServiceException Prevent override of a frozen service
-     */
-    public function offsetSet($id, $value)
-    {
-        if (isset($this->frozen[$id])) {
-            throw new FrozenServiceException($id);
-        }
-
-        $this->values[$id] = $value;
-        $this->keys[$id] = true;
-    }
-
-    /**
-     * Gets a parameter or an object.
-     *
-     * @param string $id The unique identifier for the parameter or object
-     *
-     * @return mixed The value of the parameter or an object
-     *
-     * @throws UnknownIdentifierException If the identifier is not defined
-     */
-    public function offsetGet($id)
-    {
-        if (!isset($this->keys[$id])) {
-            throw new UnknownIdentifierException($id);
-        }
-
-        if (
-            isset($this->raw[$id])
-            || !\is_object($this->values[$id])
-            || isset($this->protected[$this->values[$id]])
-            || !\method_exists($this->values[$id], '__invoke')
-        ) {
-            return $this->values[$id];
-        }
-
-        if (isset($this->factories[$this->values[$id]])) {
-            return $this->values[$id]($this);
-        }
-
-        $raw = $this->values[$id];
-        $val = $this->values[$id] = $raw($this);
-        $this->raw[$id] = $raw;
-
-        $this->frozen[$id] = true;
-
-        return $val;
-    }
-
-    /**
-     * Checks if a parameter or an object is set.
-     *
-     * @param string $id The unique identifier for the parameter or object
-     *
-     * @return bool
-     */
-    public function offsetExists($id)
-    {
-        return isset($this->keys[$id]);
-    }
-
-    /**
-     * Unsets a parameter or an object.
-     *
-     * @param string $id The unique identifier for the parameter or object
-     */
-    public function offsetUnset($id)
-    {
-        if (isset($this->keys[$id])) {
-            if (\is_object($this->values[$id])) {
-                unset($this->factories[$this->values[$id]], $this->protected[$this->values[$id]]);
-            }
-
-            unset($this->values[$id], $this->frozen[$id], $this->raw[$id], $this->keys[$id]);
-        }
-    }
-
-    /**
-     * Marks a callable as being a factory service.
-     *
-     * @param callable $callable A service definition to be used as a factory
-     *
-     * @return callable The passed callable
-     *
-     * @throws ExpectedInvokableException Service definition has to be a closure or an invokable object
-     */
-    public function factory($callable)
-    {
-        if (!\method_exists($callable, '__invoke')) {
-            throw new ExpectedInvokableException('Service definition is not a Closure or invokable object.');
-        }
-
-        $this->factories->attach($callable);
-
-        return $callable;
-    }
-
-    /**
-     * Protects a callable from being interpreted as a service.
-     *
-     * This is useful when you want to store a callable as a parameter.
-     *
-     * @param callable $callable A callable to protect from being evaluated
-     *
-     * @return callable The passed callable
-     *
-     * @throws ExpectedInvokableException Service definition has to be a closure or an invokable object
-     */
-    public function protect($callable)
-    {
-        if (!\method_exists($callable, '__invoke')) {
-            throw new ExpectedInvokableException('Callable is not a Closure or invokable object.');
-        }
-
-        $this->protected->attach($callable);
-
-        return $callable;
-    }
-
-    /**
-     * Gets a parameter or the closure defining an object.
-     *
-     * @param string $id The unique identifier for the parameter or object
-     *
-     * @return mixed The value of the parameter or the closure defining an object
-     *
-     * @throws UnknownIdentifierException If the identifier is not defined
-     */
-    public function raw($id)
-    {
-        if (!isset($this->keys[$id])) {
-            throw new UnknownIdentifierException($id);
-        }
-
-        if (isset($this->raw[$id])) {
-            return $this->raw[$id];
-        }
-
-        return $this->values[$id];
-    }
-
-    /**
-     * Extends an object definition.
-     *
-     * Useful when you want to extend an existing object definition,
-     * without necessarily loading that object.
-     *
-     * @param string   $id       The unique identifier for the object
-     * @param callable $callable A service definition to extend the original
-     *
-     * @return callable The wrapped callable
-     *
-     * @throws UnknownIdentifierException        If the identifier is not defined
-     * @throws FrozenServiceException            If the service is frozen
-     * @throws InvalidServiceIdentifierException If the identifier belongs to a parameter
-     * @throws ExpectedInvokableException        If the extension callable is not a closure or an invokable object
-     */
-    public function extend($id, $callable)
-    {
-        if (!isset($this->keys[$id])) {
-            throw new UnknownIdentifierException($id);
-        }
-
-        if (isset($this->frozen[$id])) {
-            throw new FrozenServiceException($id);
-        }
-
-        if (!\is_object($this->values[$id]) || !\method_exists($this->values[$id], '__invoke')) {
-            throw new InvalidServiceIdentifierException($id);
-        }
-
-        if (isset($this->protected[$this->values[$id]])) {
-            @\trigger_error(\sprintf('How Pimple behaves when extending protected closures will be fixed in Pimple 4. Are you sure "%s" should be protected?', $id), \E_USER_DEPRECATED);
-        }
-
-        if (!\is_object($callable) || !\method_exists($callable, '__invoke')) {
-            throw new ExpectedInvokableException('Extension service definition is not a Closure or invokable object.');
-        }
-
-        $factory = $this->values[$id];
-
-        $extended = function ($c) use ($callable, $factory) {
-            return $callable($factory($c), $c);
-        };
-
-        if (isset($this->factories[$factory])) {
-            $this->factories->detach($factory);
-            $this->factories->attach($extended);
-        }
-
-        return $this[$id] = $extended;
-    }
-
-    /**
-     * Returns all defined value names.
-     *
-     * @return array An array of value names
-     */
-    public function keys()
-    {
-        return \array_keys($this->values);
-    }
-
-    /**
-     * Registers a service provider.
-     *
-     * @param ServiceProviderInterface $provider A ServiceProviderInterface instance
-     * @param array                    $values   An array of values that customizes the provider
-     *
-     * @return static
-     */
-    public function register(ServiceProviderInterface $provider, array $values = array())
-    {
-        $provider->register($this);
-
-        foreach ($values as $key => $value) {
-            $this[$key] = $value;
-        }
-
-        return $this;
-    }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/ExpectedInvokableException.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/ExpectedInvokableException.php
deleted file mode 100644
index 7228421b..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/ExpectedInvokableException.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/*
- * This file is part of Pimple.
- *
- * Copyright (c) 2009 Fabien Potencier
- *
- * 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.
- */
-
-namespace Pimple\Exception;
-
-use Psr\Container\ContainerExceptionInterface;
-
-/**
- * A closure or invokable object was expected.
- *
- * @author Pascal Luna <skalpa@zetareticuli.org>
- */
-class ExpectedInvokableException extends \InvalidArgumentException implements ContainerExceptionInterface
-{
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/FrozenServiceException.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/FrozenServiceException.php
deleted file mode 100644
index e4d2f6d3..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/FrozenServiceException.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/*
- * This file is part of Pimple.
- *
- * Copyright (c) 2009 Fabien Potencier
- *
- * 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.
- */
-
-namespace Pimple\Exception;
-
-use Psr\Container\ContainerExceptionInterface;
-
-/**
- * An attempt to modify a frozen service was made.
- *
- * @author Pascal Luna <skalpa@zetareticuli.org>
- */
-class FrozenServiceException extends \RuntimeException implements ContainerExceptionInterface
-{
-    /**
-     * @param string $id Identifier of the frozen service
-     */
-    public function __construct($id)
-    {
-        parent::__construct(\sprintf('Cannot override frozen service "%s".', $id));
-    }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/InvalidServiceIdentifierException.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/InvalidServiceIdentifierException.php
deleted file mode 100644
index 91e82f98..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/InvalidServiceIdentifierException.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/*
- * This file is part of Pimple.
- *
- * Copyright (c) 2009 Fabien Potencier
- *
- * 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.
- */
-
-namespace Pimple\Exception;
-
-use Psr\Container\NotFoundExceptionInterface;
-
-/**
- * An attempt to perform an operation that requires a service identifier was made.
- *
- * @author Pascal Luna <skalpa@zetareticuli.org>
- */
-class InvalidServiceIdentifierException extends \InvalidArgumentException implements NotFoundExceptionInterface
-{
-    /**
-     * @param string $id The invalid identifier
-     */
-    public function __construct($id)
-    {
-        parent::__construct(\sprintf('Identifier "%s" does not contain an object definition.', $id));
-    }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/UnknownIdentifierException.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/UnknownIdentifierException.php
deleted file mode 100644
index fb6b626e..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/UnknownIdentifierException.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/*
- * This file is part of Pimple.
- *
- * Copyright (c) 2009 Fabien Potencier
- *
- * 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.
- */
-
-namespace Pimple\Exception;
-
-use Psr\Container\NotFoundExceptionInterface;
-
-/**
- * The identifier of a valid service or parameter was expected.
- *
- * @author Pascal Luna <skalpa@zetareticuli.org>
- */
-class UnknownIdentifierException extends \InvalidArgumentException implements NotFoundExceptionInterface
-{
-    /**
-     * @param string $id The unknown identifier
-     */
-    public function __construct($id)
-    {
-        parent::__construct(\sprintf('Identifier "%s" is not defined.', $id));
-    }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Psr11/Container.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Psr11/Container.php
deleted file mode 100644
index cadbfffa..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Psr11/Container.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/*
- * This file is part of Pimple.
- *
- * Copyright (c) 2009-2017 Fabien Potencier
- *
- * 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.
- */
-
-namespace Pimple\Psr11;
-
-use Pimple\Container as PimpleContainer;
-use Psr\Container\ContainerInterface;
-
-/**
- * PSR-11 compliant wrapper.
- *
- * @author Pascal Luna <skalpa@zetareticuli.org>
- */
-final class Container implements ContainerInterface
-{
-    private $pimple;
-
-    public function __construct(PimpleContainer $pimple)
-    {
-        $this->pimple = $pimple;
-    }
-
-    public function get($id)
-    {
-        return $this->pimple[$id];
-    }
-
-    public function has($id)
-    {
-        return isset($this->pimple[$id]);
-    }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php
deleted file mode 100644
index 3361c6f1..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/*
- * This file is part of Pimple.
- *
- * Copyright (c) 2009 Fabien Potencier
- *
- * 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.
- */
-
-namespace Pimple\Psr11;
-
-use Pimple\Container as PimpleContainer;
-use Pimple\Exception\UnknownIdentifierException;
-use Psr\Container\ContainerInterface;
-
-/**
- * Pimple PSR-11 service locator.
- *
- * @author Pascal Luna <skalpa@zetareticuli.org>
- */
-class ServiceLocator implements ContainerInterface
-{
-    private $container;
-    private $aliases = array();
-
-    /**
-     * @param PimpleContainer $container The Container instance used to locate services
-     * @param array           $ids       Array of service ids that can be located. String keys can be used to define aliases
-     */
-    public function __construct(PimpleContainer $container, array $ids)
-    {
-        $this->container = $container;
-
-        foreach ($ids as $key => $id) {
-            $this->aliases[\is_int($key) ? $id : $key] = $id;
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function get($id)
-    {
-        if (!isset($this->aliases[$id])) {
-            throw new UnknownIdentifierException($id);
-        }
-
-        return $this->container[$this->aliases[$id]];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function has($id)
-    {
-        return isset($this->aliases[$id]) && isset($this->container[$this->aliases[$id]]);
-    }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/ServiceIterator.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/ServiceIterator.php
deleted file mode 100644
index 5cde5188..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/ServiceIterator.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/*
- * This file is part of Pimple.
- *
- * Copyright (c) 2009 Fabien Potencier
- *
- * 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.
- */
-
-namespace Pimple;
-
-/**
- * Lazy service iterator.
- *
- * @author Pascal Luna <skalpa@zetareticuli.org>
- */
-final class ServiceIterator implements \Iterator
-{
-    private $container;
-    private $ids;
-
-    public function __construct(Container $container, array $ids)
-    {
-        $this->container = $container;
-        $this->ids = $ids;
-    }
-
-    public function rewind()
-    {
-        \reset($this->ids);
-    }
-
-    public function current()
-    {
-        return $this->container[\current($this->ids)];
-    }
-
-    public function key()
-    {
-        return \current($this->ids);
-    }
-
-    public function next()
-    {
-        \next($this->ids);
-    }
-
-    public function valid()
-    {
-        return null !== \key($this->ids);
-    }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/ServiceProviderInterface.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/ServiceProviderInterface.php
deleted file mode 100644
index c004594b..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/ServiceProviderInterface.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/*
- * This file is part of Pimple.
- *
- * Copyright (c) 2009 Fabien Potencier
- *
- * 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.
- */
-
-namespace Pimple;
-
-/**
- * Pimple service provider interface.
- *
- * @author  Fabien Potencier
- * @author  Dominik Zogg
- */
-interface ServiceProviderInterface
-{
-    /**
-     * Registers services on the given container.
-     *
-     * This method should only be used to configure services and parameters.
-     * It should not get services.
-     *
-     * @param Container $pimple A container instance
-     */
-    public function register(Container $pimple);
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/Invokable.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/Invokable.php
deleted file mode 100644
index aba453bf..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/Invokable.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/*
- * This file is part of Pimple.
- *
- * Copyright (c) 2009 Fabien Potencier
- *
- * 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.
- */
-
-namespace Pimple\Tests\Fixtures;
-
-class Invokable
-{
-    public function __invoke($value = null)
-    {
-        $service = new Service();
-        $service->value = $value;
-
-        return $service;
-    }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/NonInvokable.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/NonInvokable.php
deleted file mode 100644
index 33cd4e54..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/NonInvokable.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of Pimple.
- *
- * Copyright (c) 2009 Fabien Potencier
- *
- * 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.
- */
-
-namespace Pimple\Tests\Fixtures;
-
-class NonInvokable
-{
-    public function __call($a, $b)
-    {
-    }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/PimpleServiceProvider.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/PimpleServiceProvider.php
deleted file mode 100644
index 0c910af7..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/PimpleServiceProvider.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/*
- * This file is part of Pimple.
- *
- * Copyright (c) 2009 Fabien Potencier
- *
- * 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.
- */
-
-namespace Pimple\Tests\Fixtures;
-
-use Pimple\Container;
-use Pimple\ServiceProviderInterface;
-
-class PimpleServiceProvider implements ServiceProviderInterface
-{
-    /**
-     * Registers services on the given container.
-     *
-     * This method should only be used to configure services and parameters.
-     * It should not get services.
-     *
-     * @param Container $pimple An Container instance
-     */
-    public function register(Container $pimple)
-    {
-        $pimple['param'] = 'value';
-
-        $pimple['service'] = function () {
-            return new Service();
-        };
-
-        $pimple['factory'] = $pimple->factory(function () {
-            return new Service();
-        });
-    }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/Service.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/Service.php
deleted file mode 100644
index d71b184d..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/Service.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/*
- * This file is part of Pimple.
- *
- * Copyright (c) 2009 Fabien Potencier
- *
- * 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.
- */
-
-namespace Pimple\Tests\Fixtures;
-
-/**
- * @author  Igor Wiedler <igor@wiedler.ch>
- */
-class Service
-{
-    public $value;
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/PimpleServiceProviderInterfaceTest.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/PimpleServiceProviderInterfaceTest.php
deleted file mode 100644
index 8e5c4c73..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/PimpleServiceProviderInterfaceTest.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/*
- * This file is part of Pimple.
- *
- * Copyright (c) 2009 Fabien Potencier
- *
- * 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.
- */
-
-namespace Pimple\Tests;
-
-use Pimple\Container;
-
-/**
- * @author  Dominik Zogg <dominik.zogg@gmail.com>
- */
-class PimpleServiceProviderInterfaceTest extends \PHPUnit_Framework_TestCase
-{
-    public function testProvider()
-    {
-        $pimple = new Container();
-
-        $pimpleServiceProvider = new Fixtures\PimpleServiceProvider();
-        $pimpleServiceProvider->register($pimple);
-
-        $this->assertEquals('value', $pimple['param']);
-        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $pimple['service']);
-
-        $serviceOne = $pimple['factory'];
-        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceOne);
-
-        $serviceTwo = $pimple['factory'];
-        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceTwo);
-
-        $this->assertNotSame($serviceOne, $serviceTwo);
-    }
-
-    public function testProviderWithRegisterMethod()
-    {
-        $pimple = new Container();
-
-        $pimple->register(new Fixtures\PimpleServiceProvider(), array(
-            'anotherParameter' => 'anotherValue',
-        ));
-
-        $this->assertEquals('value', $pimple['param']);
-        $this->assertEquals('anotherValue', $pimple['anotherParameter']);
-
-        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $pimple['service']);
-
-        $serviceOne = $pimple['factory'];
-        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceOne);
-
-        $serviceTwo = $pimple['factory'];
-        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceTwo);
-
-        $this->assertNotSame($serviceOne, $serviceTwo);
-    }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/PimpleTest.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/PimpleTest.php
deleted file mode 100644
index acb66e00..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/PimpleTest.php
+++ /dev/null
@@ -1,589 +0,0 @@
-<?php
-
-/*
- * This file is part of Pimple.
- *
- * Copyright (c) 2009 Fabien Potencier
- *
- * 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.
- */
-
-namespace Pimple\Tests;
-
-use Pimple\Container;
-
-/**
- * @author Igor Wiedler <igor@wiedler.ch>
- */
-class PimpleTest extends \PHPUnit_Framework_TestCase
-{
-    public function testWithString()
-    {
-        $pimple = new Container();
-        $pimple['param'] = 'value';
-
-        $this->assertEquals('value', $pimple['param']);
-    }
-
-    public function testWithClosure()
-    {
-        $pimple = new Container();
-        $pimple['service'] = function () {
-            return new Fixtures\Service();
-        };
-
-        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $pimple['service']);
-    }
-
-    public function testServicesShouldBeDifferent()
-    {
-        $pimple = new Container();
-        $pimple['service'] = $pimple->factory(function () {
-            return new Fixtures\Service();
-        });
-
-        $serviceOne = $pimple['service'];
-        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceOne);
-
-        $serviceTwo = $pimple['service'];
-        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceTwo);
-
-        $this->assertNotSame($serviceOne, $serviceTwo);
-    }
-
-    public function testShouldPassContainerAsParameter()
-    {
-        $pimple = new Container();
-        $pimple['service'] = function () {
-            return new Fixtures\Service();
-        };
-        $pimple['container'] = function ($container) {
-            return $container;
-        };
-
-        $this->assertNotSame($pimple, $pimple['service']);
-        $this->assertSame($pimple, $pimple['container']);
-    }
-
-    public function testIsset()
-    {
-        $pimple = new Container();
-        $pimple['param'] = 'value';
-        $pimple['service'] = function () {
-            return new Fixtures\Service();
-        };
-
-        $pimple['null'] = null;
-
-        $this->assertTrue(isset($pimple['param']));
-        $this->assertTrue(isset($pimple['service']));
-        $this->assertTrue(isset($pimple['null']));
-        $this->assertFalse(isset($pimple['non_existent']));
-    }
-
-    public function testConstructorInjection()
-    {
-        $params = array('param' => 'value');
-        $pimple = new Container($params);
-
-        $this->assertSame($params['param'], $pimple['param']);
-    }
-
-    /**
-     * @expectedException \Pimple\Exception\UnknownIdentifierException
-     * @expectedExceptionMessage Identifier "foo" is not defined.
-     */
-    public function testOffsetGetValidatesKeyIsPresent()
-    {
-        $pimple = new Container();
-        echo $pimple['foo'];
-    }
-
-    /**
-     * @group legacy
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Identifier "foo" is not defined.
-     */
-    public function testLegacyOffsetGetValidatesKeyIsPresent()
-    {
-        $pimple = new Container();
-        echo $pimple['foo'];
-    }
-
-    public function testOffsetGetHonorsNullValues()
-    {
-        $pimple = new Container();
-        $pimple['foo'] = null;
-        $this->assertNull($pimple['foo']);
-    }
-
-    public function testUnset()
-    {
-        $pimple = new Container();
-        $pimple['param'] = 'value';
-        $pimple['service'] = function () {
-            return new Fixtures\Service();
-        };
-
-        unset($pimple['param'], $pimple['service']);
-        $this->assertFalse(isset($pimple['param']));
-        $this->assertFalse(isset($pimple['service']));
-    }
-
-    /**
-     * @dataProvider serviceDefinitionProvider
-     */
-    public function testShare($service)
-    {
-        $pimple = new Container();
-        $pimple['shared_service'] = $service;
-
-        $serviceOne = $pimple['shared_service'];
-        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceOne);
-
-        $serviceTwo = $pimple['shared_service'];
-        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceTwo);
-
-        $this->assertSame($serviceOne, $serviceTwo);
-    }
-
-    /**
-     * @dataProvider serviceDefinitionProvider
-     */
-    public function testProtect($service)
-    {
-        $pimple = new Container();
-        $pimple['protected'] = $pimple->protect($service);
-
-        $this->assertSame($service, $pimple['protected']);
-    }
-
-    public function testGlobalFunctionNameAsParameterValue()
-    {
-        $pimple = new Container();
-        $pimple['global_function'] = 'strlen';
-        $this->assertSame('strlen', $pimple['global_function']);
-    }
-
-    public function testRaw()
-    {
-        $pimple = new Container();
-        $pimple['service'] = $definition = $pimple->factory(function () { return 'foo'; });
-        $this->assertSame($definition, $pimple->raw('service'));
-    }
-
-    public function testRawHonorsNullValues()
-    {
-        $pimple = new Container();
-        $pimple['foo'] = null;
-        $this->assertNull($pimple->raw('foo'));
-    }
-
-    public function testFluentRegister()
-    {
-        $pimple = new Container();
-        $this->assertSame($pimple, $pimple->register($this->getMockBuilder('Pimple\ServiceProviderInterface')->getMock()));
-    }
-
-    /**
-     * @expectedException \Pimple\Exception\UnknownIdentifierException
-     * @expectedExceptionMessage Identifier "foo" is not defined.
-     */
-    public function testRawValidatesKeyIsPresent()
-    {
-        $pimple = new Container();
-        $pimple->raw('foo');
-    }
-
-    /**
-     * @group legacy
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Identifier "foo" is not defined.
-     */
-    public function testLegacyRawValidatesKeyIsPresent()
-    {
-        $pimple = new Container();
-        $pimple->raw('foo');
-    }
-
-    /**
-     * @dataProvider serviceDefinitionProvider
-     */
-    public function testExtend($service)
-    {
-        $pimple = new Container();
-        $pimple['shared_service'] = function () {
-            return new Fixtures\Service();
-        };
-        $pimple['factory_service'] = $pimple->factory(function () {
-            return new Fixtures\Service();
-        });
-
-        $pimple->extend('shared_service', $service);
-        $serviceOne = $pimple['shared_service'];
-        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceOne);
-        $serviceTwo = $pimple['shared_service'];
-        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceTwo);
-        $this->assertSame($serviceOne, $serviceTwo);
-        $this->assertSame($serviceOne->value, $serviceTwo->value);
-
-        $pimple->extend('factory_service', $service);
-        $serviceOne = $pimple['factory_service'];
-        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceOne);
-        $serviceTwo = $pimple['factory_service'];
-        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceTwo);
-        $this->assertNotSame($serviceOne, $serviceTwo);
-        $this->assertNotSame($serviceOne->value, $serviceTwo->value);
-    }
-
-    public function testExtendDoesNotLeakWithFactories()
-    {
-        if (extension_loaded('pimple')) {
-            $this->markTestSkipped('Pimple extension does not support this test');
-        }
-        $pimple = new Container();
-
-        $pimple['foo'] = $pimple->factory(function () { return; });
-        $pimple['foo'] = $pimple->extend('foo', function ($foo, $pimple) { return; });
-        unset($pimple['foo']);
-
-        $p = new \ReflectionProperty($pimple, 'values');
-        $p->setAccessible(true);
-        $this->assertEmpty($p->getValue($pimple));
-
-        $p = new \ReflectionProperty($pimple, 'factories');
-        $p->setAccessible(true);
-        $this->assertCount(0, $p->getValue($pimple));
-    }
-
-    /**
-     * @expectedException \Pimple\Exception\UnknownIdentifierException
-     * @expectedExceptionMessage Identifier "foo" is not defined.
-     */
-    public function testExtendValidatesKeyIsPresent()
-    {
-        $pimple = new Container();
-        $pimple->extend('foo', function () {});
-    }
-
-    /**
-     * @group legacy
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Identifier "foo" is not defined.
-     */
-    public function testLegacyExtendValidatesKeyIsPresent()
-    {
-        $pimple = new Container();
-        $pimple->extend('foo', function () {});
-    }
-
-    public function testKeys()
-    {
-        $pimple = new Container();
-        $pimple['foo'] = 123;
-        $pimple['bar'] = 123;
-
-        $this->assertEquals(array('foo', 'bar'), $pimple->keys());
-    }
-
-    /** @test */
-    public function settingAnInvokableObjectShouldTreatItAsFactory()
-    {
-        $pimple = new Container();
-        $pimple['invokable'] = new Fixtures\Invokable();
-
-        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $pimple['invokable']);
-    }
-
-    /** @test */
-    public function settingNonInvokableObjectShouldTreatItAsParameter()
-    {
-        $pimple = new Container();
-        $pimple['non_invokable'] = new Fixtures\NonInvokable();
-
-        $this->assertInstanceOf('Pimple\Tests\Fixtures\NonInvokable', $pimple['non_invokable']);
-    }
-
-    /**
-     * @dataProvider badServiceDefinitionProvider
-     * @expectedException \Pimple\Exception\ExpectedInvokableException
-     * @expectedExceptionMessage Service definition is not a Closure or invokable object.
-     */
-    public function testFactoryFailsForInvalidServiceDefinitions($service)
-    {
-        $pimple = new Container();
-        $pimple->factory($service);
-    }
-
-    /**
-     * @group legacy
-     * @dataProvider badServiceDefinitionProvider
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Service definition is not a Closure or invokable object.
-     */
-    public function testLegacyFactoryFailsForInvalidServiceDefinitions($service)
-    {
-        $pimple = new Container();
-        $pimple->factory($service);
-    }
-
-    /**
-     * @dataProvider badServiceDefinitionProvider
-     * @expectedException \Pimple\Exception\ExpectedInvokableException
-     * @expectedExceptionMessage Callable is not a Closure or invokable object.
-     */
-    public function testProtectFailsForInvalidServiceDefinitions($service)
-    {
-        $pimple = new Container();
-        $pimple->protect($service);
-    }
-
-    /**
-     * @group legacy
-     * @dataProvider badServiceDefinitionProvider
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Callable is not a Closure or invokable object.
-     */
-    public function testLegacyProtectFailsForInvalidServiceDefinitions($service)
-    {
-        $pimple = new Container();
-        $pimple->protect($service);
-    }
-
-    /**
-     * @dataProvider badServiceDefinitionProvider
-     * @expectedException \Pimple\Exception\InvalidServiceIdentifierException
-     * @expectedExceptionMessage Identifier "foo" does not contain an object definition.
-     */
-    public function testExtendFailsForKeysNotContainingServiceDefinitions($service)
-    {
-        $pimple = new Container();
-        $pimple['foo'] = $service;
-        $pimple->extend('foo', function () {});
-    }
-
-    /**
-     * @group legacy
-     * @dataProvider badServiceDefinitionProvider
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Identifier "foo" does not contain an object definition.
-     */
-    public function testLegacyExtendFailsForKeysNotContainingServiceDefinitions($service)
-    {
-        $pimple = new Container();
-        $pimple['foo'] = $service;
-        $pimple->extend('foo', function () {});
-    }
-
-    /**
-     * @group legacy
-     * @expectedDeprecation How Pimple behaves when extending protected closures will be fixed in Pimple 4. Are you sure "foo" should be protected?
-     */
-    public function testExtendingProtectedClosureDeprecation()
-    {
-        $pimple = new Container();
-        $pimple['foo'] = $pimple->protect(function () {
-            return 'bar';
-        });
-
-        $pimple->extend('foo', function ($value) {
-            return $value.'-baz';
-        });
-
-        $this->assertSame('bar-baz', $pimple['foo']);
-    }
-
-    /**
-     * @dataProvider badServiceDefinitionProvider
-     * @expectedException \Pimple\Exception\ExpectedInvokableException
-     * @expectedExceptionMessage Extension service definition is not a Closure or invokable object.
-     */
-    public function testExtendFailsForInvalidServiceDefinitions($service)
-    {
-        $pimple = new Container();
-        $pimple['foo'] = function () {};
-        $pimple->extend('foo', $service);
-    }
-
-    /**
-     * @group legacy
-     * @dataProvider badServiceDefinitionProvider
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Extension service definition is not a Closure or invokable object.
-     */
-    public function testLegacyExtendFailsForInvalidServiceDefinitions($service)
-    {
-        $pimple = new Container();
-        $pimple['foo'] = function () {};
-        $pimple->extend('foo', $service);
-    }
-
-    /**
-     * @expectedException \Pimple\Exception\FrozenServiceException
-     * @expectedExceptionMessage Cannot override frozen service "foo".
-     */
-    public function testExtendFailsIfFrozenServiceIsNonInvokable()
-    {
-        $pimple = new Container();
-        $pimple['foo'] = function () {
-            return new Fixtures\NonInvokable();
-        };
-        $foo = $pimple['foo'];
-
-        $pimple->extend('foo', function () {});
-    }
-
-    /**
-     * @expectedException \Pimple\Exception\FrozenServiceException
-     * @expectedExceptionMessage Cannot override frozen service "foo".
-     */
-    public function testExtendFailsIfFrozenServiceIsInvokable()
-    {
-        $pimple = new Container();
-        $pimple['foo'] = function () {
-            return new Fixtures\Invokable();
-        };
-        $foo = $pimple['foo'];
-
-        $pimple->extend('foo', function () {});
-    }
-
-    /**
-     * Provider for invalid service definitions.
-     */
-    public function badServiceDefinitionProvider()
-    {
-        return array(
-          array(123),
-          array(new Fixtures\NonInvokable()),
-        );
-    }
-
-    /**
-     * Provider for service definitions.
-     */
-    public function serviceDefinitionProvider()
-    {
-        return array(
-            array(function ($value) {
-                $service = new Fixtures\Service();
-                $service->value = $value;
-
-                return $service;
-            }),
-            array(new Fixtures\Invokable()),
-        );
-    }
-
-    public function testDefiningNewServiceAfterFreeze()
-    {
-        $pimple = new Container();
-        $pimple['foo'] = function () {
-            return 'foo';
-        };
-        $foo = $pimple['foo'];
-
-        $pimple['bar'] = function () {
-            return 'bar';
-        };
-        $this->assertSame('bar', $pimple['bar']);
-    }
-
-    /**
-     * @expectedException \Pimple\Exception\FrozenServiceException
-     * @expectedExceptionMessage Cannot override frozen service "foo".
-     */
-    public function testOverridingServiceAfterFreeze()
-    {
-        $pimple = new Container();
-        $pimple['foo'] = function () {
-            return 'foo';
-        };
-        $foo = $pimple['foo'];
-
-        $pimple['foo'] = function () {
-            return 'bar';
-        };
-    }
-
-    /**
-     * @group legacy
-     * @expectedException \RuntimeException
-     * @expectedExceptionMessage Cannot override frozen service "foo".
-     */
-    public function testLegacyOverridingServiceAfterFreeze()
-    {
-        $pimple = new Container();
-        $pimple['foo'] = function () {
-            return 'foo';
-        };
-        $foo = $pimple['foo'];
-
-        $pimple['foo'] = function () {
-            return 'bar';
-        };
-    }
-
-    public function testRemovingServiceAfterFreeze()
-    {
-        $pimple = new Container();
-        $pimple['foo'] = function () {
-            return 'foo';
-        };
-        $foo = $pimple['foo'];
-
-        unset($pimple['foo']);
-        $pimple['foo'] = function () {
-            return 'bar';
-        };
-        $this->assertSame('bar', $pimple['foo']);
-    }
-
-    public function testExtendingService()
-    {
-        $pimple = new Container();
-        $pimple['foo'] = function () {
-            return 'foo';
-        };
-        $pimple['foo'] = $pimple->extend('foo', function ($foo, $app) {
-            return "$foo.bar";
-        });
-        $pimple['foo'] = $pimple->extend('foo', function ($foo, $app) {
-            return "$foo.baz";
-        });
-        $this->assertSame('foo.bar.baz', $pimple['foo']);
-    }
-
-    public function testExtendingServiceAfterOtherServiceFreeze()
-    {
-        $pimple = new Container();
-        $pimple['foo'] = function () {
-            return 'foo';
-        };
-        $pimple['bar'] = function () {
-            return 'bar';
-        };
-        $foo = $pimple['foo'];
-
-        $pimple['bar'] = $pimple->extend('bar', function ($bar, $app) {
-            return "$bar.baz";
-        });
-        $this->assertSame('bar.baz', $pimple['bar']);
-    }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Psr11/ContainerTest.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Psr11/ContainerTest.php
deleted file mode 100644
index 7ca2d7ff..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Psr11/ContainerTest.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/*
- * This file is part of Pimple.
- *
- * Copyright (c) 2009-2017 Fabien Potencier
- *
- * 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.
- */
-
-namespace Pimple\Tests\Psr11;
-
-use PHPUnit\Framework\TestCase;
-use Pimple\Container;
-use Pimple\Psr11\Container as PsrContainer;
-use Pimple\Tests\Fixtures\Service;
-
-class ContainerTest extends TestCase
-{
-    public function testGetReturnsExistingService()
-    {
-        $pimple = new Container();
-        $pimple['service'] = function () {
-            return new Service();
-        };
-        $psr = new PsrContainer($pimple);
-
-        $this->assertSame($pimple['service'], $psr->get('service'));
-    }
-
-    /**
-     * @expectedException \Psr\Container\NotFoundExceptionInterface
-     * @expectedExceptionMessage Identifier "service" is not defined.
-     */
-    public function testGetThrowsExceptionIfServiceIsNotFound()
-    {
-        $pimple = new Container();
-        $psr = new PsrContainer($pimple);
-
-        $psr->get('service');
-    }
-
-    public function testHasReturnsTrueIfServiceExists()
-    {
-        $pimple = new Container();
-        $pimple['service'] = function () {
-            return new Service();
-        };
-        $psr = new PsrContainer($pimple);
-
-        $this->assertTrue($psr->has('service'));
-    }
-
-    public function testHasReturnsFalseIfServiceDoesNotExist()
-    {
-        $pimple = new Container();
-        $psr = new PsrContainer($pimple);
-
-        $this->assertFalse($psr->has('service'));
-    }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Psr11/ServiceLocatorTest.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Psr11/ServiceLocatorTest.php
deleted file mode 100644
index c9a08125..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Psr11/ServiceLocatorTest.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-/*
- * This file is part of Pimple.
- *
- * Copyright (c) 2009 Fabien Potencier
- *
- * 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.
- */
-
-namespace Pimple\Tests\Psr11;
-
-use PHPUnit\Framework\TestCase;
-use Pimple\Container;
-use Pimple\Psr11\ServiceLocator;
-use Pimple\Tests\Fixtures;
-
-/**
- * ServiceLocator test case.
- *
- * @author Pascal Luna <skalpa@zetareticuli.org>
- */
-class ServiceLocatorTest extends TestCase
-{
-    public function testCanAccessServices()
-    {
-        $pimple = new Container();
-        $pimple['service'] = function () {
-            return new Fixtures\Service();
-        };
-        $locator = new ServiceLocator($pimple, array('service'));
-
-        $this->assertSame($pimple['service'], $locator->get('service'));
-    }
-
-    public function testCanAccessAliasedServices()
-    {
-        $pimple = new Container();
-        $pimple['service'] = function () {
-            return new Fixtures\Service();
-        };
-        $locator = new ServiceLocator($pimple, array('alias' => 'service'));
-
-        $this->assertSame($pimple['service'], $locator->get('alias'));
-    }
-
-    /**
-     * @expectedException \Pimple\Exception\UnknownIdentifierException
-     * @expectedExceptionMessage Identifier "service" is not defined.
-     */
-    public function testCannotAccessAliasedServiceUsingRealIdentifier()
-    {
-        $pimple = new Container();
-        $pimple['service'] = function () {
-            return new Fixtures\Service();
-        };
-        $locator = new ServiceLocator($pimple, array('alias' => 'service'));
-
-        $service = $locator->get('service');
-    }
-
-    /**
-     * @expectedException \Pimple\Exception\UnknownIdentifierException
-     * @expectedExceptionMessage Identifier "foo" is not defined.
-     */
-    public function testGetValidatesServiceCanBeLocated()
-    {
-        $pimple = new Container();
-        $pimple['service'] = function () {
-            return new Fixtures\Service();
-        };
-        $locator = new ServiceLocator($pimple, array('alias' => 'service'));
-
-        $service = $locator->get('foo');
-    }
-
-    /**
-     * @expectedException \Pimple\Exception\UnknownIdentifierException
-     * @expectedExceptionMessage Identifier "invalid" is not defined.
-     */
-    public function testGetValidatesTargetServiceExists()
-    {
-        $pimple = new Container();
-        $pimple['service'] = function () {
-            return new Fixtures\Service();
-        };
-        $locator = new ServiceLocator($pimple, array('alias' => 'invalid'));
-
-        $service = $locator->get('alias');
-    }
-
-    public function testHasValidatesServiceCanBeLocated()
-    {
-        $pimple = new Container();
-        $pimple['service1'] = function () {
-            return new Fixtures\Service();
-        };
-        $pimple['service2'] = function () {
-            return new Fixtures\Service();
-        };
-        $locator = new ServiceLocator($pimple, array('service1'));
-
-        $this->assertTrue($locator->has('service1'));
-        $this->assertFalse($locator->has('service2'));
-    }
-
-    public function testHasChecksIfTargetServiceExists()
-    {
-        $pimple = new Container();
-        $pimple['service'] = function () {
-            return new Fixtures\Service();
-        };
-        $locator = new ServiceLocator($pimple, array('foo' => 'service', 'bar' => 'invalid'));
-
-        $this->assertTrue($locator->has('foo'));
-        $this->assertFalse($locator->has('bar'));
-    }
-}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/ServiceIteratorTest.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/ServiceIteratorTest.php
deleted file mode 100644
index 5dd52f0d..00000000
--- a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/ServiceIteratorTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/*
- * This file is part of Pimple.
- *
- * Copyright (c) 2009 Fabien Potencier
- *
- * 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.
- */
-
-namespace Pimple\Tests;
-
-use PHPUnit\Framework\TestCase;
-use Pimple\Container;
-use Pimple\ServiceIterator;
-use Pimple\Tests\Fixtures\Service;
-
-class ServiceIteratorTest extends TestCase
-{
-    public function testIsIterable()
-    {
-        $pimple = new Container();
-        $pimple['service1'] = function () {
-            return new Service();
-        };
-        $pimple['service2'] = function () {
-            return new Service();
-        };
-        $pimple['service3'] = function () {
-            return new Service();
-        };
-        $iterator = new ServiceIterator($pimple, array('service1', 'service2'));
-
-        $this->assertSame(array('service1' => $pimple['service1'], 'service2' => $pimple['service2']), iterator_to_array($iterator));
-    }
-}
diff --git a/advancedcontentfilter/vendor/psr/container/README.md b/advancedcontentfilter/vendor/psr/container/README.md
index 084f6df5..1b9d9e57 100644
--- a/advancedcontentfilter/vendor/psr/container/README.md
+++ b/advancedcontentfilter/vendor/psr/container/README.md
@@ -1,5 +1,13 @@
-# PSR Container
+Container interface
+==============
 
-This repository holds all interfaces/classes/traits related to [PSR-11](https://github.com/container-interop/fig-standards/blob/master/proposed/container.md).
+This repository holds all interfaces related to [PSR-11 (Container Interface)][psr-url].
+
+Note that this is not a Container implementation of its own. It is merely abstractions that describe the components of a Dependency Injection Container.
+
+The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist.
+
+[psr-url]: https://www.php-fig.org/psr/psr-11/
+[package-url]: https://packagist.org/packages/psr/container
+[implementation-url]: https://packagist.org/providers/psr/container-implementation
 
-Note that this is not a container implementation of its own. See the specification for more details.
diff --git a/advancedcontentfilter/vendor/psr/container/composer.json b/advancedcontentfilter/vendor/psr/container/composer.json
index b8ee0126..baf6cd1a 100644
--- a/advancedcontentfilter/vendor/psr/container/composer.json
+++ b/advancedcontentfilter/vendor/psr/container/composer.json
@@ -8,11 +8,11 @@
     "authors": [
         {
             "name": "PHP-FIG",
-            "homepage": "http://www.php-fig.org/"
+            "homepage": "https://www.php-fig.org/"
         }
     ],
     "require": {
-        "php": ">=5.3.0"
+        "php": ">=7.4.0"
     },
     "autoload": {
         "psr-4": {
@@ -21,7 +21,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "2.0.x-dev"
         }
     }
 }
diff --git a/advancedcontentfilter/vendor/psr/container/src/ContainerExceptionInterface.php b/advancedcontentfilter/vendor/psr/container/src/ContainerExceptionInterface.php
index d35c6b4d..0f213f2f 100644
--- a/advancedcontentfilter/vendor/psr/container/src/ContainerExceptionInterface.php
+++ b/advancedcontentfilter/vendor/psr/container/src/ContainerExceptionInterface.php
@@ -1,13 +1,12 @@
 <?php
-/**
- * @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
- */
 
 namespace Psr\Container;
 
+use Throwable;
+
 /**
  * Base interface representing a generic exception in a container.
  */
-interface ContainerExceptionInterface
+interface ContainerExceptionInterface extends Throwable
 {
 }
diff --git a/advancedcontentfilter/vendor/psr/container/src/ContainerInterface.php b/advancedcontentfilter/vendor/psr/container/src/ContainerInterface.php
index c3a7206f..b2cad401 100644
--- a/advancedcontentfilter/vendor/psr/container/src/ContainerInterface.php
+++ b/advancedcontentfilter/vendor/psr/container/src/ContainerInterface.php
@@ -1,7 +1,6 @@
 <?php
-/**
- * @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
- */
+
+declare(strict_types=1);
 
 namespace Psr\Container;
 
@@ -20,7 +19,7 @@ interface ContainerInterface
      *
      * @return mixed Entry.
      */
-    public function get($id);
+    public function get(string $id);
 
     /**
      * Returns true if the container can return an entry for the given identifier.
@@ -33,5 +32,5 @@ interface ContainerInterface
      *
      * @return bool
      */
-    public function has($id);
+    public function has(string $id): bool;
 }
diff --git a/advancedcontentfilter/vendor/psr/container/src/NotFoundExceptionInterface.php b/advancedcontentfilter/vendor/psr/container/src/NotFoundExceptionInterface.php
index 6566704e..650bf464 100644
--- a/advancedcontentfilter/vendor/psr/container/src/NotFoundExceptionInterface.php
+++ b/advancedcontentfilter/vendor/psr/container/src/NotFoundExceptionInterface.php
@@ -1,7 +1,4 @@
 <?php
-/**
- * @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
- */
 
 namespace Psr\Container;
 
diff --git a/advancedcontentfilter/vendor/pimple/pimple/LICENSE b/advancedcontentfilter/vendor/psr/http-factory/LICENSE
similarity index 87%
rename from advancedcontentfilter/vendor/pimple/pimple/LICENSE
rename to advancedcontentfilter/vendor/psr/http-factory/LICENSE
index e02dc5a7..3f1559b2 100644
--- a/advancedcontentfilter/vendor/pimple/pimple/LICENSE
+++ b/advancedcontentfilter/vendor/psr/http-factory/LICENSE
@@ -1,11 +1,13 @@
-Copyright (c) 2009-2017 Fabien Potencier
+MIT License
+
+Copyright (c) 2018 PHP-FIG
 
 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:
+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.
@@ -15,5 +17,5 @@ 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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/advancedcontentfilter/vendor/psr/http-factory/README.md b/advancedcontentfilter/vendor/psr/http-factory/README.md
new file mode 100644
index 00000000..bf8913b5
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/http-factory/README.md
@@ -0,0 +1,12 @@
+HTTP Factories
+==============
+
+This repository holds all interfaces related to [PSR-17 (HTTP Factories)][psr-url].
+
+Note that this is not a HTTP Factory implementation of its own. It is merely interfaces that describe the components of a HTTP Factory.
+
+The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist.
+
+[psr-url]: https://www.php-fig.org/psr/psr-17/
+[package-url]: https://packagist.org/packages/psr/http-factory
+[implementation-url]: https://packagist.org/providers/psr/http-factory-implementation
diff --git a/advancedcontentfilter/vendor/psr/http-factory/composer.json b/advancedcontentfilter/vendor/psr/http-factory/composer.json
new file mode 100644
index 00000000..d1bbddee
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/http-factory/composer.json
@@ -0,0 +1,35 @@
+{
+    "name": "psr/http-factory",
+    "description": "Common interfaces for PSR-7 HTTP message factories",
+    "keywords": [
+        "psr",
+        "psr-7",
+        "psr-17",
+        "http",
+        "factory",
+        "message",
+        "request",
+        "response"
+    ],
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "PHP-FIG",
+            "homepage": "https://www.php-fig.org/"
+        }
+    ],
+    "require": {
+        "php": ">=7.0.0",
+        "psr/http-message": "^1.0 || ^2.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Psr\\Http\\Message\\": "src/"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
+    }
+}
diff --git a/advancedcontentfilter/vendor/psr/http-factory/src/RequestFactoryInterface.php b/advancedcontentfilter/vendor/psr/http-factory/src/RequestFactoryInterface.php
new file mode 100644
index 00000000..cb39a08b
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/http-factory/src/RequestFactoryInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Psr\Http\Message;
+
+interface RequestFactoryInterface
+{
+    /**
+     * Create a new request.
+     *
+     * @param string $method The HTTP method associated with the request.
+     * @param UriInterface|string $uri The URI associated with the request. If
+     *     the value is a string, the factory MUST create a UriInterface
+     *     instance based on it.
+     *
+     * @return RequestInterface
+     */
+    public function createRequest(string $method, $uri): RequestInterface;
+}
diff --git a/advancedcontentfilter/vendor/psr/http-factory/src/ResponseFactoryInterface.php b/advancedcontentfilter/vendor/psr/http-factory/src/ResponseFactoryInterface.php
new file mode 100644
index 00000000..212562f0
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/http-factory/src/ResponseFactoryInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Psr\Http\Message;
+
+interface ResponseFactoryInterface
+{
+    /**
+     * Create a new response.
+     *
+     * @param int $code HTTP status code; defaults to 200
+     * @param string $reasonPhrase Reason phrase to associate with status code
+     *     in generated response; if none is provided implementations MAY use
+     *     the defaults as suggested in the HTTP specification.
+     *
+     * @return ResponseInterface
+     */
+    public function createResponse(int $code = 200, string $reasonPhrase = ''): ResponseInterface;
+}
diff --git a/advancedcontentfilter/vendor/psr/http-factory/src/ServerRequestFactoryInterface.php b/advancedcontentfilter/vendor/psr/http-factory/src/ServerRequestFactoryInterface.php
new file mode 100644
index 00000000..9fe031a8
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/http-factory/src/ServerRequestFactoryInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Psr\Http\Message;
+
+interface ServerRequestFactoryInterface
+{
+    /**
+     * Create a new server request.
+     *
+     * Note that server-params are taken precisely as given - no parsing/processing
+     * of the given values is performed, and, in particular, no attempt is made to
+     * determine the HTTP method or URI, which must be provided explicitly.
+     *
+     * @param string $method The HTTP method associated with the request.
+     * @param UriInterface|string $uri The URI associated with the request. If
+     *     the value is a string, the factory MUST create a UriInterface
+     *     instance based on it.
+     * @param array $serverParams Array of SAPI parameters with which to seed
+     *     the generated request instance.
+     *
+     * @return ServerRequestInterface
+     */
+    public function createServerRequest(string $method, $uri, array $serverParams = []): ServerRequestInterface;
+}
diff --git a/advancedcontentfilter/vendor/psr/http-factory/src/StreamFactoryInterface.php b/advancedcontentfilter/vendor/psr/http-factory/src/StreamFactoryInterface.php
new file mode 100644
index 00000000..90e3240c
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/http-factory/src/StreamFactoryInterface.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Psr\Http\Message;
+
+interface StreamFactoryInterface
+{
+    /**
+     * Create a new stream from a string.
+     *
+     * The stream SHOULD be created with a temporary resource.
+     *
+     * @param string $content String content with which to populate the stream.
+     *
+     * @return StreamInterface
+     */
+    public function createStream(string $content = ''): StreamInterface;
+
+    /**
+     * Create a stream from an existing file.
+     *
+     * The file MUST be opened using the given mode, which may be any mode
+     * supported by the `fopen` function.
+     *
+     * The `$filename` MAY be any string supported by `fopen()`.
+     *
+     * @param string $filename Filename or stream URI to use as basis of stream.
+     * @param string $mode Mode with which to open the underlying filename/stream.
+     *
+     * @return StreamInterface
+     * @throws \RuntimeException If the file cannot be opened.
+     * @throws \InvalidArgumentException If the mode is invalid.
+     */
+    public function createStreamFromFile(string $filename, string $mode = 'r'): StreamInterface;
+
+    /**
+     * Create a new stream from an existing resource.
+     *
+     * The stream MUST be readable and may be writable.
+     *
+     * @param resource $resource PHP resource to use as basis of stream.
+     *
+     * @return StreamInterface
+     */
+    public function createStreamFromResource($resource): StreamInterface;
+}
diff --git a/advancedcontentfilter/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php b/advancedcontentfilter/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php
new file mode 100644
index 00000000..7db4e30a
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Psr\Http\Message;
+
+interface UploadedFileFactoryInterface
+{
+    /**
+     * Create a new uploaded file.
+     *
+     * If a size is not provided it will be determined by checking the size of
+     * the file.
+     *
+     * @see http://php.net/manual/features.file-upload.post-method.php
+     * @see http://php.net/manual/features.file-upload.errors.php
+     *
+     * @param StreamInterface $stream Underlying stream representing the
+     *     uploaded file content.
+     * @param int $size in bytes
+     * @param int $error PHP file upload error
+     * @param string $clientFilename Filename as provided by the client, if any.
+     * @param string $clientMediaType Media type as provided by the client, if any.
+     *
+     * @return UploadedFileInterface
+     *
+     * @throws \InvalidArgumentException If the file resource is not readable.
+     */
+    public function createUploadedFile(
+        StreamInterface $stream,
+        int $size = null,
+        int $error = \UPLOAD_ERR_OK,
+        string $clientFilename = null,
+        string $clientMediaType = null
+    ): UploadedFileInterface;
+}
diff --git a/advancedcontentfilter/vendor/psr/http-factory/src/UriFactoryInterface.php b/advancedcontentfilter/vendor/psr/http-factory/src/UriFactoryInterface.php
new file mode 100644
index 00000000..06df0b46
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/http-factory/src/UriFactoryInterface.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Psr\Http\Message;
+
+interface UriFactoryInterface
+{
+    /**
+     * Create a new URI.
+     *
+     * @param string $uri
+     *
+     * @return UriInterface
+     *
+     * @throws \InvalidArgumentException If the given URI cannot be parsed.
+     */
+    public function createUri(string $uri = ''): UriInterface;
+}
diff --git a/advancedcontentfilter/vendor/psr/http-message/README.md b/advancedcontentfilter/vendor/psr/http-message/README.md
index 28185338..2668be6c 100644
--- a/advancedcontentfilter/vendor/psr/http-message/README.md
+++ b/advancedcontentfilter/vendor/psr/http-message/README.md
@@ -10,4 +10,7 @@ interface that describes a HTTP message. See the specification for more details.
 Usage
 -----
 
-We'll certainly need some stuff in here.
\ No newline at end of file
+Before reading the usage guide we recommend reading the PSR-7 interfaces method list:
+
+* [`PSR-7 Interfaces Method List`](docs/PSR7-Interfaces.md)
+* [`PSR-7 Usage Guide`](docs/PSR7-Usage.md)
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/psr/http-message/composer.json b/advancedcontentfilter/vendor/psr/http-message/composer.json
index b0d2937a..56e8c0a6 100644
--- a/advancedcontentfilter/vendor/psr/http-message/composer.json
+++ b/advancedcontentfilter/vendor/psr/http-message/composer.json
@@ -11,7 +11,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0"
+        "php": "^7.2 || ^8.0"
     },
     "autoload": {
         "psr-4": {
@@ -20,7 +20,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "1.1.x-dev"
         }
     }
 }
diff --git a/advancedcontentfilter/vendor/psr/http-message/docs/PSR7-Interfaces.md b/advancedcontentfilter/vendor/psr/http-message/docs/PSR7-Interfaces.md
new file mode 100644
index 00000000..3a7e7dda
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/http-message/docs/PSR7-Interfaces.md
@@ -0,0 +1,130 @@
+# Interfaces
+
+The purpose of this list is to help in finding the methods when working with PSR-7. This can be considered as a cheatsheet for PSR-7 interfaces.
+
+The interfaces defined in PSR-7 are the following:
+
+| Class Name | Description |
+|---|---|
+| [Psr\Http\Message\MessageInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagemessageinterface) | Representation of a HTTP message |
+| [Psr\Http\Message\RequestInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagerequestinterface) | Representation of an outgoing, client-side request. |
+| [Psr\Http\Message\ServerRequestInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageserverrequestinterface) | Representation of an incoming, server-side HTTP request. | 
+| [Psr\Http\Message\ResponseInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageresponseinterface) | Representation of an outgoing, server-side response. |
+| [Psr\Http\Message\StreamInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagestreaminterface) | Describes a data stream |
+| [Psr\Http\Message\UriInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageuriinterface) | Value object representing a URI. |
+| [Psr\Http\Message\UploadedFileInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageuploadedfileinterface) | Value object representing a file uploaded through an HTTP request. |
+
+## `Psr\Http\Message\MessageInterface` Methods
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getProtocolVersion()`             | Retrieve HTTP protocol version          |  1.0 or 1.1 |
+| `withProtocolVersion($version)`    | Returns new message instance with given HTTP protocol version          |      |
+| `getHeaders()`                     | Retrieve all HTTP Headers               | [Request Header List](https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Request_fields), [Response Header List](https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Response_fields)      |
+| `hasHeader($name)`                 | Checks if HTTP Header with given name exists  | |
+| `getHeader($name)`                 | Retrieves a array with the values for a single header | |
+| `getHeaderLine($name)`             | Retrieves a comma-separated string of the values for a single header |  |
+| `withHeader($name, $value)`        | Returns new message instance with given HTTP Header | if the header existed in the original instance, replaces the header value from the original message with the value provided when creating the new instance. |
+| `withAddedHeader($name, $value)`   | Returns new message instance with appended value to given header | If header already exists value will be appended, if not a new header will be created |
+| `withoutHeader($name)`             | Removes HTTP Header with given name| |
+| `getBody()`                        | Retrieves the HTTP Message Body | Returns object implementing `StreamInterface`|
+| `withBody(StreamInterface $body)`  | Returns new message instance with given HTTP Message Body | |
+
+
+## `Psr\Http\Message\RequestInterface` Methods
+
+Same methods as `Psr\Http\Message\MessageInterface`  + the following methods:
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getRequestTarget()`                | Retrieves the message's request target              | origin-form, absolute-form, authority-form, asterisk-form ([RFC7230](https://www.rfc-editor.org/rfc/rfc7230.txt)) |
+| `withRequestTarget($requestTarget)` | Return a new message instance with the specific request-target |      |
+| `getMethod()`                       | Retrieves the HTTP method of the request.  |  GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE (defined in [RFC7231](https://tools.ietf.org/html/rfc7231)), PATCH (defined in [RFC5789](https://tools.ietf.org/html/rfc5789)) |
+| `withMethod($method)`               | Returns a new message instance with the provided HTTP method  | |
+| `getUri()`                 | Retrieves the URI instance | |
+| `withUri(UriInterface $uri, $preserveHost = false)` | Returns a new message instance with the provided URI |  |
+
+
+## `Psr\Http\Message\ServerRequestInterface` Methods
+
+Same methods as `Psr\Http\Message\RequestInterface`  + the following methods:
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getServerParams() `               | Retrieve server parameters  | Typically derived from `$_SERVER`  |
+| `getCookieParams()`                | Retrieves cookies sent by the client to the server. | Typically derived from `$_COOKIES` |
+| `withCookieParams(array $cookies)` |  Returns a new request instance with the specified cookies      |   | 
+| `withQueryParams(array $query)` | Returns a new request instance with the specified query string arguments  |  |
+| `getUploadedFiles()` | Retrieve normalized file upload data  |  |
+| `withUploadedFiles(array $uploadedFiles)` | Returns a new request instance with the specified uploaded files  |  |
+| `getParsedBody()` | Retrieve any parameters provided in the request body  |  |
+| `withParsedBody($data)` | Returns a new request instance with the specified body parameters  |  |
+| `getAttributes()` | Retrieve attributes derived from the request  |  |
+| `getAttribute($name, $default = null)` | Retrieve a single derived request attribute  |  |
+| `withAttribute($name, $value)` | Returns a new request instance with the specified derived request attribute  |  |
+| `withoutAttribute($name)` | Returns a new request instance that without the specified derived request attribute  |  |
+
+## `Psr\Http\Message\ResponseInterface` Methods:
+
+Same methods as `Psr\Http\Message\MessageInterface`  + the following methods:
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getStatusCode()` | Gets the response status code. | |
+| `withStatus($code, $reasonPhrase = '')` | Returns a new response instance with the specified status code and, optionally, reason phrase. | |
+| `getReasonPhrase()` | Gets the response reason phrase associated with the status code. | |
+
+##  `Psr\Http\Message\StreamInterface` Methods
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `__toString()` | Reads all data from the stream into a string, from the beginning to end. | |
+| `close()` | Closes the stream and any underlying resources. | |
+| `detach()` | Separates any underlying resources from the stream. | |
+| `getSize()` | Get the size of the stream if known. | |
+| `eof()` | Returns true if the stream is at the end of the stream.| |
+| `isSeekable()` |  Returns whether or not the stream is seekable. | |
+| `seek($offset, $whence = SEEK_SET)` | Seek to a position in the stream. | |
+| `rewind()` | Seek to the beginning of the stream. | |
+| `isWritable()` | Returns whether or not the stream is writable. | |
+| `write($string)` | Write data to the stream. | |
+| `isReadable()` | Returns whether or not the stream is readable. | |
+| `read($length)` | Read data from the stream. | |
+| `getContents()` | Returns the remaining contents in a string | |
+| `getMetadata($key = null)()` | Get stream metadata as an associative array or retrieve a specific key. | |
+
+## `Psr\Http\Message\UriInterface` Methods
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getScheme()` | Retrieve the scheme component of the URI. | |
+| `getAuthority()` | Retrieve the authority component of the URI. | |
+| `getUserInfo()` | Retrieve the user information component of the URI. | |
+| `getHost()` | Retrieve the host component of the URI. | |
+| `getPort()` | Retrieve the port component of the URI. | |
+| `getPath()` | Retrieve the path component of the URI. | |
+| `getQuery()` | Retrieve the query string of the URI. | |
+| `getFragment()` | Retrieve the fragment component of the URI. | |
+| `withScheme($scheme)` | Return an instance with the specified scheme. | |
+| `withUserInfo($user, $password = null)` | Return an instance with the specified user information. | |
+| `withHost($host)` | Return an instance with the specified host. | |
+| `withPort($port)` | Return an instance with the specified port. | |
+| `withPath($path)` | Return an instance with the specified path. | |
+| `withQuery($query)` | Return an instance with the specified query string. | |
+| `withFragment($fragment)` | Return an instance with the specified URI fragment. | |
+| `__toString()` | Return the string representation as a URI reference. | |
+
+## `Psr\Http\Message\UploadedFileInterface` Methods
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getStream()` | Retrieve a stream representing the uploaded file. | |
+| `moveTo($targetPath)` | Move the uploaded file to a new location. | |
+| `getSize()` | Retrieve the file size. | |
+| `getError()` | Retrieve the error associated with the uploaded file. | |
+| `getClientFilename()` | Retrieve the filename sent by the client. | |
+| `getClientMediaType()` | Retrieve the media type sent by the client. | |
+
+> `RequestInterface`, `ServerRequestInterface`, `ResponseInterface` extend `MessageInterface`  because the `Request` and the `Response` are `HTTP Messages`.
+> When using `ServerRequestInterface`, both `RequestInterface` and `Psr\Http\Message\MessageInterface` methods are considered.
+
diff --git a/advancedcontentfilter/vendor/psr/http-message/docs/PSR7-Usage.md b/advancedcontentfilter/vendor/psr/http-message/docs/PSR7-Usage.md
new file mode 100644
index 00000000..b6d048a3
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/http-message/docs/PSR7-Usage.md
@@ -0,0 +1,159 @@
+### PSR-7 Usage
+
+All PSR-7 applications comply with these interfaces 
+They were created to establish a standard between middleware implementations.
+
+> `RequestInterface`, `ServerRequestInterface`, `ResponseInterface` extend `MessageInterface`  because the `Request` and the `Response` are `HTTP Messages`.
+> When using `ServerRequestInterface`, both `RequestInterface` and `Psr\Http\Message\MessageInterface` methods are considered.
+
+
+The following examples will illustrate how basic operations are done in PSR-7.
+
+##### Examples
+
+
+For this examples to work (at least) a PSR-7 implementation package is required. (eg: zendframework/zend-diactoros, guzzlehttp/psr7, slim/slim, etc)
+All PSR-7 implementations should have the same behaviour.
+
+The following will be assumed: 
+`$request` is an object of `Psr\Http\Message\RequestInterface` and
+
+`$response` is an object implementing `Psr\Http\Message\RequestInterface`
+
+
+### Working with HTTP Headers
+
+#### Adding headers to response:
+
+```php
+$response->withHeader('My-Custom-Header', 'My Custom Message');
+```
+
+#### Appending values to headers
+
+```php
+$response->withAddedHeader('My-Custom-Header', 'The second message');
+```
+
+#### Checking if header exists:
+
+```php
+$request->hasHeader('My-Custom-Header'); // will return false
+$response->hasHeader('My-Custom-Header'); // will return true
+```
+
+> Note: My-Custom-Header was only added in the Response
+
+#### Getting comma-separated values from a header (also applies to request)
+
+```php
+// getting value from request headers
+$request->getHeaderLine('Content-Type'); // will return: "text/html; charset=UTF-8"
+// getting value from response headers
+$response->getHeaderLine('My-Custom-Header'); // will return:  "My Custom Message; The second message"
+```
+
+#### Getting array of value from a header (also applies to request)
+```php
+// getting value from request headers
+$request->getHeader('Content-Type'); // will return: ["text/html", "charset=UTF-8"]
+// getting value from response headers
+$response->getHeader('My-Custom-Header'); // will return:  ["My Custom Message",  "The second message"]
+```
+
+#### Removing headers from HTTP Messages
+```php
+// removing a header from Request, removing deprecated "Content-MD5" header
+$request->withoutHeader('Content-MD5'); 
+
+// removing a header from Response
+// effect: the browser won't know the size of the stream
+// the browser will download the stream till it ends
+$response->withoutHeader('Content-Length');
+```
+
+### Working with HTTP Message Body
+
+When working with the PSR-7 there are two methods of implementation:
+#### 1. Getting the body separately
+
+> This method makes the body handling easier to understand and is useful when repeatedly calling body methods. (You only call `getBody()` once). Using this method mistakes like `$response->write()` are also prevented.
+
+```php
+$body = $response->getBody();
+// operations on body, eg. read, write, seek
+// ...
+// replacing the old body
+$response->withBody($body); 
+// this last statement is optional as we working with objects
+// in this case the "new" body is same with the "old" one
+// the $body variable has the same value as the one in $request, only the reference is passed
+```
+
+#### 2. Working directly on response
+
+> This method is useful when only performing few operations as the `$request->getBody()` statement fragment is required
+
+```php
+$response->getBody()->write('hello');
+```
+
+### Getting the body contents
+
+The following snippet gets the contents of a stream contents.
+> Note: Streams must be rewinded, if content was written into streams, it will be ignored when calling `getContents()` because the stream pointer is set to the last character, which is `\0` - meaning end of stream.
+```php 
+$body = $response->getBody();
+$body->rewind(); // or $body->seek(0);
+$bodyText = $body->getContents();
+```
+> Note: If `$body->seek(1)` is called before `$body->getContents()`, the first character will be ommited as the starting pointer is set to `1`, not `0`. This is why using `$body->rewind()` is recommended.
+
+### Append to body
+
+```php
+$response->getBody()->write('Hello'); // writing directly
+$body = $request->getBody(); // which is a `StreamInterface`
+$body->write('xxxxx');
+```
+
+### Prepend to body
+Prepending is different when it comes to streams. The content must be copied before writing the content to be prepended.
+The following example will explain the behaviour of streams.
+
+```php
+// assuming our response is initially empty
+$body = $repsonse->getBody();
+// writing the string "abcd"
+$body->write('abcd');
+
+// seeking to start of stream
+$body->seek(0);
+// writing 'ef'
+$body->write('ef'); // at this point the stream contains "efcd"
+```
+
+#### Prepending by rewriting separately
+
+```php
+// assuming our response body stream only contains: "abcd"
+$body = $response->getBody();
+$body->rewind();
+$contents = $body->getContents(); // abcd
+// seeking the stream to beginning
+$body->rewind();
+$body->write('ef'); // stream contains "efcd"
+$body->write($contents); // stream contains "efabcd"
+```
+
+> Note: `getContents()` seeks the stream while reading it, therefore if the second `rewind()` method call was not present the stream would have resulted in `abcdefabcd` because the `write()` method appends to stream if not preceeded by `rewind()` or `seek(0)`.
+
+#### Prepending by using contents as a string
+```php
+$body = $response->getBody();
+$body->rewind();
+$contents = $body->getContents(); // efabcd
+$contents = 'ef'.$contents;
+$body->rewind();
+$body->write($contents);
+```
diff --git a/advancedcontentfilter/vendor/psr/http-message/src/MessageInterface.php b/advancedcontentfilter/vendor/psr/http-message/src/MessageInterface.php
index dd46e5ec..8cdb4ed6 100644
--- a/advancedcontentfilter/vendor/psr/http-message/src/MessageInterface.php
+++ b/advancedcontentfilter/vendor/psr/http-message/src/MessageInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Psr\Http\Message;
 
 /**
@@ -38,7 +40,7 @@ interface MessageInterface
      * @param string $version HTTP protocol version
      * @return static
      */
-    public function withProtocolVersion($version);
+    public function withProtocolVersion(string $version);
 
     /**
      * Retrieves all message header values.
@@ -75,7 +77,7 @@ interface MessageInterface
      *     name using a case-insensitive string comparison. Returns false if
      *     no matching header name is found in the message.
      */
-    public function hasHeader($name);
+    public function hasHeader(string $name);
 
     /**
      * Retrieves a message header value by the given case-insensitive name.
@@ -91,7 +93,7 @@ interface MessageInterface
      *    header. If the header does not appear in the message, this method MUST
      *    return an empty array.
      */
-    public function getHeader($name);
+    public function getHeader(string $name);
 
     /**
      * Retrieves a comma-separated string of the values for a single header.
@@ -112,7 +114,7 @@ interface MessageInterface
      *    concatenated together using a comma. If the header does not appear in
      *    the message, this method MUST return an empty string.
      */
-    public function getHeaderLine($name);
+    public function getHeaderLine(string $name);
 
     /**
      * Return an instance with the provided value replacing the specified header.
@@ -129,7 +131,7 @@ interface MessageInterface
      * @return static
      * @throws \InvalidArgumentException for invalid header names or values.
      */
-    public function withHeader($name, $value);
+    public function withHeader(string $name, $value);
 
     /**
      * Return an instance with the specified header appended with the given value.
@@ -147,7 +149,7 @@ interface MessageInterface
      * @return static
      * @throws \InvalidArgumentException for invalid header names or values.
      */
-    public function withAddedHeader($name, $value);
+    public function withAddedHeader(string $name, $value);
 
     /**
      * Return an instance without the specified header.
@@ -161,7 +163,7 @@ interface MessageInterface
      * @param string $name Case-insensitive header field name to remove.
      * @return static
      */
-    public function withoutHeader($name);
+    public function withoutHeader(string $name);
 
     /**
      * Gets the body of the message.
diff --git a/advancedcontentfilter/vendor/psr/http-message/src/RequestInterface.php b/advancedcontentfilter/vendor/psr/http-message/src/RequestInterface.php
index a96d4fd6..38066df6 100644
--- a/advancedcontentfilter/vendor/psr/http-message/src/RequestInterface.php
+++ b/advancedcontentfilter/vendor/psr/http-message/src/RequestInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Psr\Http\Message;
 
 /**
@@ -55,10 +57,10 @@ interface RequestInterface extends MessageInterface
      *
      * @link http://tools.ietf.org/html/rfc7230#section-5.3 (for the various
      *     request-target forms allowed in request messages)
-     * @param mixed $requestTarget
+     * @param string $requestTarget
      * @return static
      */
-    public function withRequestTarget($requestTarget);
+    public function withRequestTarget(string $requestTarget);
 
     /**
      * Retrieves the HTTP method of the request.
@@ -82,7 +84,7 @@ interface RequestInterface extends MessageInterface
      * @return static
      * @throws \InvalidArgumentException for invalid HTTP methods.
      */
-    public function withMethod($method);
+    public function withMethod(string $method);
 
     /**
      * Retrieves the URI instance.
@@ -125,5 +127,5 @@ interface RequestInterface extends MessageInterface
      * @param bool $preserveHost Preserve the original state of the Host header.
      * @return static
      */
-    public function withUri(UriInterface $uri, $preserveHost = false);
+    public function withUri(UriInterface $uri, bool $preserveHost = false);
 }
diff --git a/advancedcontentfilter/vendor/psr/http-message/src/ResponseInterface.php b/advancedcontentfilter/vendor/psr/http-message/src/ResponseInterface.php
index c306514e..f85ca48a 100644
--- a/advancedcontentfilter/vendor/psr/http-message/src/ResponseInterface.php
+++ b/advancedcontentfilter/vendor/psr/http-message/src/ResponseInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Psr\Http\Message;
 
 /**
@@ -49,7 +51,7 @@ interface ResponseInterface extends MessageInterface
      * @return static
      * @throws \InvalidArgumentException For invalid status code arguments.
      */
-    public function withStatus($code, $reasonPhrase = '');
+    public function withStatus(int $code, string $reasonPhrase = '');
 
     /**
      * Gets the response reason phrase associated with the status code.
diff --git a/advancedcontentfilter/vendor/psr/http-message/src/ServerRequestInterface.php b/advancedcontentfilter/vendor/psr/http-message/src/ServerRequestInterface.php
index 02512340..5e6d9649 100644
--- a/advancedcontentfilter/vendor/psr/http-message/src/ServerRequestInterface.php
+++ b/advancedcontentfilter/vendor/psr/http-message/src/ServerRequestInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Psr\Http\Message;
 
 /**
@@ -224,7 +226,7 @@ interface ServerRequestInterface extends RequestInterface
      * @param mixed $default Default value to return if the attribute does not exist.
      * @return mixed
      */
-    public function getAttribute($name, $default = null);
+    public function getAttribute(string $name, $default = null);
 
     /**
      * Return an instance with the specified derived request attribute.
@@ -241,7 +243,7 @@ interface ServerRequestInterface extends RequestInterface
      * @param mixed $value The value of the attribute.
      * @return static
      */
-    public function withAttribute($name, $value);
+    public function withAttribute(string $name, $value);
 
     /**
      * Return an instance that removes the specified derived request attribute.
@@ -257,5 +259,5 @@ interface ServerRequestInterface extends RequestInterface
      * @param string $name The attribute name.
      * @return static
      */
-    public function withoutAttribute($name);
+    public function withoutAttribute(string $name);
 }
diff --git a/advancedcontentfilter/vendor/psr/http-message/src/StreamInterface.php b/advancedcontentfilter/vendor/psr/http-message/src/StreamInterface.php
index f68f3912..59246639 100644
--- a/advancedcontentfilter/vendor/psr/http-message/src/StreamInterface.php
+++ b/advancedcontentfilter/vendor/psr/http-message/src/StreamInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Psr\Http\Message;
 
 /**
@@ -84,7 +86,7 @@ interface StreamInterface
      *     SEEK_END: Set position to end-of-stream plus offset.
      * @throws \RuntimeException on failure.
      */
-    public function seek($offset, $whence = SEEK_SET);
+    public function seek(int $offset, int $whence = SEEK_SET);
 
     /**
      * Seek to the beginning of the stream.
@@ -112,7 +114,7 @@ interface StreamInterface
      * @return int Returns the number of bytes written to the stream.
      * @throws \RuntimeException on failure.
      */
-    public function write($string);
+    public function write(string $string);
 
     /**
      * Returns whether or not the stream is readable.
@@ -131,7 +133,7 @@ interface StreamInterface
      *     if no bytes are available.
      * @throws \RuntimeException if an error occurs.
      */
-    public function read($length);
+    public function read(int $length);
 
     /**
      * Returns the remaining contents in a string
@@ -149,10 +151,10 @@ interface StreamInterface
      * stream_get_meta_data() function.
      *
      * @link http://php.net/manual/en/function.stream-get-meta-data.php
-     * @param string $key Specific metadata to retrieve.
+     * @param string|null $key Specific metadata to retrieve.
      * @return array|mixed|null Returns an associative array if no key is
      *     provided. Returns a specific key value if a key is provided and the
      *     value is found, or null if the key is not found.
      */
-    public function getMetadata($key = null);
+    public function getMetadata(?string $key = null);
 }
diff --git a/advancedcontentfilter/vendor/psr/http-message/src/UploadedFileInterface.php b/advancedcontentfilter/vendor/psr/http-message/src/UploadedFileInterface.php
index f8a6901e..aba63215 100644
--- a/advancedcontentfilter/vendor/psr/http-message/src/UploadedFileInterface.php
+++ b/advancedcontentfilter/vendor/psr/http-message/src/UploadedFileInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Psr\Http\Message;
 
 /**
@@ -62,7 +64,7 @@ interface UploadedFileInterface
      * @throws \RuntimeException on any error during the move operation, or on
      *     the second or subsequent call to the method.
      */
-    public function moveTo($targetPath);
+    public function moveTo(string $targetPath);
     
     /**
      * Retrieve the file size.
diff --git a/advancedcontentfilter/vendor/psr/http-message/src/UriInterface.php b/advancedcontentfilter/vendor/psr/http-message/src/UriInterface.php
index 9d7ab9ea..d974de0d 100644
--- a/advancedcontentfilter/vendor/psr/http-message/src/UriInterface.php
+++ b/advancedcontentfilter/vendor/psr/http-message/src/UriInterface.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace Psr\Http\Message;
 
 /**
@@ -188,7 +191,7 @@ interface UriInterface
      * @return static A new instance with the specified scheme.
      * @throws \InvalidArgumentException for invalid or unsupported schemes.
      */
-    public function withScheme($scheme);
+    public function withScheme(string $scheme);
 
     /**
      * Return an instance with the specified user information.
@@ -204,7 +207,7 @@ interface UriInterface
      * @param null|string $password The password associated with $user.
      * @return static A new instance with the specified user information.
      */
-    public function withUserInfo($user, $password = null);
+    public function withUserInfo(string $user, ?string $password = null);
 
     /**
      * Return an instance with the specified host.
@@ -218,7 +221,7 @@ interface UriInterface
      * @return static A new instance with the specified host.
      * @throws \InvalidArgumentException for invalid hostnames.
      */
-    public function withHost($host);
+    public function withHost(string $host);
 
     /**
      * Return an instance with the specified port.
@@ -237,7 +240,7 @@ interface UriInterface
      * @return static A new instance with the specified port.
      * @throws \InvalidArgumentException for invalid ports.
      */
-    public function withPort($port);
+    public function withPort(?int $port);
 
     /**
      * Return an instance with the specified path.
@@ -261,7 +264,7 @@ interface UriInterface
      * @return static A new instance with the specified path.
      * @throws \InvalidArgumentException for invalid paths.
      */
-    public function withPath($path);
+    public function withPath(string $path);
 
     /**
      * Return an instance with the specified query string.
@@ -278,7 +281,7 @@ interface UriInterface
      * @return static A new instance with the specified query string.
      * @throws \InvalidArgumentException for invalid query strings.
      */
-    public function withQuery($query);
+    public function withQuery(string $query);
 
     /**
      * Return an instance with the specified URI fragment.
@@ -294,7 +297,7 @@ interface UriInterface
      * @param string $fragment The fragment to use with the new instance.
      * @return static A new instance with the specified fragment.
      */
-    public function withFragment($fragment);
+    public function withFragment(string $fragment);
 
     /**
      * Return the string representation as a URI reference.
diff --git a/advancedcontentfilter/vendor/psr/http-server-handler/LICENSE b/advancedcontentfilter/vendor/psr/http-server-handler/LICENSE
new file mode 100644
index 00000000..b71ec5df
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/http-server-handler/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 PHP Framework Interoperability Group
+
+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/advancedcontentfilter/vendor/psr/http-server-handler/README.md b/advancedcontentfilter/vendor/psr/http-server-handler/README.md
new file mode 100644
index 00000000..111a9ed2
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/http-server-handler/README.md
@@ -0,0 +1,12 @@
+HTTP Server Request Handlers for Middleware
+===========================================
+
+This repository holds the `RequestHandlerInterface` related to [PSR-15 (HTTP Server Request Handlers)][psr-url].
+
+Note that this is not a Server Request Handler implementation of its own. It is merely the interface that describe a Server Request Handler.
+
+The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist.
+
+[psr-url]: https://www.php-fig.org/psr/psr-15/
+[package-url]: https://packagist.org/packages/psr/http-server-handler
+[implementation-url]: https://packagist.org/providers/psr/http-server-handler-implementation
diff --git a/advancedcontentfilter/vendor/psr/http-server-handler/composer.json b/advancedcontentfilter/vendor/psr/http-server-handler/composer.json
new file mode 100644
index 00000000..c54b2dee
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/http-server-handler/composer.json
@@ -0,0 +1,36 @@
+{
+    "name": "psr/http-server-handler",
+    "description": "Common interface for HTTP server-side request handler",
+    "keywords": [
+        "psr",
+        "psr-7",
+        "psr-15",
+        "http-interop",
+        "http",
+        "server",
+        "handler",
+        "request",
+        "response"
+    ],
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "PHP-FIG",
+            "homepage": "https://www.php-fig.org/"
+        }
+    ],
+    "require": {
+        "php": ">=7.0",
+        "psr/http-message": "^1.0 || ^2.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Psr\\Http\\Server\\": "src/"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
+    }
+}
diff --git a/advancedcontentfilter/vendor/psr/http-server-handler/src/RequestHandlerInterface.php b/advancedcontentfilter/vendor/psr/http-server-handler/src/RequestHandlerInterface.php
new file mode 100644
index 00000000..83911e26
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/http-server-handler/src/RequestHandlerInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Psr\Http\Server;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+/**
+ * Handles a server request and produces a response.
+ *
+ * An HTTP request handler process an HTTP request in order to produce an
+ * HTTP response.
+ */
+interface RequestHandlerInterface
+{
+    /**
+     * Handles a request and produces a response.
+     *
+     * May call other collaborating code to generate the response.
+     */
+    public function handle(ServerRequestInterface $request): ResponseInterface;
+}
diff --git a/advancedcontentfilter/vendor/psr/http-server-middleware/LICENSE b/advancedcontentfilter/vendor/psr/http-server-middleware/LICENSE
new file mode 100644
index 00000000..b71ec5df
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/http-server-middleware/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 PHP Framework Interoperability Group
+
+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/advancedcontentfilter/vendor/psr/http-server-middleware/README.md b/advancedcontentfilter/vendor/psr/http-server-middleware/README.md
new file mode 100644
index 00000000..7b0a9550
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/http-server-middleware/README.md
@@ -0,0 +1,12 @@
+HTTP Server Middleware
+==============
+
+This repository holds the `MiddlewareInterface` related to [PSR-15 (HTTP Server Request Handlers)][psr-url].
+
+Note that this is not a Middleware implementation of its own. It is merely the interface that describe a Middleware.
+
+The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist.
+
+[psr-url]: https://www.php-fig.org/psr/psr-15/
+[package-url]: https://packagist.org/packages/psr/http-server-middleware
+[implementation-url]: https://packagist.org/providers/psr/http-server-middleware-implementation
diff --git a/advancedcontentfilter/vendor/psr/http-server-middleware/composer.json b/advancedcontentfilter/vendor/psr/http-server-middleware/composer.json
new file mode 100644
index 00000000..15116714
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/http-server-middleware/composer.json
@@ -0,0 +1,36 @@
+{
+    "name": "psr/http-server-middleware",
+    "description": "Common interface for HTTP server-side middleware",
+    "keywords": [
+        "psr",
+        "psr-7",
+        "psr-15",
+        "http-interop",
+        "http",
+        "middleware",
+        "request",
+        "response"
+    ],
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "PHP-FIG",
+            "homepage": "https://www.php-fig.org/"
+        }
+    ],
+    "require": {
+        "php": ">=7.0",
+        "psr/http-message": "^1.0 || ^2.0",
+        "psr/http-server-handler": "^1.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Psr\\Http\\Server\\": "src/"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
+    }
+}
diff --git a/advancedcontentfilter/vendor/psr/http-server-middleware/src/MiddlewareInterface.php b/advancedcontentfilter/vendor/psr/http-server-middleware/src/MiddlewareInterface.php
new file mode 100644
index 00000000..a6c14f8c
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/http-server-middleware/src/MiddlewareInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Psr\Http\Server;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+/**
+ * Participant in processing a server request and response.
+ *
+ * An HTTP middleware component participates in processing an HTTP message:
+ * by acting on the request, generating the response, or forwarding the
+ * request to a subsequent middleware and possibly acting on its response.
+ */
+interface MiddlewareInterface
+{
+    /**
+     * Process an incoming server request.
+     *
+     * Processes an incoming server request in order to produce a response.
+     * If unable to produce the response itself, it may delegate to the provided
+     * request handler to do so.
+     */
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface;
+}
diff --git a/advancedcontentfilter/vendor/psr/log/.gitignore b/advancedcontentfilter/vendor/psr/log/.gitignore
deleted file mode 100644
index 22d0d82f..00000000
--- a/advancedcontentfilter/vendor/psr/log/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vendor
diff --git a/advancedcontentfilter/vendor/psr/log/Psr/Log/AbstractLogger.php b/advancedcontentfilter/vendor/psr/log/Psr/Log/AbstractLogger.php
index 90e721af..e02f9daf 100644
--- a/advancedcontentfilter/vendor/psr/log/Psr/Log/AbstractLogger.php
+++ b/advancedcontentfilter/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/advancedcontentfilter/vendor/psr/log/Psr/Log/LoggerAwareTrait.php b/advancedcontentfilter/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
index 639f79bd..82bf45c8 100644
--- a/advancedcontentfilter/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
+++ b/advancedcontentfilter/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/advancedcontentfilter/vendor/psr/log/Psr/Log/LoggerInterface.php b/advancedcontentfilter/vendor/psr/log/Psr/Log/LoggerInterface.php
index 5ea72438..2206cfde 100644
--- a/advancedcontentfilter/vendor/psr/log/Psr/Log/LoggerInterface.php
+++ b/advancedcontentfilter/vendor/psr/log/Psr/Log/LoggerInterface.php
@@ -22,8 +22,8 @@ interface LoggerInterface
     /**
      * System is unusable.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -35,8 +35,8 @@ interface 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
      */
@@ -47,8 +47,8 @@ interface LoggerInterface
      *
      * Example: Application component unavailable, unexpected exception.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -58,8 +58,8 @@ interface 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
      */
@@ -71,8 +71,8 @@ interface 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
      */
@@ -81,8 +81,8 @@ interface LoggerInterface
     /**
      * Normal but significant events.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -93,8 +93,8 @@ interface LoggerInterface
      *
      * Example: User logs in, SQL logs.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -103,8 +103,8 @@ interface LoggerInterface
     /**
      * Detailed debug information.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -113,11 +113,13 @@ interface LoggerInterface
     /**
      * Logs with an arbitrary level.
      *
-     * @param mixed  $level
-     * @param string $message
-     * @param array  $context
+     * @param mixed   $level
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
+     *
+     * @throws \Psr\Log\InvalidArgumentException
      */
     public function log($level, $message, array $context = array());
 }
diff --git a/advancedcontentfilter/vendor/psr/log/Psr/Log/LoggerTrait.php b/advancedcontentfilter/vendor/psr/log/Psr/Log/LoggerTrait.php
index 867225df..e392fef0 100644
--- a/advancedcontentfilter/vendor/psr/log/Psr/Log/LoggerTrait.php
+++ b/advancedcontentfilter/vendor/psr/log/Psr/Log/LoggerTrait.php
@@ -135,6 +135,8 @@ trait LoggerTrait
      * @param array  $context
      *
      * @return void
+     *
+     * @throws \Psr\Log\InvalidArgumentException
      */
     abstract public function log($level, $message, array $context = array());
 }
diff --git a/advancedcontentfilter/vendor/psr/log/Psr/Log/NullLogger.php b/advancedcontentfilter/vendor/psr/log/Psr/Log/NullLogger.php
index d8cd682c..c8f7293b 100644
--- a/advancedcontentfilter/vendor/psr/log/Psr/Log/NullLogger.php
+++ b/advancedcontentfilter/vendor/psr/log/Psr/Log/NullLogger.php
@@ -20,6 +20,8 @@ class NullLogger extends AbstractLogger
      * @param array  $context
      *
      * @return void
+     *
+     * @throws \Psr\Log\InvalidArgumentException
      */
     public function log($level, $message, array $context = array())
     {
diff --git a/advancedcontentfilter/vendor/psr/log/Psr/Log/Test/DummyTest.php b/advancedcontentfilter/vendor/psr/log/Psr/Log/Test/DummyTest.php
new file mode 100644
index 00000000..9638c110
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/log/Psr/Log/Test/DummyTest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Psr\Log\Test;
+
+/**
+ * This class is internal and does not follow the BC promise.
+ *
+ * Do NOT use this class in any way.
+ *
+ * @internal
+ */
+class DummyTest
+{
+    public function __toString()
+    {
+        return 'DummyTest';
+    }
+}
diff --git a/advancedcontentfilter/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php b/advancedcontentfilter/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
index a0391a52..e1e5354d 100644
--- a/advancedcontentfilter/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
+++ b/advancedcontentfilter/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
@@ -4,6 +4,7 @@ namespace Psr\Log\Test;
 
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Provides a base test class for ensuring compliance with the LoggerInterface.
@@ -11,7 +12,7 @@ use Psr\Log\LogLevel;
  * Implementors can extend the class and implement abstract methods to run this
  * as part of their test suite.
  */
-abstract class LoggerInterfaceTest extends \PHPUnit_Framework_TestCase
+abstract class LoggerInterfaceTest extends TestCase
 {
     /**
      * @return LoggerInterface
@@ -101,6 +102,9 @@ abstract class LoggerInterfaceTest extends \PHPUnit_Framework_TestCase
 
     public function testContextCanContainAnything()
     {
+        $closed = fopen('php://memory', 'r');
+        fclose($closed);
+
         $context = array(
             'bool' => true,
             'null' => null,
@@ -110,6 +114,7 @@ abstract class LoggerInterfaceTest extends \PHPUnit_Framework_TestCase
             'nested' => array('with object' => new DummyTest),
             'object' => new \DateTime,
             'resource' => fopen('php://memory', 'r'),
+            'closed' => $closed,
         );
 
         $this->getLogger()->warning('Crazy context data', $context);
@@ -131,10 +136,3 @@ abstract class LoggerInterfaceTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $this->getLogs());
     }
 }
-
-class DummyTest
-{
-    public function __toString()
-    {
-    }
-}
diff --git a/advancedcontentfilter/vendor/psr/log/Psr/Log/Test/TestLogger.php b/advancedcontentfilter/vendor/psr/log/Psr/Log/Test/TestLogger.php
new file mode 100644
index 00000000..1be32304
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/log/Psr/Log/Test/TestLogger.php
@@ -0,0 +1,147 @@
+<?php
+
+namespace Psr\Log\Test;
+
+use Psr\Log\AbstractLogger;
+
+/**
+ * Used for testing purposes.
+ *
+ * It records all records and gives you access to them for verification.
+ *
+ * @method bool hasEmergency($record)
+ * @method bool hasAlert($record)
+ * @method bool hasCritical($record)
+ * @method bool hasError($record)
+ * @method bool hasWarning($record)
+ * @method bool hasNotice($record)
+ * @method bool hasInfo($record)
+ * @method bool hasDebug($record)
+ *
+ * @method bool hasEmergencyRecords()
+ * @method bool hasAlertRecords()
+ * @method bool hasCriticalRecords()
+ * @method bool hasErrorRecords()
+ * @method bool hasWarningRecords()
+ * @method bool hasNoticeRecords()
+ * @method bool hasInfoRecords()
+ * @method bool hasDebugRecords()
+ *
+ * @method bool hasEmergencyThatContains($message)
+ * @method bool hasAlertThatContains($message)
+ * @method bool hasCriticalThatContains($message)
+ * @method bool hasErrorThatContains($message)
+ * @method bool hasWarningThatContains($message)
+ * @method bool hasNoticeThatContains($message)
+ * @method bool hasInfoThatContains($message)
+ * @method bool hasDebugThatContains($message)
+ *
+ * @method bool hasEmergencyThatMatches($message)
+ * @method bool hasAlertThatMatches($message)
+ * @method bool hasCriticalThatMatches($message)
+ * @method bool hasErrorThatMatches($message)
+ * @method bool hasWarningThatMatches($message)
+ * @method bool hasNoticeThatMatches($message)
+ * @method bool hasInfoThatMatches($message)
+ * @method bool hasDebugThatMatches($message)
+ *
+ * @method bool hasEmergencyThatPasses($message)
+ * @method bool hasAlertThatPasses($message)
+ * @method bool hasCriticalThatPasses($message)
+ * @method bool hasErrorThatPasses($message)
+ * @method bool hasWarningThatPasses($message)
+ * @method bool hasNoticeThatPasses($message)
+ * @method bool hasInfoThatPasses($message)
+ * @method bool hasDebugThatPasses($message)
+ */
+class TestLogger extends AbstractLogger
+{
+    /**
+     * @var array
+     */
+    public $records = [];
+
+    public $recordsByLevel = [];
+
+    /**
+     * @inheritdoc
+     */
+    public function log($level, $message, array $context = [])
+    {
+        $record = [
+            'level' => $level,
+            'message' => $message,
+            'context' => $context,
+        ];
+
+        $this->recordsByLevel[$record['level']][] = $record;
+        $this->records[] = $record;
+    }
+
+    public function hasRecords($level)
+    {
+        return isset($this->recordsByLevel[$level]);
+    }
+
+    public function hasRecord($record, $level)
+    {
+        if (is_string($record)) {
+            $record = ['message' => $record];
+        }
+        return $this->hasRecordThatPasses(function ($rec) use ($record) {
+            if ($rec['message'] !== $record['message']) {
+                return false;
+            }
+            if (isset($record['context']) && $rec['context'] !== $record['context']) {
+                return false;
+            }
+            return true;
+        }, $level);
+    }
+
+    public function hasRecordThatContains($message, $level)
+    {
+        return $this->hasRecordThatPasses(function ($rec) use ($message) {
+            return strpos($rec['message'], $message) !== false;
+        }, $level);
+    }
+
+    public function hasRecordThatMatches($regex, $level)
+    {
+        return $this->hasRecordThatPasses(function ($rec) use ($regex) {
+            return preg_match($regex, $rec['message']) > 0;
+        }, $level);
+    }
+
+    public function hasRecordThatPasses(callable $predicate, $level)
+    {
+        if (!isset($this->recordsByLevel[$level])) {
+            return false;
+        }
+        foreach ($this->recordsByLevel[$level] as $i => $rec) {
+            if (call_user_func($predicate, $rec, $i)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public function __call($method, $args)
+    {
+        if (preg_match('/(.*)(Debug|Info|Notice|Warning|Error|Critical|Alert|Emergency)(.*)/', $method, $matches) > 0) {
+            $genericMethod = $matches[1] . ('Records' !== $matches[3] ? 'Record' : '') . $matches[3];
+            $level = strtolower($matches[2]);
+            if (method_exists($this, $genericMethod)) {
+                $args[] = $level;
+                return call_user_func_array([$this, $genericMethod], $args);
+            }
+        }
+        throw new \BadMethodCallException('Call to undefined method ' . get_class($this) . '::' . $method . '()');
+    }
+
+    public function reset()
+    {
+        $this->records = [];
+        $this->recordsByLevel = [];
+    }
+}
diff --git a/advancedcontentfilter/vendor/psr/log/README.md b/advancedcontentfilter/vendor/psr/log/README.md
index 574bc1cb..a9f20c43 100644
--- a/advancedcontentfilter/vendor/psr/log/README.md
+++ b/advancedcontentfilter/vendor/psr/log/README.md
@@ -7,6 +7,13 @@ This repository holds all interfaces/classes/traits related to
 Note that this is not a logger of its own. It is merely an interface that
 describes a logger. See the specification for more details.
 
+Installation
+------------
+
+```bash
+composer require psr/log
+```
+
 Usage
 -----
 
@@ -31,6 +38,12 @@ class Foo
         if ($this->logger) {
             $this->logger->info('Doing work');
         }
+           
+        try {
+            $this->doSomethingElse();
+        } catch (Exception $exception) {
+            $this->logger->error('Oh no!', array('exception' => $exception));
+        }
 
         // do something useful
     }
diff --git a/advancedcontentfilter/vendor/psr/log/composer.json b/advancedcontentfilter/vendor/psr/log/composer.json
index 87934d70..ca056953 100644
--- a/advancedcontentfilter/vendor/psr/log/composer.json
+++ b/advancedcontentfilter/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": {
@@ -20,7 +20,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "1.1.x-dev"
         }
     }
 }
diff --git a/advancedcontentfilter/vendor/slim/slim/CHANGELOG.md b/advancedcontentfilter/vendor/slim/slim/CHANGELOG.md
new file mode 100644
index 00000000..6bcb127d
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/CHANGELOG.md
@@ -0,0 +1,237 @@
+# Changelog
+
+# 4.11.0 - 2022-11-06
+- [3180: Declare types](https://github.com/slimphp/Slim/pull/3180) thanks to @nbayramberdiyev
+- [3181: Update laminas/laminas-diactoros requirement from ^2.8 to ^2.9](https://github.com/slimphp/Slim/pull/3181) thanks to @dependabot[bot]
+- [3182: Update guzzlehttp/psr7 requirement from ^2.1 to ^2.2](https://github.com/slimphp/Slim/pull/3182) thanks to @dependabot[bot]
+- [3183: Update phpstan/phpstan requirement from ^1.4 to ^1.5](https://github.com/slimphp/Slim/pull/3183) thanks to @dependabot[bot]
+- [3184: Update adriansuter/php-autoload-override requirement from ^1.2 to ^1.3](https://github.com/slimphp/Slim/pull/3184) thanks to @dependabot[bot]
+- [3189: Update phpstan/phpstan requirement from ^1.5 to ^1.6](https://github.com/slimphp/Slim/pull/3189) thanks to @dependabot[bot]
+- [3191: Adding property types to Middleware classes](https://github.com/slimphp/Slim/pull/3191) thanks to @ashleycoles
+- [3193: Handlers types](https://github.com/slimphp/Slim/pull/3193) thanks to @ashleycoles
+- [3194: Adding types to AbstractErrorRenderer](https://github.com/slimphp/Slim/pull/3194) thanks to @ashleycoles
+- [3195: Adding prop types for Exception classes](https://github.com/slimphp/Slim/pull/3195) thanks to @ashleycoles
+- [3196: Adding property type declarations for Factory classes](https://github.com/slimphp/Slim/pull/3196) thanks to @ashleycoles
+- [3197: Remove redundant docblock types](https://github.com/slimphp/Slim/pull/3197) thanks to @theodorejb
+- [3199: Update laminas/laminas-diactoros requirement from ^2.9 to ^2.11](https://github.com/slimphp/Slim/pull/3199) thanks to @dependabot[bot]
+- [3200: Update phpstan/phpstan requirement from ^1.6 to ^1.7](https://github.com/slimphp/Slim/pull/3200) thanks to @dependabot[bot]
+- [3205: Update guzzlehttp/psr7 requirement from ^2.2 to ^2.4](https://github.com/slimphp/Slim/pull/3205) thanks to @dependabot[bot]
+- [3206: Update squizlabs/php_codesniffer requirement from ^3.6 to ^3.7](https://github.com/slimphp/Slim/pull/3206) thanks to @dependabot[bot]
+- [3207: Update phpstan/phpstan requirement from ^1.7 to ^1.8](https://github.com/slimphp/Slim/pull/3207) thanks to @dependabot[bot]
+- [3211: Assign null coalescing to coalesce equal](https://github.com/slimphp/Slim/pull/3211) thanks to @MathiasReker
+- [3213: Void return](https://github.com/slimphp/Slim/pull/3213) thanks to @MathiasReker
+- [3214: Is null](https://github.com/slimphp/Slim/pull/3214) thanks to @MathiasReker
+- [3216: Refactor](https://github.com/slimphp/Slim/pull/3216) thanks to @mehdihasanpour
+- [3218: Refactor some code](https://github.com/slimphp/Slim/pull/3218) thanks to @mehdihasanpour
+- [3221: Cleanup](https://github.com/slimphp/Slim/pull/3221) thanks to @mehdihasanpour
+- [3225: Update laminas/laminas-diactoros requirement from ^2.11 to ^2.14](https://github.com/slimphp/Slim/pull/3225) thanks to @dependabot[bot]
+- [3228: Using assertSame to let assert equal be restricted](https://github.com/slimphp/Slim/pull/3228) thanks to @peter279k
+- [3229: Update laminas/laminas-diactoros requirement from ^2.14 to ^2.17](https://github.com/slimphp/Slim/pull/3229) thanks to @dependabot[bot]
+- [3235: Persist routes indexed by name in RouteCollector for improved performance.](https://github.com/slimphp/Slim/pull/3235) thanks to @BusterNeece
+
+# 4.10.0 - 2022-03-14
+- [3120: Add a new PSR-17 factory to Psr17FactoryProvider](https://github.com/slimphp/Slim/pull/3120) thanks to @solventt
+- [3123: Replace deprecated setMethods() in tests](https://github.com/slimphp/Slim/pull/3123) thanks to @solventt
+- [3126: Update guzzlehttp/psr7 requirement from ^2.0 to ^2.1](https://github.com/slimphp/Slim/pull/3126) thanks to @dependabot[bot]
+- [3127: PHPStan v1.0](https://github.com/slimphp/Slim/pull/3127) thanks to @t0mmy742
+- [3128: Update phpstan/phpstan requirement from ^1.0 to ^1.2](https://github.com/slimphp/Slim/pull/3128) thanks to @dependabot[bot]
+- [3129: Deprecate PHP 7.3](https://github.com/slimphp/Slim/pull/3129) thanks to @l0gicgate
+- [3130: Removed double defined PHP 7.4](https://github.com/slimphp/Slim/pull/3130) thanks to @flangofas
+- [3132: Add new `RequestResponseNamedArgs` route strategy](https://github.com/slimphp/Slim/pull/3132) thanks to @adoy
+- [3133: Improve typehinting for `RouteParserInterface`](https://github.com/slimphp/Slim/pull/3133) thanks to @jerowork
+- [3135: Update phpstan/phpstan requirement from ^1.2 to ^1.3](https://github.com/slimphp/Slim/pull/3135) thanks to @dependabot[bot]
+- [3137: Update phpspec/prophecy requirement from ^1.14 to ^1.15](https://github.com/slimphp/Slim/pull/3137) thanks to @dependabot[bot]
+- [3138: Update license year](https://github.com/slimphp/Slim/pull/3138) thanks to @Awilum
+- [3139: Fixed #1730 (reintroduced in 4.x)](https://github.com/slimphp/Slim/pull/3139) thanks to @adoy
+- [3145: Update phpstan/phpstan requirement from ^1.3 to ^1.4](https://github.com/slimphp/Slim/pull/3145) thanks to @dependabot[bot]
+- [3146: Inherit HttpException from RuntimeException](https://github.com/slimphp/Slim/pull/3146) thanks to @nbayramberdiyev
+- [3148: Upgrade to HTML5](https://github.com/slimphp/Slim/pull/3148) thanks to @nbayramberdiyev
+- [3172: Update nyholm/psr7 requirement from ^1.4 to ^1.5](https://github.com/slimphp/Slim/pull/3172) thanks to @dependabot[bot]
+
+# 4.9.0 - 2021-10-05
+- [3058: Implement exception class for Gone Http error](https://github.com/slimphp/Slim/pull/3058) thanks to @TheKernelPanic
+- [3086: Update slim/psr7 requirement from ^1.3 to ^1.4](https://github.com/slimphp/Slim/pull/3086) thanks to @dependabot[bot]
+- [3087: Update nyholm/psr7-server requirement from ^1.0.1 to ^1.0.2](https://github.com/slimphp/Slim/pull/3087) thanks to @dependabot[bot]
+- [3093: Update phpstan/phpstan requirement from ^0.12.85 to ^0.12.90](https://github.com/slimphp/Slim/pull/3093) thanks to @dependabot[bot]
+- [3099: Allow updated psr log](https://github.com/slimphp/Slim/pull/3099) thanks to @t0mmy742
+- [3104: Drop php7.2](https://github.com/slimphp/Slim/pull/3104) thanks to @t0mmy742
+- [3106: Use PSR-17 factory from Guzzle/psr7 2.0](https://github.com/slimphp/Slim/pull/3106) thanks to @t0mmy742
+- [3108: Update README file](https://github.com/slimphp/Slim/pull/3108) thanks to @t0mmy742
+- [3112: Update laminas/laminas-diactoros requirement from ^2.6 to ^2.8](https://github.com/slimphp/Slim/pull/3112) thanks to @dependabot[bot]
+- [3114: Update slim/psr7 requirement from ^1.4 to ^1.5](https://github.com/slimphp/Slim/pull/3114) thanks to @dependabot[bot]
+- [3115: Update phpstan/phpstan requirement from ^0.12.96 to ^0.12.99](https://github.com/slimphp/Slim/pull/3115) thanks to @dependabot[bot]
+- [3116: Remove Zend Diactoros references](https://github.com/slimphp/Slim/pull/3116) thanks to @l0gicgate
+
+# 4.8.0 - 2021-05-19
+- [3034: Fix phpunit dependency version](https://github.com/slimphp/Slim/pull/3034) thanks to @l0gicgate
+- [3037: Replace Travis by GitHub Actions](https://github.com/slimphp/Slim/pull/3037) thanks to @t0mmy742
+- [3043: Cover App creation from AppFactory with empty Container](https://github.com/slimphp/Slim/pull/3043) thanks to @t0mmy742
+- [3045: Update phpstan/phpstan requirement from ^0.12.58 to ^0.12.64](https://github.com/slimphp/Slim/pull/3045) thanks to @dependabot-preview[bot]
+- [3047: documentation: min php 7.2 required](https://github.com/slimphp/Slim/pull/3047) thanks to @Rotzbua
+- [3054: Update phpstan/phpstan requirement from ^0.12.64 to ^0.12.70](https://github.com/slimphp/Slim/pull/3054) thanks to @dependabot-preview[bot]
+- [3056: Fix docblock in ErrorMiddleware](https://github.com/slimphp/Slim/pull/3056) thanks to @piotr-cz
+- [3060: Update phpstan/phpstan requirement from ^0.12.70 to ^0.12.80](https://github.com/slimphp/Slim/pull/3060) thanks to @dependabot-preview[bot]
+- [3061: Update nyholm/psr7 requirement from ^1.3 to ^1.4](https://github.com/slimphp/Slim/pull/3061) thanks to @dependabot-preview[bot]
+- [3063: Allow ^1.0 || ^2.0 in psr/container](https://github.com/slimphp/Slim/pull/3063) thanks to @Ayesh
+- [3069: Classname/Method Callable Arrays](https://github.com/slimphp/Slim/pull/3069) thanks to @ddrv
+- [3078: Update squizlabs/php&#95;codesniffer requirement from ^3.5 to ^3.6](https://github.com/slimphp/Slim/pull/3078) thanks to @dependabot[bot]
+- [3079: Update phpspec/prophecy requirement from ^1.12 to ^1.13](https://github.com/slimphp/Slim/pull/3079) thanks to @dependabot[bot]
+- [3080: Update guzzlehttp/psr7 requirement from ^1.7 to ^1.8](https://github.com/slimphp/Slim/pull/3080) thanks to @dependabot[bot]
+- [3082: Update phpstan/phpstan requirement from ^0.12.80 to ^0.12.85](https://github.com/slimphp/Slim/pull/3082) thanks to @dependabot[bot]
+
+# 4.7.0 - 2020-11-30
+
+### Fixed
+- [3027: Fix: FastRoute dispatcher and data generator should match](https://github.com/slimphp/Slim/pull/3027) thanks to @edudobay
+
+### Added
+- [3015: PHP 8 support](https://github.com/slimphp/Slim/pull/3015) thanks to @edudobay
+
+### Optimizations
+- [3024: Randomize tests](https://github.com/slimphp/Slim/pull/3024) thanks to @pawel-slowik
+
+## 4.6.0 - 2020-11-15
+
+### Fixed
+- [2942: Fix PHPdoc for error handlers in ErrorMiddleware ](https://github.com/slimphp/Slim/pull/2942) thanks to @TiMESPLiNTER
+- [2944: Remove unused function in ErrorHandler](https://github.com/slimphp/Slim/pull/2944) thanks to @l0gicgate
+- [2960: Fix phpstan 0.12 errors](https://github.com/slimphp/Slim/pull/2960) thanks to @adriansuter
+- [2982: Removing cloning statements in tests](https://github.com/slimphp/Slim/pull/2982) thanks to @l0gicgate
+- [3017: Fix request creator factory test](https://github.com/slimphp/Slim/pull/3017) thanks to @pawel-slowik
+- [3022: Ensure RouteParser Always Present After Routing](https://github.com/slimphp/Slim/pull/3022) thanks to @l0gicgate
+
+### Added
+- [2949: Add the support in composer.json](https://github.com/slimphp/Slim/pull/2949) thanks to @ddrv
+- [2958: Strict empty string content type checking in BodyParsingMiddleware::getMediaType](https://github.com/slimphp/Slim/pull/2958) thanks to @Ayesh
+- [2997: Add hints to methods](https://github.com/slimphp/Slim/pull/2997) thanks to @evgsavosin - [3000: Fix route controller test](https://github.com/slimphp/Slim/pull/3000) thanks to @pawel-slowik
+- [3001: Add missing `$strategy` parameter in a Route test](https://github.com/slimphp/Slim/pull/3001) thanks to @pawel-slowik
+
+### Optimizations
+- [2951: Minor optimizations in if() blocks](https://github.com/slimphp/Slim/pull/2951) thanks to @Ayesh
+- [2959: Micro optimization: Declare closures in BodyParsingMiddleware as static](https://github.com/slimphp/Slim/pull/2959) thanks to @Ayesh
+- [2978: Split the routing results to its own function.](https://github.com/slimphp/Slim/pull/2978) thanks to @dlundgren
+
+### Dependencies Updated
+- [2953: Update nyholm/psr7-server requirement from ^0.4.1](https://github.com/slimphp/Slim/pull/2953) thanks to @dependabot-preview[bot]
+- [2954: Update laminas/laminas-diactoros requirement from ^2.1 to ^2.3](https://github.com/slimphp/Slim/pull/2954) thanks to @dependabot-preview[bot]
+- [2955: Update guzzlehttp/psr7 requirement from ^1.5 to ^1.6](https://github.com/slimphp/Slim/pull/2955) thanks to @dependabot-preview[bot]
+- [2956: Update slim/psr7 requirement from ^1.0 to ^1.1](https://github.com/slimphp/Slim/pull/2956) thanks to @dependabot-preview[bot]
+- [2957: Update nyholm/psr7 requirement from ^1.1 to ^1.2](https://github.com/slimphp/Slim/pull/2957) thanks to @dependabot-preview[bot]
+- [2963: Update phpstan/phpstan requirement from ^0.12.23 to ^0.12.25](https://github.com/slimphp/Slim/pull/2963) thanks to @dependabot-preview[bot]
+- [2965: Update adriansuter/php-autoload-override requirement from ^1.0 to ^1.1](https://github.com/slimphp/Slim/pull/2965) thanks to @dependabot-preview[bot]
+- [2967: Update nyholm/psr7 requirement from ^1.2 to ^1.3](https://github.com/slimphp/Slim/pull/2967) thanks to @dependabot-preview[bot]
+- [2969: Update nyholm/psr7-server requirement from ^0.4.1 to ^1.0.0](https://github.com/slimphp/Slim/pull/2969) thanks to @dependabot-preview[bot]
+- [2970: Update phpstan/phpstan requirement from ^0.12.25 to ^0.12.26](https://github.com/slimphp/Slim/pull/2970) thanks to @dependabot-preview[bot]
+- [2971: Update phpstan/phpstan requirement from ^0.12.26 to ^0.12.27](https://github.com/slimphp/Slim/pull/2971) thanks to @dependabot-preview[bot]
+- [2972: Update phpstan/phpstan requirement from ^0.12.27 to ^0.12.28](https://github.com/slimphp/Slim/pull/2972) thanks to @dependabot-preview[bot]
+- [2973: Update phpstan/phpstan requirement from ^0.12.28 to ^0.12.29](https://github.com/slimphp/Slim/pull/2973) thanks to @dependabot-preview[bot]
+- [2975: Update phpstan/phpstan requirement from ^0.12.29 to ^0.12.30](https://github.com/slimphp/Slim/pull/2975) thanks to @dependabot-preview[bot]
+- [2976: Update phpstan/phpstan requirement from ^0.12.30 to ^0.12.31](https://github.com/slimphp/Slim/pull/2976) thanks to @dependabot-preview[bot]
+- [2980: Update phpstan/phpstan requirement from ^0.12.31 to ^0.12.32](https://github.com/slimphp/Slim/pull/2980) thanks to @dependabot-preview[bot]
+- [2981: Update phpspec/prophecy requirement from ^1.10 to ^1.11](https://github.com/slimphp/Slim/pull/2981) thanks to @dependabot-preview[bot]
+- [2986: Update phpstan/phpstan requirement from ^0.12.32 to ^0.12.33](https://github.com/slimphp/Slim/pull/2986) thanks to @dependabot-preview[bot]
+- [2990: Update phpstan/phpstan requirement from ^0.12.33 to ^0.12.34](https://github.com/slimphp/Slim/pull/2990) thanks to @dependabot-preview[bot]
+- [2991: Update phpstan/phpstan requirement from ^0.12.34 to ^0.12.35](https://github.com/slimphp/Slim/pull/2991) thanks to @dependabot-preview[bot]
+- [2993: Update phpstan/phpstan requirement from ^0.12.35 to ^0.12.36](https://github.com/slimphp/Slim/pull/2993) thanks to @dependabot-preview[bot]
+- [2995: Update phpstan/phpstan requirement from ^0.12.36 to ^0.12.37](https://github.com/slimphp/Slim/pull/2995) thanks to @dependabot-preview[bot]
+- [3010: Update guzzlehttp/psr7 requirement from ^1.6 to ^1.7](https://github.com/slimphp/Slim/pull/3010) thanks to @dependabot-preview[bot]
+- [3011: Update phpspec/prophecy requirement from ^1.11 to ^1.12](https://github.com/slimphp/Slim/pull/3011) thanks to @dependabot-preview[bot]
+- [3012: Update slim/http requirement from ^1.0 to ^1.1](https://github.com/slimphp/Slim/pull/3012) thanks to @dependabot-preview[bot]
+- [3013: Update slim/psr7 requirement from ^1.1 to ^1.2](https://github.com/slimphp/Slim/pull/3013) thanks to @dependabot-preview[bot]
+- [3014: Update laminas/laminas-diactoros requirement from ^2.3 to ^2.4](https://github.com/slimphp/Slim/pull/3014) thanks to @dependabot-preview[bot]
+- [3018: Update phpstan/phpstan requirement from ^0.12.37 to ^0.12.54](https://github.com/slimphp/Slim/pull/3018) thanks to @dependabot-preview[bot]
+
+## 4.5.0 - 2020-04-14
+
+### Added
+- [2928](https://github.com/slimphp/Slim/pull/2928) Test against PHP 7.4
+- [2937](https://github.com/slimphp/Slim/pull/2937) Add support for PSR-3
+
+### Fixed
+- [2916](https://github.com/slimphp/Slim/pull/2916) Rename phpcs.xml to phpcs.xml.dist
+- [2917](https://github.com/slimphp/Slim/pull/2917) Update .editorconfig
+- [2925](https://github.com/slimphp/Slim/pull/2925) ResponseEmitter: Don't remove Content-Type and Content-Length when body is empt
+- [2932](https://github.com/slimphp/Slim/pull/2932) Update the Tidelift enterprise language
+- [2938](https://github.com/slimphp/Slim/pull/2938) Modify usage of deprecated expectExceptionMessageRegExp() method
+
+## 4.4.0 - 2020-01-04
+
+### Added
+- [2862](https://github.com/slimphp/Slim/pull/2862) Optionally handle subclasses of exceptions in custom error handler
+- [2869](https://github.com/slimphp/Slim/pull/2869) php-di/php-di added in composer suggestion
+- [2874](https://github.com/slimphp/Slim/pull/2874) Add `null` to param type-hints
+- [2889](https://github.com/slimphp/Slim/pull/2889) Make `RouteContext` attributes customizable and change default to use private names
+- [2907](https://github.com/slimphp/Slim/pull/2907) Migrate to PSR-12 convention
+- [2910](https://github.com/slimphp/Slim/pull/2910) Migrate Zend to Laminas
+- [2912](https://github.com/slimphp/Slim/pull/2912) Add Laminas PSR17 Factory
+- [2913](https://github.com/slimphp/Slim/pull/2913) Update php-autoload-override version
+- [2914](https://github.com/slimphp/Slim/pull/2914) Added ability to add handled exceptions as an array
+
+### Fixed
+- [2864](https://github.com/slimphp/Slim/pull/2864) Optimize error message in error handling if displayErrorDetails was not set
+- [2876](https://github.com/slimphp/Slim/pull/2876) Update links from http to https
+- [2877](https://github.com/slimphp/Slim/pull/2877) Fix docblock for `Slim\Routing\RouteCollector::cacheFile`
+- [2878](https://github.com/slimphp/Slim/pull/2878) check body is writable only on ouput buffering append
+- [2896](https://github.com/slimphp/Slim/pull/2896) Render errors uniformly
+- [2902](https://github.com/slimphp/Slim/pull/2902) Fix prophecies
+- [2908](https://github.com/slimphp/Slim/pull/2908) Use autoload-dev for `Slim\Tests` namespace
+
+### Removed
+- [2871](https://github.com/slimphp/Slim/pull/2871) Remove explicit type-hint
+- [2872](https://github.com/slimphp/Slim/pull/2872) Remove type-hint
+
+## 4.3.0 - 2019-10-05
+
+### Added
+- [2819](https://github.com/slimphp/Slim/pull/2819) Added description to addRoutingMiddleware()
+- [2820](https://github.com/slimphp/Slim/pull/2820) Update link to homepage in composer.json
+- [2828](https://github.com/slimphp/Slim/pull/2828) Allow URIs with leading multi-slashes
+- [2832](https://github.com/slimphp/Slim/pull/2832) Refactor `FastRouteDispatcher`
+- [2835](https://github.com/slimphp/Slim/pull/2835) Rename `pathFor` to `urlFor` in docblock
+- [2846](https://github.com/slimphp/Slim/pull/2846) Correcting the branch name as per issue-2843
+- [2849](https://github.com/slimphp/Slim/pull/2849) Create class alias for FastRoute\RouteCollector
+- [2855](https://github.com/slimphp/Slim/pull/2855) Add list of allowed methods to HttpMethodNotAllowedException
+- [2860](https://github.com/slimphp/Slim/pull/2860) Add base path to `$request` and use `RouteContext` to read
+
+### Fixed
+- [2839](https://github.com/slimphp/Slim/pull/2839) Fix description for handler signature in phpdocs
+- [2844](https://github.com/slimphp/Slim/pull/2844) Handle base path by routeCollector instead of RouteCollectorProxy
+- [2845](https://github.com/slimphp/Slim/pull/2845) Fix composer scripts
+- [2851](https://github.com/slimphp/Slim/pull/2851) Fix example of 'Hello World' app
+- [2854](https://github.com/slimphp/Slim/pull/2854) Fix undefined property in tests
+
+### Removed
+- [2853](https://github.com/slimphp/Slim/pull/2853) Remove unused classes
+
+## 4.2.0 - 2019-08-20
+
+### Added
+- [2787](https://github.com/slimphp/Slim/pull/2787) Add an advanced callable resolver
+- [2791](https://github.com/slimphp/Slim/pull/2791) Add `inferPrivatePropertyTypeFromConstructor` to phpstan
+- [2793](https://github.com/slimphp/Slim/pull/2793) Add ability to configure application via a container in `AppFactory`
+- [2798](https://github.com/slimphp/Slim/pull/2798) Add PSR-7 Agnostic Body Parsing Middleware
+- [2801](https://github.com/slimphp/Slim/pull/2801) Add `setLogErrorRenderer()` method to `ErrorHandler`
+- [2807](https://github.com/slimphp/Slim/pull/2807) Add check for Slim callable notation if no resolver given
+- [2803](https://github.com/slimphp/Slim/pull/2803) Add ability to emit non seekable streams in `ResponseEmitter`
+- [2817](https://github.com/slimphp/Slim/pull/2817) Add the ability to pass in a custom `MiddlewareDispatcherInterface` to the `App`
+
+### Fixed
+- [2789](https://github.com/slimphp/Slim/pull/2789) Fix Cookie header detection in `ResponseEmitter`
+- [2796](https://github.com/slimphp/Slim/pull/2796) Fix http message format
+- [2800](https://github.com/slimphp/Slim/pull/2800) Fix null comparisons more clear in `ErrorHandler`
+- [2802](https://github.com/slimphp/Slim/pull/2802) Fix incorrect search of a header in stack
+- [2806](https://github.com/slimphp/Slim/pull/2806) Simplify `Route::prepare()` method argument preparation
+- [2809](https://github.com/slimphp/Slim/pull/2809) Eliminate a duplicate code via HOF in `MiddlewareDispatcher`
+- [2816](https://github.com/slimphp/Slim/pull/2816) Fix RouteCollectorProxy::redirect() bug
+
+### Removed
+- [2811](https://github.com/slimphp/Slim/pull/2811) Remove `DeferredCallable`
+
+## 4.1.0 - 2019-08-06
+
+### Added
+- [#2779](https://github.com/slimphp/Slim/pull/2774) Add support for Slim callables `Class:method` resolution & Container Closure auto-binding in `MiddlewareDispatcher`
+- [#2774](https://github.com/slimphp/Slim/pull/2774) Add possibility for custom `RequestHandler` invocation strategies
+
+### Fixed
+- [#2776](https://github.com/slimphp/Slim/pull/2774) Fix group middleware on multiple nested groups
diff --git a/advancedcontentfilter/vendor/slim/slim/LICENSE.md b/advancedcontentfilter/vendor/slim/slim/LICENSE.md
index 682c21dc..d6fd559c 100644
--- a/advancedcontentfilter/vendor/slim/slim/LICENSE.md
+++ b/advancedcontentfilter/vendor/slim/slim/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2017 Josh Lockhart
+Copyright (c) 2011-2022 Josh Lockhart
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/advancedcontentfilter/vendor/slim/slim/MAINTAINERS.md b/advancedcontentfilter/vendor/slim/slim/MAINTAINERS.md
new file mode 100644
index 00000000..2b8ad049
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/MAINTAINERS.md
@@ -0,0 +1,17 @@
+# Maintainers
+
+There aren't many rules for maintainers of Slim to remember; what we have is listed here.
+
+## We don't merge our own PRs
+
+Our code is better if more than one set of eyes looks at it. Therefore we do not merge our own pull requests unless there is an exceptional circumstance. This helps to spot errors in the patch and also enables us to share information about the project around the maintainer team.
+
+## PRs tagged `WIP` are not ready to be merged
+
+Sometimes it's helpful to collaborate on a patch before it's ready to be merged. We use the text `WIP` (for _Work in Progress_) in the title to mark these PRs. 
+
+If a PR has `WIP` in its title, then it is not to be merged. The person who raised the PR will remove the `WIP` text when they are ready for a full review and merge.
+
+## Assign a merged PR to a milestone
+
+By ensuring that all merged PRs are assigned to a milestone, we can easily find which PRs were in which release.
diff --git a/advancedcontentfilter/vendor/slim/slim/SECURITY.md b/advancedcontentfilter/vendor/slim/slim/SECURITY.md
new file mode 100644
index 00000000..a5b6df0b
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/SECURITY.md
@@ -0,0 +1,14 @@
+# Security Policy
+
+### Supported Versions
+
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 3.x.x   | :white_check_mark: |
+| 4.x.x   | :white_check_mark: |
+
+
+### Reporting a Vulnerability
+
+To report a vulnerability please send an email to security@slimframework.com
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/App.php b/advancedcontentfilter/vendor/slim/slim/Slim/App.php
index c5a0f2d3..ebcc751f 100644
--- a/advancedcontentfilter/vendor/slim/slim/Slim/App.php
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/App.php
@@ -1,696 +1,216 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
  */
+
+declare(strict_types=1);
+
 namespace Slim;
 
-use Exception;
-use Slim\Exception\InvalidMethodException;
-use Slim\Http\Response;
-use Throwable;
-use Closure;
-use InvalidArgumentException;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
 use Psr\Container\ContainerInterface;
-use FastRoute\Dispatcher;
-use Slim\Exception\SlimException;
-use Slim\Exception\MethodNotAllowedException;
-use Slim\Exception\NotFoundException;
-use Slim\Http\Uri;
-use Slim\Http\Headers;
-use Slim\Http\Body;
-use Slim\Http\Request;
-use Slim\Interfaces\Http\EnvironmentInterface;
-use Slim\Interfaces\RouteGroupInterface;
-use Slim\Interfaces\RouteInterface;
-use Slim\Interfaces\RouterInterface;
+use Psr\Http\Message\ResponseFactoryInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use Psr\Log\LoggerInterface;
+use Slim\Factory\ServerRequestCreatorFactory;
+use Slim\Interfaces\CallableResolverInterface;
+use Slim\Interfaces\MiddlewareDispatcherInterface;
+use Slim\Interfaces\RouteCollectorInterface;
+use Slim\Interfaces\RouteResolverInterface;
+use Slim\Middleware\BodyParsingMiddleware;
+use Slim\Middleware\ErrorMiddleware;
+use Slim\Middleware\RoutingMiddleware;
+use Slim\Routing\RouteCollectorProxy;
+use Slim\Routing\RouteResolver;
+use Slim\Routing\RouteRunner;
 
-/**
- * App
- *
- * This is the primary class with which you instantiate,
- * configure, and run a Slim Framework application.
- * The \Slim\App class also accepts Slim Framework middleware.
- *
- * @property-read callable $errorHandler
- * @property-read callable $phpErrorHandler
- * @property-read callable $notFoundHandler function($request, $response)
- * @property-read callable $notAllowedHandler function($request, $response, $allowedHttpMethods)
- */
-class App
+use function strtoupper;
+
+class App extends RouteCollectorProxy implements RequestHandlerInterface
 {
-    use MiddlewareAwareTrait;
-
     /**
      * Current version
      *
      * @var string
      */
-    const VERSION = '3.9.2';
+    public const VERSION = '4.12.0';
 
-    /**
-     * Container
-     *
-     * @var ContainerInterface
-     */
-    private $container;
+    protected RouteResolverInterface $routeResolver;
 
-    /********************************************************************************
-     * Constructor
-     *******************************************************************************/
+    protected MiddlewareDispatcherInterface $middlewareDispatcher;
 
-    /**
-     * Create new application
-     *
-     * @param ContainerInterface|array $container Either a ContainerInterface or an associative array of app settings
-     * @throws InvalidArgumentException when no container is provided that implements ContainerInterface
-     */
-    public function __construct($container = [])
-    {
-        if (is_array($container)) {
-            $container = new Container($container);
-        }
-        if (!$container instanceof ContainerInterface) {
-            throw new InvalidArgumentException('Expected a ContainerInterface');
-        }
-        $this->container = $container;
-    }
+    public function __construct(
+        ResponseFactoryInterface $responseFactory,
+        ?ContainerInterface $container = null,
+        ?CallableResolverInterface $callableResolver = null,
+        ?RouteCollectorInterface $routeCollector = null,
+        ?RouteResolverInterface $routeResolver = null,
+        ?MiddlewareDispatcherInterface $middlewareDispatcher = null
+    ) {
+        parent::__construct(
+            $responseFactory,
+            $callableResolver ?? new CallableResolver($container),
+            $container,
+            $routeCollector
+        );
 
-    /**
-     * Enable access to the DI container by consumers of $app
-     *
-     * @return ContainerInterface
-     */
-    public function getContainer()
-    {
-        return $this->container;
-    }
+        $this->routeResolver = $routeResolver ?? new RouteResolver($this->routeCollector);
+        $routeRunner = new RouteRunner($this->routeResolver, $this->routeCollector->getRouteParser(), $this);
 
-    /**
-     * Add middleware
-     *
-     * This method prepends new middleware to the app's middleware stack.
-     *
-     * @param  callable|string    $callable The callback routine
-     *
-     * @return static
-     */
-    public function add($callable)
-    {
-        return $this->addMiddleware(new DeferredCallable($callable, $this->container));
-    }
-
-    /**
-     * Calling a non-existant method on App checks to see if there's an item
-     * in the container that is callable and if so, calls it.
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return mixed
-     */
-    public function __call($method, $args)
-    {
-        if ($this->container->has($method)) {
-            $obj = $this->container->get($method);
-            if (is_callable($obj)) {
-                return call_user_func_array($obj, $args);
-            }
+        if (!$middlewareDispatcher) {
+            $middlewareDispatcher = new MiddlewareDispatcher($routeRunner, $this->callableResolver, $container);
+        } else {
+            $middlewareDispatcher->seedMiddlewareStack($routeRunner);
         }
 
-        throw new \BadMethodCallException("Method $method is not a valid method");
-    }
-
-    /********************************************************************************
-     * Router proxy methods
-     *******************************************************************************/
-
-    /**
-     * Add GET route
-     *
-     * @param  string $pattern  The route URI pattern
-     * @param  callable|string  $callable The route callback routine
-     *
-     * @return \Slim\Interfaces\RouteInterface
-     */
-    public function get($pattern, $callable)
-    {
-        return $this->map(['GET'], $pattern, $callable);
+        $this->middlewareDispatcher = $middlewareDispatcher;
     }
 
     /**
-     * Add POST route
-     *
-     * @param  string $pattern  The route URI pattern
-     * @param  callable|string  $callable The route callback routine
-     *
-     * @return \Slim\Interfaces\RouteInterface
+     * @return RouteResolverInterface
      */
-    public function post($pattern, $callable)
+    public function getRouteResolver(): RouteResolverInterface
     {
-        return $this->map(['POST'], $pattern, $callable);
+        return $this->routeResolver;
     }
 
     /**
-     * Add PUT route
-     *
-     * @param  string $pattern  The route URI pattern
-     * @param  callable|string  $callable The route callback routine
-     *
-     * @return \Slim\Interfaces\RouteInterface
+     * @return MiddlewareDispatcherInterface
      */
-    public function put($pattern, $callable)
+    public function getMiddlewareDispatcher(): MiddlewareDispatcherInterface
     {
-        return $this->map(['PUT'], $pattern, $callable);
+        return $this->middlewareDispatcher;
     }
 
     /**
-     * Add PATCH route
-     *
-     * @param  string $pattern  The route URI pattern
-     * @param  callable|string  $callable The route callback routine
-     *
-     * @return \Slim\Interfaces\RouteInterface
+     * @param MiddlewareInterface|string|callable $middleware
      */
-    public function patch($pattern, $callable)
+    public function add($middleware): self
     {
-        return $this->map(['PATCH'], $pattern, $callable);
+        $this->middlewareDispatcher->add($middleware);
+        return $this;
     }
 
     /**
-     * Add DELETE route
-     *
-     * @param  string $pattern  The route URI pattern
-     * @param  callable|string  $callable The route callback routine
-     *
-     * @return \Slim\Interfaces\RouteInterface
+     * @param MiddlewareInterface $middleware
      */
-    public function delete($pattern, $callable)
+    public function addMiddleware(MiddlewareInterface $middleware): self
     {
-        return $this->map(['DELETE'], $pattern, $callable);
+        $this->middlewareDispatcher->addMiddleware($middleware);
+        return $this;
     }
 
     /**
-     * Add OPTIONS route
+     * Add the Slim built-in routing middleware to the app middleware stack
      *
-     * @param  string $pattern  The route URI pattern
-     * @param  callable|string  $callable The route callback routine
+     * This method can be used to control middleware order and is not required for default routing operation.
      *
-     * @return \Slim\Interfaces\RouteInterface
+     * @return RoutingMiddleware
      */
-    public function options($pattern, $callable)
+    public function addRoutingMiddleware(): RoutingMiddleware
     {
-        return $this->map(['OPTIONS'], $pattern, $callable);
+        $routingMiddleware = new RoutingMiddleware(
+            $this->getRouteResolver(),
+            $this->getRouteCollector()->getRouteParser()
+        );
+        $this->add($routingMiddleware);
+        return $routingMiddleware;
     }
 
     /**
-     * Add route for any HTTP method
+     * Add the Slim built-in error middleware to the app middleware stack
      *
-     * @param  string $pattern  The route URI pattern
-     * @param  callable|string  $callable The route callback routine
+     * @param bool                 $displayErrorDetails
+     * @param bool                 $logErrors
+     * @param bool                 $logErrorDetails
+     * @param LoggerInterface|null $logger
      *
-     * @return \Slim\Interfaces\RouteInterface
+     * @return ErrorMiddleware
      */
-    public function any($pattern, $callable)
-    {
-        return $this->map(['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'], $pattern, $callable);
+    public function addErrorMiddleware(
+        bool $displayErrorDetails,
+        bool $logErrors,
+        bool $logErrorDetails,
+        ?LoggerInterface $logger = null
+    ): ErrorMiddleware {
+        $errorMiddleware = new ErrorMiddleware(
+            $this->getCallableResolver(),
+            $this->getResponseFactory(),
+            $displayErrorDetails,
+            $logErrors,
+            $logErrorDetails,
+            $logger
+        );
+        $this->add($errorMiddleware);
+        return $errorMiddleware;
     }
 
     /**
-     * Add route with multiple methods
+     * Add the Slim body parsing middleware to the app middleware stack
      *
-     * @param  string[] $methods  Numeric array of HTTP method names
-     * @param  string   $pattern  The route URI pattern
-     * @param  callable|string    $callable The route callback routine
+     * @param callable[] $bodyParsers
      *
-     * @return RouteInterface
+     * @return BodyParsingMiddleware
      */
-    public function map(array $methods, $pattern, $callable)
+    public function addBodyParsingMiddleware(array $bodyParsers = []): BodyParsingMiddleware
     {
-        if ($callable instanceof Closure) {
-            $callable = $callable->bindTo($this->container);
-        }
-
-        $route = $this->container->get('router')->map($methods, $pattern, $callable);
-        if (is_callable([$route, 'setContainer'])) {
-            $route->setContainer($this->container);
-        }
-
-        if (is_callable([$route, 'setOutputBuffering'])) {
-            $route->setOutputBuffering($this->container->get('settings')['outputBuffering']);
-        }
-
-        return $route;
+        $bodyParsingMiddleware = new BodyParsingMiddleware($bodyParsers);
+        $this->add($bodyParsingMiddleware);
+        return $bodyParsingMiddleware;
     }
 
-    /**
-     * Route Groups
-     *
-     * This method accepts a route pattern and a callback. All route
-     * declarations in the callback will be prepended by the group(s)
-     * that it is in.
-     *
-     * @param string   $pattern
-     * @param callable $callable
-     *
-     * @return RouteGroupInterface
-     */
-    public function group($pattern, $callable)
-    {
-        /** @var RouteGroup $group */
-        $group = $this->container->get('router')->pushGroup($pattern, $callable);
-        $group->setContainer($this->container);
-        $group($this);
-        $this->container->get('router')->popGroup();
-        return $group;
-    }
-
-    /********************************************************************************
-     * Runner
-     *******************************************************************************/
-
     /**
      * Run application
      *
      * This method traverses the application middleware stack and then sends the
      * resultant Response object to the HTTP client.
      *
-     * @param bool|false $silent
-     * @return ResponseInterface
-     *
-     * @throws Exception
-     * @throws MethodNotAllowedException
-     * @throws NotFoundException
+     * @param ServerRequestInterface|null $request
+     * @return void
      */
-    public function run($silent = false)
+    public function run(?ServerRequestInterface $request = null): void
     {
-        $response = $this->container->get('response');
-
-        try {
-            ob_start();
-            $response = $this->process($this->container->get('request'), $response);
-        } catch (InvalidMethodException $e) {
-            $response = $this->processInvalidMethod($e->getRequest(), $response);
-        } finally {
-            $output = ob_get_clean();
+        if (!$request) {
+            $serverRequestCreator = ServerRequestCreatorFactory::create();
+            $request = $serverRequestCreator->createServerRequestFromGlobals();
         }
 
-        if (!empty($output) && $response->getBody()->isWritable()) {
-            $outputBuffering = $this->container->get('settings')['outputBuffering'];
-            if ($outputBuffering === 'prepend') {
-                // prepend output buffer content
-                $body = new Http\Body(fopen('php://temp', 'r+'));
-                $body->write($output . $response->getBody());
-                $response = $response->withBody($body);
-            } elseif ($outputBuffering === 'append') {
-                // append output buffer content
-                $response->getBody()->write($output);
-            }
-        }
-
-        $response = $this->finalize($response);
-
-        if (!$silent) {
-            $this->respond($response);
-        }
-
-        return $response;
+        $response = $this->handle($request);
+        $responseEmitter = new ResponseEmitter();
+        $responseEmitter->emit($response);
     }
 
     /**
-     * Pull route info for a request with a bad method to decide whether to
-     * return a not-found error (default) or a bad-method error, then run
-     * the handler for that error, returning the resulting response.
-     *
-     * Used for cases where an incoming request has an unrecognized method,
-     * rather than throwing an exception and not catching it all the way up.
-     *
-     * @param ServerRequestInterface $request
-     * @param ResponseInterface $response
-     * @return ResponseInterface
-     */
-    protected function processInvalidMethod(ServerRequestInterface $request, ResponseInterface $response)
-    {
-        $router = $this->container->get('router');
-        if (is_callable([$request->getUri(), 'getBasePath']) && is_callable([$router, 'setBasePath'])) {
-            $router->setBasePath($request->getUri()->getBasePath());
-        }
-
-        $request = $this->dispatchRouterAndPrepareRoute($request, $router);
-        $routeInfo = $request->getAttribute('routeInfo', [RouterInterface::DISPATCH_STATUS => Dispatcher::NOT_FOUND]);
-
-        if ($routeInfo[RouterInterface::DISPATCH_STATUS] === Dispatcher::METHOD_NOT_ALLOWED) {
-            return $this->handleException(
-                new MethodNotAllowedException($request, $response, $routeInfo[RouterInterface::ALLOWED_METHODS]),
-                $request,
-                $response
-            );
-        }
-
-        return $this->handleException(new NotFoundException($request, $response), $request, $response);
-    }
-
-    /**
-     * Process a request
+     * Handle a request
      *
      * This method traverses the application middleware stack and then returns the
      * resultant Response object.
      *
      * @param ServerRequestInterface $request
-     * @param ResponseInterface $response
      * @return ResponseInterface
-     *
-     * @throws Exception
-     * @throws MethodNotAllowedException
-     * @throws NotFoundException
      */
-    public function process(ServerRequestInterface $request, ResponseInterface $response)
+    public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        // Ensure basePath is set
-        $router = $this->container->get('router');
-        if (is_callable([$request->getUri(), 'getBasePath']) && is_callable([$router, 'setBasePath'])) {
-            $router->setBasePath($request->getUri()->getBasePath());
-        }
+        $response = $this->middlewareDispatcher->handle($request);
 
-        // Dispatch the Router first if the setting for this is on
-        if ($this->container->get('settings')['determineRouteBeforeAppMiddleware'] === true) {
-            // Dispatch router (note: you won't be able to alter routes after this)
-            $request = $this->dispatchRouterAndPrepareRoute($request, $router);
-        }
-
-        // Traverse middleware stack
-        try {
-            $response = $this->callMiddlewareStack($request, $response);
-        } catch (Exception $e) {
-            $response = $this->handleException($e, $request, $response);
-        } catch (Throwable $e) {
-            $response = $this->handlePhpError($e, $request, $response);
+        /**
+         * This is to be in compliance with RFC 2616, Section 9.
+         * If the incoming request method is HEAD, we need to ensure that the response body
+         * is empty as the request may fall back on a GET route handler due to FastRoute's
+         * routing logic which could potentially append content to the response body
+         * https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.4
+         */
+        $method = strtoupper($request->getMethod());
+        if ($method === 'HEAD') {
+            $emptyBody = $this->responseFactory->createResponse()->getBody();
+            return $response->withBody($emptyBody);
         }
 
         return $response;
     }
-
-    /**
-     * Send the response to the client
-     *
-     * @param ResponseInterface $response
-     */
-    public function respond(ResponseInterface $response)
-    {
-        // Send response
-        if (!headers_sent()) {
-            // Headers
-            foreach ($response->getHeaders() as $name => $values) {
-                foreach ($values as $value) {
-                    header(sprintf('%s: %s', $name, $value), false);
-                }
-            }
-
-            // Set the status _after_ the headers, because of PHP's "helpful" behavior with location headers.
-            // See https://github.com/slimphp/Slim/issues/1730
-
-            // Status
-            header(sprintf(
-                'HTTP/%s %s %s',
-                $response->getProtocolVersion(),
-                $response->getStatusCode(),
-                $response->getReasonPhrase()
-            ));
-        }
-
-        // Body
-        if (!$this->isEmptyResponse($response)) {
-            $body = $response->getBody();
-            if ($body->isSeekable()) {
-                $body->rewind();
-            }
-            $settings       = $this->container->get('settings');
-            $chunkSize      = $settings['responseChunkSize'];
-
-            $contentLength  = $response->getHeaderLine('Content-Length');
-            if (!$contentLength) {
-                $contentLength = $body->getSize();
-            }
-
-
-            if (isset($contentLength)) {
-                $amountToRead = $contentLength;
-                while ($amountToRead > 0 && !$body->eof()) {
-                    $data = $body->read(min($chunkSize, $amountToRead));
-                    echo $data;
-
-                    $amountToRead -= strlen($data);
-
-                    if (connection_status() != CONNECTION_NORMAL) {
-                        break;
-                    }
-                }
-            } else {
-                while (!$body->eof()) {
-                    echo $body->read($chunkSize);
-                    if (connection_status() != CONNECTION_NORMAL) {
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Invoke application
-     *
-     * This method implements the middleware interface. It receives
-     * Request and Response objects, and it returns a Response object
-     * after compiling the routes registered in the Router and dispatching
-     * the Request object to the appropriate Route callback routine.
-     *
-     * @param  ServerRequestInterface $request  The most recent Request object
-     * @param  ResponseInterface      $response The most recent Response object
-     *
-     * @return ResponseInterface
-     * @throws MethodNotAllowedException
-     * @throws NotFoundException
-     */
-    public function __invoke(ServerRequestInterface $request, ResponseInterface $response)
-    {
-        // Get the route info
-        $routeInfo = $request->getAttribute('routeInfo');
-
-        /** @var \Slim\Interfaces\RouterInterface $router */
-        $router = $this->container->get('router');
-
-        // If router hasn't been dispatched or the URI changed then dispatch
-        if (null === $routeInfo || ($routeInfo['request'] !== [$request->getMethod(), (string) $request->getUri()])) {
-            $request = $this->dispatchRouterAndPrepareRoute($request, $router);
-            $routeInfo = $request->getAttribute('routeInfo');
-        }
-
-        if ($routeInfo[0] === Dispatcher::FOUND) {
-            $route = $router->lookupRoute($routeInfo[1]);
-            return $route->run($request, $response);
-        } elseif ($routeInfo[0] === Dispatcher::METHOD_NOT_ALLOWED) {
-            if (!$this->container->has('notAllowedHandler')) {
-                throw new MethodNotAllowedException($request, $response, $routeInfo[1]);
-            }
-            /** @var callable $notAllowedHandler */
-            $notAllowedHandler = $this->container->get('notAllowedHandler');
-            return $notAllowedHandler($request, $response, $routeInfo[1]);
-        }
-
-        if (!$this->container->has('notFoundHandler')) {
-            throw new NotFoundException($request, $response);
-        }
-        /** @var callable $notFoundHandler */
-        $notFoundHandler = $this->container->get('notFoundHandler');
-        return $notFoundHandler($request, $response);
-    }
-
-    /**
-     * Perform a sub-request from within an application route
-     *
-     * This method allows you to prepare and initiate a sub-request, run within
-     * the context of the current request. This WILL NOT issue a remote HTTP
-     * request. Instead, it will route the provided URL, method, headers,
-     * cookies, body, and server variables against the set of registered
-     * application routes. The result response object is returned.
-     *
-     * @param  string            $method      The request method (e.g., GET, POST, PUT, etc.)
-     * @param  string            $path        The request URI path
-     * @param  string            $query       The request URI query string
-     * @param  array             $headers     The request headers (key-value array)
-     * @param  array             $cookies     The request cookies (key-value array)
-     * @param  string            $bodyContent The request body
-     * @param  ResponseInterface $response     The response object (optional)
-     * @return ResponseInterface
-     */
-    public function subRequest(
-        $method,
-        $path,
-        $query = '',
-        array $headers = [],
-        array $cookies = [],
-        $bodyContent = '',
-        ResponseInterface $response = null
-    ) {
-        $env = $this->container->get('environment');
-        $uri = Uri::createFromEnvironment($env)->withPath($path)->withQuery($query);
-        $headers = new Headers($headers);
-        $serverParams = $env->all();
-        $body = new Body(fopen('php://temp', 'r+'));
-        $body->write($bodyContent);
-        $body->rewind();
-        $request = new Request($method, $uri, $headers, $cookies, $serverParams, $body);
-
-        if (!$response) {
-            $response = $this->container->get('response');
-        }
-
-        return $this($request, $response);
-    }
-
-    /**
-     * Dispatch the router to find the route. Prepare the route for use.
-     *
-     * @param ServerRequestInterface $request
-     * @param RouterInterface        $router
-     * @return ServerRequestInterface
-     */
-    protected function dispatchRouterAndPrepareRoute(ServerRequestInterface $request, RouterInterface $router)
-    {
-        $routeInfo = $router->dispatch($request);
-
-        if ($routeInfo[0] === Dispatcher::FOUND) {
-            $routeArguments = [];
-            foreach ($routeInfo[2] as $k => $v) {
-                $routeArguments[$k] = urldecode($v);
-            }
-
-            $route = $router->lookupRoute($routeInfo[1]);
-            $route->prepare($request, $routeArguments);
-
-            // add route to the request's attributes in case a middleware or handler needs access to the route
-            $request = $request->withAttribute('route', $route);
-        }
-
-        $routeInfo['request'] = [$request->getMethod(), (string) $request->getUri()];
-
-        return $request->withAttribute('routeInfo', $routeInfo);
-    }
-
-    /**
-     * Finalize response
-     *
-     * @param ResponseInterface $response
-     * @return ResponseInterface
-     */
-    protected function finalize(ResponseInterface $response)
-    {
-        // stop PHP sending a Content-Type automatically
-        ini_set('default_mimetype', '');
-
-        if ($this->isEmptyResponse($response)) {
-            return $response->withoutHeader('Content-Type')->withoutHeader('Content-Length');
-        }
-
-        // Add Content-Length header if `addContentLengthHeader` setting is set
-        if (isset($this->container->get('settings')['addContentLengthHeader']) &&
-            $this->container->get('settings')['addContentLengthHeader'] == true) {
-            if (ob_get_length() > 0) {
-                throw new \RuntimeException("Unexpected data in output buffer. " .
-                    "Maybe you have characters before an opening <?php tag?");
-            }
-            $size = $response->getBody()->getSize();
-            if ($size !== null && !$response->hasHeader('Content-Length')) {
-                $response = $response->withHeader('Content-Length', (string) $size);
-            }
-        }
-
-        return $response;
-    }
-
-    /**
-     * Helper method, which returns true if the provided response must not output a body and false
-     * if the response could have a body.
-     *
-     * @see https://tools.ietf.org/html/rfc7231
-     *
-     * @param ResponseInterface $response
-     * @return bool
-     */
-    protected function isEmptyResponse(ResponseInterface $response)
-    {
-        if (method_exists($response, 'isEmpty')) {
-            return $response->isEmpty();
-        }
-
-        return in_array($response->getStatusCode(), [204, 205, 304]);
-    }
-
-    /**
-     * Call relevant handler from the Container if needed. If it doesn't exist,
-     * then just re-throw.
-     *
-     * @param  Exception $e
-     * @param  ServerRequestInterface $request
-     * @param  ResponseInterface $response
-     *
-     * @return ResponseInterface
-     * @throws Exception if a handler is needed and not found
-     */
-    protected function handleException(Exception $e, ServerRequestInterface $request, ResponseInterface $response)
-    {
-        if ($e instanceof MethodNotAllowedException) {
-            $handler = 'notAllowedHandler';
-            $params = [$e->getRequest(), $e->getResponse(), $e->getAllowedMethods()];
-        } elseif ($e instanceof NotFoundException) {
-            $handler = 'notFoundHandler';
-            $params = [$e->getRequest(), $e->getResponse(), $e];
-        } elseif ($e instanceof SlimException) {
-            // This is a Stop exception and contains the response
-            return $e->getResponse();
-        } else {
-            // Other exception, use $request and $response params
-            $handler = 'errorHandler';
-            $params = [$request, $response, $e];
-        }
-
-        if ($this->container->has($handler)) {
-            $callable = $this->container->get($handler);
-            // Call the registered handler
-            return call_user_func_array($callable, $params);
-        }
-
-        // No handlers found, so just throw the exception
-        throw $e;
-    }
-
-    /**
-     * Call relevant handler from the Container if needed. If it doesn't exist,
-     * then just re-throw.
-     *
-     * @param  Throwable $e
-     * @param  ServerRequestInterface $request
-     * @param  ResponseInterface $response
-     * @return ResponseInterface
-     * @throws Throwable
-     */
-    protected function handlePhpError(Throwable $e, ServerRequestInterface $request, ResponseInterface $response)
-    {
-        $handler = 'phpErrorHandler';
-        $params = [$request, $response, $e];
-
-        if ($this->container->has($handler)) {
-            $callable = $this->container->get($handler);
-            // Call the registered handler
-            return call_user_func_array($callable, $params);
-        }
-
-        // No handlers found, so just throw the exception
-        throw $e;
-    }
 }
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/CallableResolver.php b/advancedcontentfilter/vendor/slim/slim/Slim/CallableResolver.php
index 2211a329..66f225de 100644
--- a/advancedcontentfilter/vendor/slim/slim/Slim/CallableResolver.php
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/CallableResolver.php
@@ -1,110 +1,193 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
  */
+
+declare(strict_types=1);
+
 namespace Slim;
 
-use RuntimeException;
+use Closure;
 use Psr\Container\ContainerInterface;
-use Slim\Interfaces\CallableResolverInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use RuntimeException;
+use Slim\Interfaces\AdvancedCallableResolverInterface;
 
-/**
- * This class resolves a string of the format 'class:method' into a closure
- * that can be dispatched.
- */
-final class CallableResolver implements CallableResolverInterface
+use function class_exists;
+use function is_array;
+use function is_callable;
+use function is_object;
+use function is_string;
+use function json_encode;
+use function preg_match;
+use function sprintf;
+
+final class CallableResolver implements AdvancedCallableResolverInterface
 {
-    const CALLABLE_PATTERN = '!^([^\:]+)\:([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)$!';
+    public static string $callablePattern = '!^([^\:]+)\:([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)$!';
 
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
+    private ?ContainerInterface $container;
 
-    /**
-     * @param ContainerInterface $container
-     */
-    public function __construct(ContainerInterface $container)
+    public function __construct(?ContainerInterface $container = null)
     {
         $this->container = $container;
     }
 
     /**
-     * Resolve toResolve into a closure so that the router can dispatch.
+     * {@inheritdoc}
+     */
+    public function resolve($toResolve): callable
+    {
+        $toResolve = $this->prepareToResolve($toResolve);
+        if (is_callable($toResolve)) {
+            return $this->bindToContainer($toResolve);
+        }
+        $resolved = $toResolve;
+        if (is_string($toResolve)) {
+            $resolved = $this->resolveSlimNotation($toResolve);
+            $resolved[1] ??= '__invoke';
+        }
+        $callable = $this->assertCallable($resolved, $toResolve);
+        return $this->bindToContainer($callable);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function resolveRoute($toResolve): callable
+    {
+        return $this->resolveByPredicate($toResolve, [$this, 'isRoute'], 'handle');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function resolveMiddleware($toResolve): callable
+    {
+        return $this->resolveByPredicate($toResolve, [$this, 'isMiddleware'], 'process');
+    }
+
+    /**
+     * @param string|callable $toResolve
      *
-     * If toResolve is of the format 'class:method', then try to extract 'class'
-     * from the container otherwise instantiate it and then dispatch 'method'.
+     * @throws RuntimeException
+     */
+    private function resolveByPredicate($toResolve, callable $predicate, string $defaultMethod): callable
+    {
+        $toResolve = $this->prepareToResolve($toResolve);
+        if (is_callable($toResolve)) {
+            return $this->bindToContainer($toResolve);
+        }
+        $resolved = $toResolve;
+        if ($predicate($toResolve)) {
+            $resolved = [$toResolve, $defaultMethod];
+        }
+        if (is_string($toResolve)) {
+            [$instance, $method] = $this->resolveSlimNotation($toResolve);
+            if ($method === null && $predicate($instance)) {
+                $method = $defaultMethod;
+            }
+            $resolved = [$instance, $method ?? '__invoke'];
+        }
+        $callable = $this->assertCallable($resolved, $toResolve);
+        return $this->bindToContainer($callable);
+    }
+
+    /**
+     * @param mixed $toResolve
+     */
+    private function isRoute($toResolve): bool
+    {
+        return $toResolve instanceof RequestHandlerInterface;
+    }
+
+    /**
+     * @param mixed $toResolve
+     */
+    private function isMiddleware($toResolve): bool
+    {
+        return $toResolve instanceof MiddlewareInterface;
+    }
+
+    /**
+     * @throws RuntimeException
      *
+     * @return array{object, string|null} [Instance, Method Name]
+     */
+    private function resolveSlimNotation(string $toResolve): array
+    {
+        preg_match(CallableResolver::$callablePattern, $toResolve, $matches);
+        [$class, $method] = $matches ? [$matches[1], $matches[2]] : [$toResolve, null];
+
+        /** @var string $class */
+        /** @var string|null $method */
+        if ($this->container && $this->container->has($class)) {
+            $instance = $this->container->get($class);
+            if (!is_object($instance)) {
+                throw new RuntimeException(sprintf('%s container entry is not an object', $class));
+            }
+        } else {
+            if (!class_exists($class)) {
+                if ($method) {
+                    $class .= '::' . $method . '()';
+                }
+                throw new RuntimeException(sprintf('Callable %s does not exist', $class));
+            }
+            $instance = new $class($this->container);
+        }
+        return [$instance, $method];
+    }
+
+    /**
+     * @param mixed $resolved
      * @param mixed $toResolve
      *
-     * @return callable
-     *
-     * @throws RuntimeException if the callable does not exist
-     * @throws RuntimeException if the callable is not resolvable
+     * @throws RuntimeException
      */
-    public function resolve($toResolve)
+    private function assertCallable($resolved, $toResolve): callable
     {
-        if (is_callable($toResolve)) {
-            return $toResolve;
+        if (!is_callable($resolved)) {
+            if (is_callable($toResolve) || is_object($toResolve) || is_array($toResolve)) {
+                $formatedToResolve = ($toResolveJson = json_encode($toResolve)) !== false ? $toResolveJson : '';
+            } else {
+                $formatedToResolve = is_string($toResolve) ? $toResolve : '';
+            }
+            throw new RuntimeException(sprintf('%s is not resolvable', $formatedToResolve));
         }
-
-        if (!is_string($toResolve)) {
-            $this->assertCallable($toResolve);
-        }
-
-        // check for slim callable as "class:method"
-        if (preg_match(self::CALLABLE_PATTERN, $toResolve, $matches)) {
-            $resolved = $this->resolveCallable($matches[1], $matches[2]);
-            $this->assertCallable($resolved);
-
-            return $resolved;
-        }
-
-        $resolved = $this->resolveCallable($toResolve);
-        $this->assertCallable($resolved);
-
         return $resolved;
     }
 
-    /**
-     * Check if string is something in the DIC
-     * that's callable or is a class name which has an __invoke() method.
-     *
-     * @param string $class
-     * @param string $method
-     * @return callable
-     *
-     * @throws \RuntimeException if the callable does not exist
-     */
-    protected function resolveCallable($class, $method = '__invoke')
+    private function bindToContainer(callable $callable): callable
     {
-        if ($this->container->has($class)) {
-            return [$this->container->get($class), $method];
+        if (is_array($callable) && $callable[0] instanceof Closure) {
+            $callable = $callable[0];
         }
-
-        if (!class_exists($class)) {
-            throw new RuntimeException(sprintf('Callable %s does not exist', $class));
+        if ($this->container && $callable instanceof Closure) {
+            /** @var Closure $callable */
+            $callable = $callable->bindTo($this->container);
         }
-
-        return [new $class($this->container), $method];
+        return $callable;
     }
 
     /**
-     * @param Callable $callable
-     *
-     * @throws \RuntimeException if the callable is not resolvable
+     * @param string|callable $toResolve
+     * @return string|callable
      */
-    protected function assertCallable($callable)
+    private function prepareToResolve($toResolve)
     {
-        if (!is_callable($callable)) {
-            throw new RuntimeException(sprintf(
-                '%s is not resolvable',
-                is_array($callable) || is_object($callable) ? json_encode($callable) : $callable
-            ));
+        if (!is_array($toResolve)) {
+            return $toResolve;
         }
+        $candidate = $toResolve;
+        $class = array_shift($candidate);
+        $method = array_shift($candidate);
+        if (is_string($class) && is_string($method)) {
+            return $class . ':' . $method;
+        }
+        return $toResolve;
     }
 }
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/CallableResolverAwareTrait.php b/advancedcontentfilter/vendor/slim/slim/Slim/CallableResolverAwareTrait.php
deleted file mode 100644
index ffb4eb28..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/CallableResolverAwareTrait.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim;
-
-use RuntimeException;
-use Psr\Container\ContainerInterface;
-use Slim\Interfaces\CallableResolverInterface;
-
-/**
- * ResolveCallable
- *
- * This is an internal class that enables resolution of 'class:method' strings
- * into a closure. This class is an implementation detail and is used only inside
- * of the Slim application.
- *
- * @property ContainerInterface $container
- */
-trait CallableResolverAwareTrait
-{
-    /**
-     * Resolve a string of the format 'class:method' into a closure that the
-     * router can dispatch.
-     *
-     * @param callable|string $callable
-     *
-     * @return \Closure
-     *
-     * @throws RuntimeException If the string cannot be resolved as a callable
-     */
-    protected function resolveCallable($callable)
-    {
-        if (!$this->container instanceof ContainerInterface) {
-            return $callable;
-        }
-
-        /** @var CallableResolverInterface $resolver */
-        $resolver = $this->container->get('callableResolver');
-
-        return $resolver->resolve($callable);
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Collection.php b/advancedcontentfilter/vendor/slim/slim/Slim/Collection.php
deleted file mode 100644
index 728bb73e..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Collection.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim;
-
-use ArrayIterator;
-use Slim\Interfaces\CollectionInterface;
-
-/**
- * Collection
- *
- * This class provides a common interface used by many other
- * classes in a Slim application that manage "collections"
- * of data that must be inspected and/or manipulated
- */
-class Collection implements CollectionInterface
-{
-    /**
-     * The source data
-     *
-     * @var array
-     */
-    protected $data = [];
-
-    /**
-     * Create new collection
-     *
-     * @param array $items Pre-populate collection with this key-value array
-     */
-    public function __construct(array $items = [])
-    {
-        $this->replace($items);
-    }
-
-    /********************************************************************************
-     * Collection interface
-     *******************************************************************************/
-
-    /**
-     * Set collection item
-     *
-     * @param string $key   The data key
-     * @param mixed  $value The data value
-     */
-    public function set($key, $value)
-    {
-        $this->data[$key] = $value;
-    }
-
-    /**
-     * Get collection item for key
-     *
-     * @param string $key     The data key
-     * @param mixed  $default The default value to return if data key does not exist
-     *
-     * @return mixed The key's value, or the default value
-     */
-    public function get($key, $default = null)
-    {
-        return $this->has($key) ? $this->data[$key] : $default;
-    }
-
-    /**
-     * Add item to collection, replacing existing items with the same data key
-     *
-     * @param array $items Key-value array of data to append to this collection
-     */
-    public function replace(array $items)
-    {
-        foreach ($items as $key => $value) {
-            $this->set($key, $value);
-        }
-    }
-
-    /**
-     * Get all items in collection
-     *
-     * @return array The collection's source data
-     */
-    public function all()
-    {
-        return $this->data;
-    }
-
-    /**
-     * Get collection keys
-     *
-     * @return array The collection's source data keys
-     */
-    public function keys()
-    {
-        return array_keys($this->data);
-    }
-
-    /**
-     * Does this collection have a given key?
-     *
-     * @param string $key The data key
-     *
-     * @return bool
-     */
-    public function has($key)
-    {
-        return array_key_exists($key, $this->data);
-    }
-
-    /**
-     * Remove item from collection
-     *
-     * @param string $key The data key
-     */
-    public function remove($key)
-    {
-        unset($this->data[$key]);
-    }
-
-    /**
-     * Remove all items from collection
-     */
-    public function clear()
-    {
-        $this->data = [];
-    }
-
-    /********************************************************************************
-     * ArrayAccess interface
-     *******************************************************************************/
-
-    /**
-     * Does this collection have a given key?
-     *
-     * @param  string $key The data key
-     *
-     * @return bool
-     */
-    public function offsetExists($key)
-    {
-        return $this->has($key);
-    }
-
-    /**
-     * Get collection item for key
-     *
-     * @param string $key The data key
-     *
-     * @return mixed The key's value, or the default value
-     */
-    public function offsetGet($key)
-    {
-        return $this->get($key);
-    }
-
-    /**
-     * Set collection item
-     *
-     * @param string $key   The data key
-     * @param mixed  $value The data value
-     */
-    public function offsetSet($key, $value)
-    {
-        $this->set($key, $value);
-    }
-
-    /**
-     * Remove item from collection
-     *
-     * @param string $key The data key
-     */
-    public function offsetUnset($key)
-    {
-        $this->remove($key);
-    }
-
-    /**
-     * Get number of items in collection
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->data);
-    }
-
-    /********************************************************************************
-     * IteratorAggregate interface
-     *******************************************************************************/
-
-    /**
-     * Get collection iterator
-     *
-     * @return \ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->data);
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Container.php b/advancedcontentfilter/vendor/slim/slim/Slim/Container.php
deleted file mode 100644
index 1f713ac4..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Container.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim;
-
-use Interop\Container\ContainerInterface;
-use Interop\Container\Exception\ContainerException;
-use Pimple\Container as PimpleContainer;
-use Slim\Exception\ContainerValueNotFoundException;
-use Slim\Exception\ContainerException as SlimContainerException;
-
-/**
- * Slim's default DI container is Pimple.
- *
- * Slim\App expects a container that implements Psr\Container\ContainerInterface
- * with these service keys configured and ready for use:
- *
- *  - settings: an array or instance of \ArrayAccess
- *  - environment: an instance of \Slim\Interfaces\Http\EnvironmentInterface
- *  - request: an instance of \Psr\Http\Message\ServerRequestInterface
- *  - response: an instance of \Psr\Http\Message\ResponseInterface
- *  - router: an instance of \Slim\Interfaces\RouterInterface
- *  - foundHandler: an instance of \Slim\Interfaces\InvocationStrategyInterface
- *  - errorHandler: a callable with the signature: function($request, $response, $exception)
- *  - notFoundHandler: a callable with the signature: function($request, $response)
- *  - notAllowedHandler: a callable with the signature: function($request, $response, $allowedHttpMethods)
- *  - callableResolver: an instance of \Slim\Interfaces\CallableResolverInterface
- *
- * @property-read array settings
- * @property-read \Slim\Interfaces\Http\EnvironmentInterface environment
- * @property-read \Psr\Http\Message\ServerRequestInterface request
- * @property-read \Psr\Http\Message\ResponseInterface response
- * @property-read \Slim\Interfaces\RouterInterface router
- * @property-read \Slim\Interfaces\InvocationStrategyInterface foundHandler
- * @property-read callable errorHandler
- * @property-read callable notFoundHandler
- * @property-read callable notAllowedHandler
- * @property-read \Slim\Interfaces\CallableResolverInterface callableResolver
- */
-class Container extends PimpleContainer implements ContainerInterface
-{
-    /**
-     * Default settings
-     *
-     * @var array
-     */
-    private $defaultSettings = [
-        'httpVersion' => '1.1',
-        'responseChunkSize' => 4096,
-        'outputBuffering' => 'append',
-        'determineRouteBeforeAppMiddleware' => false,
-        'displayErrorDetails' => false,
-        'addContentLengthHeader' => true,
-        'routerCacheFile' => false,
-    ];
-
-    /**
-     * Create new container
-     *
-     * @param array $values The parameters or objects.
-     */
-    public function __construct(array $values = [])
-    {
-        parent::__construct($values);
-
-        $userSettings = isset($values['settings']) ? $values['settings'] : [];
-        $this->registerDefaultServices($userSettings);
-    }
-
-    /**
-     * This function registers the default services that Slim needs to work.
-     *
-     * All services are shared - that is, they are registered such that the
-     * same instance is returned on subsequent calls.
-     *
-     * @param array $userSettings Associative array of application settings
-     *
-     * @return void
-     */
-    private function registerDefaultServices($userSettings)
-    {
-        $defaultSettings = $this->defaultSettings;
-
-        /**
-         * This service MUST return an array or an
-         * instance of \ArrayAccess.
-         *
-         * @return array|\ArrayAccess
-         */
-        $this['settings'] = function () use ($userSettings, $defaultSettings) {
-            return new Collection(array_merge($defaultSettings, $userSettings));
-        };
-
-        $defaultProvider = new DefaultServicesProvider();
-        $defaultProvider->register($this);
-    }
-
-    /********************************************************************************
-     * Methods to satisfy Psr\Container\ContainerInterface
-     *******************************************************************************/
-
-    /**
-     * Finds an entry of the container by its identifier and returns it.
-     *
-     * @param string $id Identifier of the entry to look for.
-     *
-     * @throws ContainerValueNotFoundException  No entry was found for this identifier.
-     * @throws ContainerException               Error while retrieving the entry.
-     *
-     * @return mixed Entry.
-     */
-    public function get($id)
-    {
-        if (!$this->offsetExists($id)) {
-            throw new ContainerValueNotFoundException(sprintf('Identifier "%s" is not defined.', $id));
-        }
-        try {
-            return $this->offsetGet($id);
-        } catch (\InvalidArgumentException $exception) {
-            if ($this->exceptionThrownByContainer($exception)) {
-                throw new SlimContainerException(
-                    sprintf('Container error while retrieving "%s"', $id),
-                    null,
-                    $exception
-                );
-            } else {
-                throw $exception;
-            }
-        }
-    }
-
-    /**
-     * Tests whether an exception needs to be recast for compliance with Container-Interop.  This will be if the
-     * exception was thrown by Pimple.
-     *
-     * @param \InvalidArgumentException $exception
-     *
-     * @return bool
-     */
-    private function exceptionThrownByContainer(\InvalidArgumentException $exception)
-    {
-        $trace = $exception->getTrace()[0];
-
-        return $trace['class'] === PimpleContainer::class && $trace['function'] === 'offsetGet';
-    }
-
-    /**
-     * Returns true if the container can return an entry for the given identifier.
-     * Returns false otherwise.
-     *
-     * @param string $id Identifier of the entry to look for.
-     *
-     * @return boolean
-     */
-    public function has($id)
-    {
-        return $this->offsetExists($id);
-    }
-
-
-    /********************************************************************************
-     * Magic methods for convenience
-     *******************************************************************************/
-
-    public function __get($name)
-    {
-        return $this->get($name);
-    }
-
-    public function __isset($name)
-    {
-        return $this->has($name);
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/DefaultServicesProvider.php b/advancedcontentfilter/vendor/slim/slim/Slim/DefaultServicesProvider.php
deleted file mode 100644
index 13fe1fb3..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/DefaultServicesProvider.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Slim\Handlers\PhpError;
-use Slim\Handlers\Error;
-use Slim\Handlers\NotFound;
-use Slim\Handlers\NotAllowed;
-use Slim\Handlers\Strategies\RequestResponse;
-use Slim\Http\Environment;
-use Slim\Http\Headers;
-use Slim\Http\Request;
-use Slim\Http\Response;
-use Slim\Interfaces\CallableResolverInterface;
-use Slim\Interfaces\Http\EnvironmentInterface;
-use Slim\Interfaces\InvocationStrategyInterface;
-use Slim\Interfaces\RouterInterface;
-
-/**
- * Slim's default Service Provider.
- */
-class DefaultServicesProvider
-{
-    /**
-     * Register Slim's default services.
-     *
-     * @param Container $container A DI container implementing ArrayAccess and container-interop.
-     */
-    public function register($container)
-    {
-        if (!isset($container['environment'])) {
-            /**
-             * This service MUST return a shared instance
-             * of \Slim\Interfaces\Http\EnvironmentInterface.
-             *
-             * @return EnvironmentInterface
-             */
-            $container['environment'] = function () {
-                return new Environment($_SERVER);
-            };
-        }
-
-        if (!isset($container['request'])) {
-            /**
-             * PSR-7 Request object
-             *
-             * @param Container $container
-             *
-             * @return ServerRequestInterface
-             */
-            $container['request'] = function ($container) {
-                return Request::createFromEnvironment($container->get('environment'));
-            };
-        }
-
-        if (!isset($container['response'])) {
-            /**
-             * PSR-7 Response object
-             *
-             * @param Container $container
-             *
-             * @return ResponseInterface
-             */
-            $container['response'] = function ($container) {
-                $headers = new Headers(['Content-Type' => 'text/html; charset=UTF-8']);
-                $response = new Response(200, $headers);
-
-                return $response->withProtocolVersion($container->get('settings')['httpVersion']);
-            };
-        }
-
-        if (!isset($container['router'])) {
-            /**
-             * This service MUST return a SHARED instance
-             * of \Slim\Interfaces\RouterInterface.
-             *
-             * @param Container $container
-             *
-             * @return RouterInterface
-             */
-            $container['router'] = function ($container) {
-                $routerCacheFile = false;
-                if (isset($container->get('settings')['routerCacheFile'])) {
-                    $routerCacheFile = $container->get('settings')['routerCacheFile'];
-                }
-
-
-                $router = (new Router)->setCacheFile($routerCacheFile);
-                if (method_exists($router, 'setContainer')) {
-                    $router->setContainer($container);
-                }
-
-                return $router;
-            };
-        }
-
-        if (!isset($container['foundHandler'])) {
-            /**
-             * This service MUST return a SHARED instance
-             * of \Slim\Interfaces\InvocationStrategyInterface.
-             *
-             * @return InvocationStrategyInterface
-             */
-            $container['foundHandler'] = function () {
-                return new RequestResponse;
-            };
-        }
-
-        if (!isset($container['phpErrorHandler'])) {
-            /**
-             * This service MUST return a callable
-             * that accepts three arguments:
-             *
-             * 1. Instance of \Psr\Http\Message\ServerRequestInterface
-             * 2. Instance of \Psr\Http\Message\ResponseInterface
-             * 3. Instance of \Error
-             *
-             * The callable MUST return an instance of
-             * \Psr\Http\Message\ResponseInterface.
-             *
-             * @param Container $container
-             *
-             * @return callable
-             */
-            $container['phpErrorHandler'] = function ($container) {
-                return new PhpError($container->get('settings')['displayErrorDetails']);
-            };
-        }
-
-        if (!isset($container['errorHandler'])) {
-            /**
-             * This service MUST return a callable
-             * that accepts three arguments:
-             *
-             * 1. Instance of \Psr\Http\Message\ServerRequestInterface
-             * 2. Instance of \Psr\Http\Message\ResponseInterface
-             * 3. Instance of \Exception
-             *
-             * The callable MUST return an instance of
-             * \Psr\Http\Message\ResponseInterface.
-             *
-             * @param Container $container
-             *
-             * @return callable
-             */
-            $container['errorHandler'] = function ($container) {
-                return new Error(
-                    $container->get('settings')['displayErrorDetails']
-                );
-            };
-        }
-
-        if (!isset($container['notFoundHandler'])) {
-            /**
-             * This service MUST return a callable
-             * that accepts two arguments:
-             *
-             * 1. Instance of \Psr\Http\Message\ServerRequestInterface
-             * 2. Instance of \Psr\Http\Message\ResponseInterface
-             *
-             * The callable MUST return an instance of
-             * \Psr\Http\Message\ResponseInterface.
-             *
-             * @return callable
-             */
-            $container['notFoundHandler'] = function () {
-                return new NotFound;
-            };
-        }
-
-        if (!isset($container['notAllowedHandler'])) {
-            /**
-             * This service MUST return a callable
-             * that accepts three arguments:
-             *
-             * 1. Instance of \Psr\Http\Message\ServerRequestInterface
-             * 2. Instance of \Psr\Http\Message\ResponseInterface
-             * 3. Array of allowed HTTP methods
-             *
-             * The callable MUST return an instance of
-             * \Psr\Http\Message\ResponseInterface.
-             *
-             * @return callable
-             */
-            $container['notAllowedHandler'] = function () {
-                return new NotAllowed;
-            };
-        }
-
-        if (!isset($container['callableResolver'])) {
-            /**
-             * Instance of \Slim\Interfaces\CallableResolverInterface
-             *
-             * @param Container $container
-             *
-             * @return CallableResolverInterface
-             */
-            $container['callableResolver'] = function ($container) {
-                return new CallableResolver($container);
-            };
-        }
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/DeferredCallable.php b/advancedcontentfilter/vendor/slim/slim/Slim/DeferredCallable.php
deleted file mode 100644
index 22887c0f..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/DeferredCallable.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-
-namespace Slim;
-
-use Closure;
-use Psr\Container\ContainerInterface;
-
-class DeferredCallable
-{
-    use CallableResolverAwareTrait;
-
-    private $callable;
-    /** @var  ContainerInterface */
-    private $container;
-
-    /**
-     * DeferredMiddleware constructor.
-     * @param callable|string $callable
-     * @param ContainerInterface $container
-     */
-    public function __construct($callable, ContainerInterface $container = null)
-    {
-        $this->callable = $callable;
-        $this->container = $container;
-    }
-
-    public function __invoke()
-    {
-        $callable = $this->resolveCallable($this->callable);
-        if ($callable instanceof Closure) {
-            $callable = $callable->bindTo($this->container);
-        }
-
-        $args = func_get_args();
-
-        return call_user_func_array($callable, $args);
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Error/AbstractErrorRenderer.php b/advancedcontentfilter/vendor/slim/slim/Slim/Error/AbstractErrorRenderer.php
new file mode 100644
index 00000000..90b290d4
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Error/AbstractErrorRenderer.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Error;
+
+use Slim\Exception\HttpException;
+use Slim\Interfaces\ErrorRendererInterface;
+use Throwable;
+
+/**
+ * Abstract Slim application error renderer
+ *
+ * It outputs the error message and diagnostic information in one of the following formats:
+ * JSON, XML, Plain Text or HTML
+ */
+abstract class AbstractErrorRenderer implements ErrorRendererInterface
+{
+    protected string $defaultErrorTitle = 'Slim Application Error';
+
+    protected string $defaultErrorDescription = 'A website error has occurred. Sorry for the temporary inconvenience.';
+
+    protected function getErrorTitle(Throwable $exception): string
+    {
+        if ($exception instanceof HttpException) {
+            return $exception->getTitle();
+        }
+
+        return $this->defaultErrorTitle;
+    }
+
+    protected function getErrorDescription(Throwable $exception): string
+    {
+        if ($exception instanceof HttpException) {
+            return $exception->getDescription();
+        }
+
+        return $this->defaultErrorDescription;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/HtmlErrorRenderer.php b/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/HtmlErrorRenderer.php
new file mode 100644
index 00000000..e030522a
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/HtmlErrorRenderer.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Error\Renderers;
+
+use Slim\Error\AbstractErrorRenderer;
+use Throwable;
+
+use function get_class;
+use function htmlentities;
+use function sprintf;
+
+/**
+ * Default Slim application HTML Error Renderer
+ */
+class HtmlErrorRenderer extends AbstractErrorRenderer
+{
+    public function __invoke(Throwable $exception, bool $displayErrorDetails): string
+    {
+        if ($displayErrorDetails) {
+            $html = '<p>The application could not run because of the following error:</p>';
+            $html .= '<h2>Details</h2>';
+            $html .= $this->renderExceptionFragment($exception);
+        } else {
+            $html = "<p>{$this->getErrorDescription($exception)}</p>";
+        }
+
+        return $this->renderHtmlBody($this->getErrorTitle($exception), $html);
+    }
+
+    private function renderExceptionFragment(Throwable $exception): string
+    {
+        $html = sprintf('<div><strong>Type:</strong> %s</div>', get_class($exception));
+
+        /** @var int|string $code */
+        $code = $exception->getCode();
+        $html .= sprintf('<div><strong>Code:</strong> %s</div>', $code);
+
+        $html .= sprintf('<div><strong>Message:</strong> %s</div>', htmlentities($exception->getMessage()));
+
+        $html .= sprintf('<div><strong>File:</strong> %s</div>', $exception->getFile());
+
+        $html .= sprintf('<div><strong>Line:</strong> %s</div>', $exception->getLine());
+
+        $html .= '<h2>Trace</h2>';
+        $html .= sprintf('<pre>%s</pre>', htmlentities($exception->getTraceAsString()));
+
+        return $html;
+    }
+
+    public function renderHtmlBody(string $title = '', string $html = ''): string
+    {
+        return sprintf(
+            '<!doctype html>' .
+            '<html lang="en">' .
+            '    <head>' .
+            '        <meta charset="utf-8">' .
+            '        <meta name="viewport" content="width=device-width, initial-scale=1">' .
+            '        <title>%s</title>' .
+            '        <style>' .
+            '            body{margin:0;padding:30px;font:12px/1.5 Helvetica,Arial,Verdana,sans-serif}' .
+            '            h1{margin:0;font-size:48px;font-weight:normal;line-height:48px}' .
+            '            strong{display:inline-block;width:65px}' .
+            '        </style>' .
+            '    </head>' .
+            '    <body>' .
+            '        <h1>%s</h1>' .
+            '        <div>%s</div>' .
+            '        <a href="#" onclick="window.history.go(-1)">Go Back</a>' .
+            '    </body>' .
+            '</html>',
+            $title,
+            $title,
+            $html
+        );
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/JsonErrorRenderer.php b/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/JsonErrorRenderer.php
new file mode 100644
index 00000000..63d905b3
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/JsonErrorRenderer.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Error\Renderers;
+
+use Slim\Error\AbstractErrorRenderer;
+use Throwable;
+
+use function get_class;
+use function json_encode;
+
+use const JSON_PRETTY_PRINT;
+use const JSON_UNESCAPED_SLASHES;
+
+/**
+ * Default Slim application JSON Error Renderer
+ */
+class JsonErrorRenderer extends AbstractErrorRenderer
+{
+    public function __invoke(Throwable $exception, bool $displayErrorDetails): string
+    {
+        $error = ['message' => $this->getErrorTitle($exception)];
+
+        if ($displayErrorDetails) {
+            $error['exception'] = [];
+            do {
+                $error['exception'][] = $this->formatExceptionFragment($exception);
+            } while ($exception = $exception->getPrevious());
+        }
+
+        return (string) json_encode($error, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+    }
+
+    /**
+     * @return array<string|int>
+     */
+    private function formatExceptionFragment(Throwable $exception): array
+    {
+        /** @var int|string $code */
+        $code = $exception->getCode();
+        return [
+            'type' => get_class($exception),
+            'code' => $code,
+            'message' => $exception->getMessage(),
+            'file' => $exception->getFile(),
+            'line' => $exception->getLine(),
+        ];
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/PlainTextErrorRenderer.php b/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/PlainTextErrorRenderer.php
new file mode 100644
index 00000000..3d80c74b
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/PlainTextErrorRenderer.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Error\Renderers;
+
+use Slim\Error\AbstractErrorRenderer;
+use Throwable;
+
+use function get_class;
+use function htmlentities;
+use function sprintf;
+
+/**
+ * Default Slim application Plain Text Error Renderer
+ */
+class PlainTextErrorRenderer extends AbstractErrorRenderer
+{
+    public function __invoke(Throwable $exception, bool $displayErrorDetails): string
+    {
+        $text = "{$this->getErrorTitle($exception)}\n";
+
+        if ($displayErrorDetails) {
+            $text .= $this->formatExceptionFragment($exception);
+
+            while ($exception = $exception->getPrevious()) {
+                $text .= "\nPrevious Error:\n";
+                $text .= $this->formatExceptionFragment($exception);
+            }
+        }
+
+        return $text;
+    }
+
+    private function formatExceptionFragment(Throwable $exception): string
+    {
+        $text = sprintf("Type: %s\n", get_class($exception));
+
+        $code = $exception->getCode();
+        /** @var int|string $code */
+        $text .= sprintf("Code: %s\n", $code);
+
+        $text .= sprintf("Message: %s\n", htmlentities($exception->getMessage()));
+
+        $text .= sprintf("File: %s\n", $exception->getFile());
+
+        $text .= sprintf("Line: %s\n", $exception->getLine());
+
+        $text .= sprintf('Trace: %s', $exception->getTraceAsString());
+
+        return $text;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/XmlErrorRenderer.php b/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/XmlErrorRenderer.php
new file mode 100644
index 00000000..1171b79b
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/XmlErrorRenderer.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Error\Renderers;
+
+use Slim\Error\AbstractErrorRenderer;
+use Throwable;
+
+use function get_class;
+use function sprintf;
+use function str_replace;
+
+/**
+ * Default Slim application XML Error Renderer
+ */
+class XmlErrorRenderer extends AbstractErrorRenderer
+{
+    public function __invoke(Throwable $exception, bool $displayErrorDetails): string
+    {
+        $xml = '<' . '?xml version="1.0" encoding="UTF-8" standalone="yes"?' . ">\n";
+        $xml .= "<error>\n  <message>" . $this->createCdataSection($this->getErrorTitle($exception)) . "</message>\n";
+
+        if ($displayErrorDetails) {
+            do {
+                $xml .= "  <exception>\n";
+                $xml .= '    <type>' . get_class($exception) . "</type>\n";
+                $xml .= '    <code>' . $exception->getCode() . "</code>\n";
+                $xml .= '    <message>' . $this->createCdataSection($exception->getMessage()) . "</message>\n";
+                $xml .= '    <file>' . $exception->getFile() . "</file>\n";
+                $xml .= '    <line>' . $exception->getLine() . "</line>\n";
+                $xml .= "  </exception>\n";
+            } while ($exception = $exception->getPrevious());
+        }
+
+        $xml .= '</error>';
+
+        return $xml;
+    }
+
+    /**
+     * Returns a CDATA section with the given content.
+     */
+    private function createCdataSection(string $content): string
+    {
+        return sprintf('<![CDATA[%s]]>', str_replace(']]>', ']]]]><![CDATA[>', $content));
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/ContainerException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/ContainerException.php
deleted file mode 100644
index 06163f1d..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/ContainerException.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Exception;
-
-use InvalidArgumentException;
-use Interop\Container\Exception\ContainerException as InteropContainerException;
-
-/**
- * Container Exception
- */
-class ContainerException extends InvalidArgumentException implements InteropContainerException
-{
-
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/ContainerValueNotFoundException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/ContainerValueNotFoundException.php
deleted file mode 100644
index 33de07e3..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/ContainerValueNotFoundException.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Exception;
-
-use RuntimeException;
-use Interop\Container\Exception\NotFoundException as InteropNotFoundException;
-
-/**
- * Not Found Exception
- */
-class ContainerValueNotFoundException extends RuntimeException implements InteropNotFoundException
-{
-
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpBadRequestException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpBadRequestException.php
new file mode 100644
index 00000000..9be551cf
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpBadRequestException.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Exception;
+
+class HttpBadRequestException extends HttpSpecializedException
+{
+    /**
+     * @var int
+     */
+    protected $code = 400;
+
+    /**
+     * @var string
+     */
+    protected $message = 'Bad request.';
+
+    protected string $title = '400 Bad Request';
+    protected string $description = 'The server cannot or will not process ' .
+        'the request due to an apparent client error.';
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpException.php
new file mode 100644
index 00000000..d9dbd6cb
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpException.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Exception;
+
+use Psr\Http\Message\ServerRequestInterface;
+use RuntimeException;
+use Throwable;
+
+/**
+ * @method int getCode()
+ */
+class HttpException extends RuntimeException
+{
+    protected ServerRequestInterface $request;
+
+    protected string $title = '';
+
+    protected string $description = '';
+
+    public function __construct(
+        ServerRequestInterface $request,
+        string $message = '',
+        int $code = 0,
+        ?Throwable $previous = null
+    ) {
+        parent::__construct($message, $code, $previous);
+        $this->request = $request;
+    }
+
+    public function getRequest(): ServerRequestInterface
+    {
+        return $this->request;
+    }
+
+    public function getTitle(): string
+    {
+        return $this->title;
+    }
+
+    public function setTitle(string $title): self
+    {
+        $this->title = $title;
+        return $this;
+    }
+
+    public function getDescription(): string
+    {
+        return $this->description;
+    }
+
+    public function setDescription(string $description): self
+    {
+        $this->description = $description;
+        return $this;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpForbiddenException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpForbiddenException.php
new file mode 100644
index 00000000..dd3bb230
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpForbiddenException.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Exception;
+
+class HttpForbiddenException extends HttpSpecializedException
+{
+    /**
+     * @var int
+     */
+    protected $code = 403;
+
+    /**
+     * @var string
+     */
+    protected $message = 'Forbidden.';
+
+    protected string $title = '403 Forbidden';
+    protected string $description = 'You are not permitted to perform the requested operation.';
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpGoneException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpGoneException.php
new file mode 100644
index 00000000..42899e1e
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpGoneException.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Exception;
+
+class HttpGoneException extends HttpSpecializedException
+{
+    /**
+     * @var int
+     */
+    protected $code = 410;
+
+    /**
+     * @var string
+     */
+    protected $message = 'Gone.';
+
+    protected string $title = '410 Gone';
+    protected string $description = 'The target resource is no longer available at the origin server.';
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpInternalServerErrorException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpInternalServerErrorException.php
new file mode 100644
index 00000000..b4322619
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpInternalServerErrorException.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Exception;
+
+class HttpInternalServerErrorException extends HttpSpecializedException
+{
+    /**
+     * @var int
+     */
+    protected $code = 500;
+
+    /**
+     * @var string
+     */
+    protected $message = 'Internal server error.';
+
+    protected string $title = '500 Internal Server Error';
+    protected string $description = 'Unexpected condition encountered preventing server from fulfilling request.';
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpMethodNotAllowedException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpMethodNotAllowedException.php
new file mode 100644
index 00000000..30aaaa74
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpMethodNotAllowedException.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Exception;
+
+use function implode;
+
+class HttpMethodNotAllowedException extends HttpSpecializedException
+{
+    /**
+     * @var string[]
+     */
+    protected array $allowedMethods = [];
+
+    /**
+     * @var int
+     */
+    protected $code = 405;
+
+    /**
+     * @var string
+     */
+    protected $message = 'Method not allowed.';
+
+    protected string $title = '405 Method Not Allowed';
+    protected string $description = 'The request method is not supported for the requested resource.';
+
+    /**
+     * @return string[]
+     */
+    public function getAllowedMethods(): array
+    {
+        return $this->allowedMethods;
+    }
+
+    /**
+     * @param string[] $methods
+     */
+    public function setAllowedMethods(array $methods): self
+    {
+        $this->allowedMethods = $methods;
+        $this->message = 'Method not allowed. Must be one of: ' . implode(', ', $methods);
+        return $this;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpNotFoundException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpNotFoundException.php
new file mode 100644
index 00000000..865146d6
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpNotFoundException.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Exception;
+
+class HttpNotFoundException extends HttpSpecializedException
+{
+    /**
+     * @var int
+     */
+    protected $code = 404;
+
+    /**
+     * @var string
+     */
+    protected $message = 'Not found.';
+
+    protected string $title = '404 Not Found';
+    protected string $description = 'The requested resource could not be found. Please verify the URI and try again.';
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpNotImplementedException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpNotImplementedException.php
new file mode 100644
index 00000000..607a6f49
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpNotImplementedException.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Exception;
+
+class HttpNotImplementedException extends HttpSpecializedException
+{
+    /**
+     * @var int
+     */
+    protected $code = 501;
+
+    /**
+     * @var string
+     */
+    protected $message = 'Not implemented.';
+
+    protected string $title = '501 Not Implemented';
+    protected string $description = 'The server does not support the functionality required to fulfill the request.';
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpSpecializedException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpSpecializedException.php
new file mode 100644
index 00000000..945e1ad4
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpSpecializedException.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Exception;
+
+use Psr\Http\Message\ServerRequestInterface;
+use Throwable;
+
+abstract class HttpSpecializedException extends HttpException
+{
+    /**
+     * @param ServerRequestInterface $request
+     * @param string|null            $message
+     * @param Throwable|null         $previous
+     */
+    public function __construct(ServerRequestInterface $request, ?string $message = null, ?Throwable $previous = null)
+    {
+        if ($message !== null) {
+            $this->message = $message;
+        }
+
+        parent::__construct($request, $this->message, $this->code, $previous);
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpUnauthorizedException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpUnauthorizedException.php
new file mode 100644
index 00000000..07bd70d0
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpUnauthorizedException.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Exception;
+
+class HttpUnauthorizedException extends HttpSpecializedException
+{
+    /**
+     * @var int
+     */
+    protected $code = 401;
+
+    /**
+     * @var string
+     */
+    protected $message = 'Unauthorized.';
+
+    protected string $title = '401 Unauthorized';
+    protected string $description = 'The request requires valid user authentication.';
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/InvalidMethodException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/InvalidMethodException.php
deleted file mode 100644
index 4aabf833..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/InvalidMethodException.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Exception;
-
-use Psr\Http\Message\ServerRequestInterface;
-
-class InvalidMethodException extends \InvalidArgumentException
-{
-    protected $request;
-
-    public function __construct(ServerRequestInterface $request, $method)
-    {
-        $this->request = $request;
-        parent::__construct(sprintf('Unsupported HTTP method "%s" provided', $method));
-    }
-
-    public function getRequest()
-    {
-        return $this->request;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/MethodNotAllowedException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/MethodNotAllowedException.php
deleted file mode 100644
index 951f5dfb..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/MethodNotAllowedException.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Exception;
-
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
-
-class MethodNotAllowedException extends SlimException
-{
-    /**
-     * HTTP methods allowed
-     *
-     * @var string[]
-     */
-    protected $allowedMethods;
-
-    /**
-     * Create new exception
-     *
-     * @param ServerRequestInterface $request
-     * @param ResponseInterface $response
-     * @param string[] $allowedMethods
-     */
-    public function __construct(ServerRequestInterface $request, ResponseInterface $response, array $allowedMethods)
-    {
-        parent::__construct($request, $response);
-        $this->allowedMethods = $allowedMethods;
-    }
-
-    /**
-     * Get allowed methods
-     *
-     * @return string[]
-     */
-    public function getAllowedMethods()
-    {
-        return $this->allowedMethods;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/NotFoundException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/NotFoundException.php
deleted file mode 100644
index 9e72e14e..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/NotFoundException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Exception;
-
-class NotFoundException extends SlimException
-{
-
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/SlimException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/SlimException.php
deleted file mode 100644
index 2480d73b..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/SlimException.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Exception;
-
-use Exception;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
-
-/**
- * Stop Exception
- *
- * This Exception is thrown when the Slim application needs to abort
- * processing and return control flow to the outer PHP script.
- */
-class SlimException extends Exception
-{
-    /**
-     * A request object
-     *
-     * @var ServerRequestInterface
-     */
-    protected $request;
-
-    /**
-     * A response object to send to the HTTP client
-     *
-     * @var ResponseInterface
-     */
-    protected $response;
-
-    /**
-     * Create new exception
-     *
-     * @param ServerRequestInterface $request
-     * @param ResponseInterface $response
-     */
-    public function __construct(ServerRequestInterface $request, ResponseInterface $response)
-    {
-        parent::__construct();
-        $this->request = $request;
-        $this->response = $response;
-    }
-
-    /**
-     * Get request
-     *
-     * @return ServerRequestInterface
-     */
-    public function getRequest()
-    {
-        return $this->request;
-    }
-
-    /**
-     * Get response
-     *
-     * @return ResponseInterface
-     */
-    public function getResponse()
-    {
-        return $this->response;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/AppFactory.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/AppFactory.php
new file mode 100644
index 00000000..6fc5f86e
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/AppFactory.php
@@ -0,0 +1,206 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Factory;
+
+use Psr\Container\ContainerInterface;
+use Psr\Http\Message\ResponseFactoryInterface;
+use Psr\Http\Message\StreamFactoryInterface;
+use RuntimeException;
+use Slim\App;
+use Slim\Factory\Psr17\Psr17Factory;
+use Slim\Factory\Psr17\Psr17FactoryProvider;
+use Slim\Factory\Psr17\SlimHttpPsr17Factory;
+use Slim\Interfaces\CallableResolverInterface;
+use Slim\Interfaces\MiddlewareDispatcherInterface;
+use Slim\Interfaces\Psr17FactoryProviderInterface;
+use Slim\Interfaces\RouteCollectorInterface;
+use Slim\Interfaces\RouteResolverInterface;
+
+class AppFactory
+{
+    protected static ?Psr17FactoryProviderInterface $psr17FactoryProvider = null;
+
+    protected static ?ResponseFactoryInterface $responseFactory = null;
+
+    protected static ?StreamFactoryInterface $streamFactory = null;
+
+    protected static ?ContainerInterface $container = null;
+
+    protected static ?CallableResolverInterface $callableResolver = null;
+
+    protected static ?RouteCollectorInterface $routeCollector = null;
+
+    protected static ?RouteResolverInterface $routeResolver = null;
+
+    protected static ?MiddlewareDispatcherInterface $middlewareDispatcher = null;
+
+    protected static bool $slimHttpDecoratorsAutomaticDetectionEnabled = true;
+
+    public static function create(
+        ?ResponseFactoryInterface $responseFactory = null,
+        ?ContainerInterface $container = null,
+        ?CallableResolverInterface $callableResolver = null,
+        ?RouteCollectorInterface $routeCollector = null,
+        ?RouteResolverInterface $routeResolver = null,
+        ?MiddlewareDispatcherInterface $middlewareDispatcher = null
+    ): App {
+        static::$responseFactory = $responseFactory ?? static::$responseFactory;
+        return new App(
+            self::determineResponseFactory(),
+            $container ?? static::$container,
+            $callableResolver ?? static::$callableResolver,
+            $routeCollector ?? static::$routeCollector,
+            $routeResolver ?? static::$routeResolver,
+            $middlewareDispatcher ?? static::$middlewareDispatcher
+        );
+    }
+
+    public static function createFromContainer(ContainerInterface $container): App
+    {
+        $responseFactory = $container->has(ResponseFactoryInterface::class)
+        && (
+            $responseFactoryFromContainer = $container->get(ResponseFactoryInterface::class)
+        ) instanceof ResponseFactoryInterface
+            ? $responseFactoryFromContainer
+            : self::determineResponseFactory();
+
+        $callableResolver = $container->has(CallableResolverInterface::class)
+        && (
+            $callableResolverFromContainer = $container->get(CallableResolverInterface::class)
+        ) instanceof CallableResolverInterface
+            ? $callableResolverFromContainer
+            : null;
+
+        $routeCollector = $container->has(RouteCollectorInterface::class)
+        && (
+            $routeCollectorFromContainer = $container->get(RouteCollectorInterface::class)
+        ) instanceof RouteCollectorInterface
+            ? $routeCollectorFromContainer
+            : null;
+
+        $routeResolver = $container->has(RouteResolverInterface::class)
+        && (
+            $routeResolverFromContainer = $container->get(RouteResolverInterface::class)
+        ) instanceof RouteResolverInterface
+            ? $routeResolverFromContainer
+            : null;
+
+        $middlewareDispatcher = $container->has(MiddlewareDispatcherInterface::class)
+        && (
+            $middlewareDispatcherFromContainer = $container->get(MiddlewareDispatcherInterface::class)
+        ) instanceof MiddlewareDispatcherInterface
+            ? $middlewareDispatcherFromContainer
+            : null;
+
+        return new App(
+            $responseFactory,
+            $container,
+            $callableResolver,
+            $routeCollector,
+            $routeResolver,
+            $middlewareDispatcher
+        );
+    }
+
+    /**
+     * @throws RuntimeException
+     */
+    public static function determineResponseFactory(): ResponseFactoryInterface
+    {
+        if (static::$responseFactory) {
+            if (static::$streamFactory) {
+                return static::attemptResponseFactoryDecoration(static::$responseFactory, static::$streamFactory);
+            }
+            return static::$responseFactory;
+        }
+
+        $psr17FactoryProvider = static::$psr17FactoryProvider ?? new Psr17FactoryProvider();
+
+        /** @var Psr17Factory $psr17factory */
+        foreach ($psr17FactoryProvider->getFactories() as $psr17factory) {
+            if ($psr17factory::isResponseFactoryAvailable()) {
+                $responseFactory = $psr17factory::getResponseFactory();
+
+                if (static::$streamFactory || $psr17factory::isStreamFactoryAvailable()) {
+                    $streamFactory = static::$streamFactory ?? $psr17factory::getStreamFactory();
+                    return static::attemptResponseFactoryDecoration($responseFactory, $streamFactory);
+                }
+
+                return $responseFactory;
+            }
+        }
+
+        throw new RuntimeException(
+            "Could not detect any PSR-17 ResponseFactory implementations. " .
+            "Please install a supported implementation in order to use `AppFactory::create()`. " .
+            "See https://github.com/slimphp/Slim/blob/4.x/README.md for a list of supported implementations."
+        );
+    }
+
+    protected static function attemptResponseFactoryDecoration(
+        ResponseFactoryInterface $responseFactory,
+        StreamFactoryInterface $streamFactory
+    ): ResponseFactoryInterface {
+        if (
+            static::$slimHttpDecoratorsAutomaticDetectionEnabled
+            && SlimHttpPsr17Factory::isResponseFactoryAvailable()
+        ) {
+            return SlimHttpPsr17Factory::createDecoratedResponseFactory($responseFactory, $streamFactory);
+        }
+
+        return $responseFactory;
+    }
+
+    public static function setPsr17FactoryProvider(Psr17FactoryProviderInterface $psr17FactoryProvider): void
+    {
+        static::$psr17FactoryProvider = $psr17FactoryProvider;
+    }
+
+    public static function setResponseFactory(ResponseFactoryInterface $responseFactory): void
+    {
+        static::$responseFactory = $responseFactory;
+    }
+
+    public static function setStreamFactory(StreamFactoryInterface $streamFactory): void
+    {
+        static::$streamFactory = $streamFactory;
+    }
+
+    public static function setContainer(ContainerInterface $container): void
+    {
+        static::$container = $container;
+    }
+
+    public static function setCallableResolver(CallableResolverInterface $callableResolver): void
+    {
+        static::$callableResolver = $callableResolver;
+    }
+
+    public static function setRouteCollector(RouteCollectorInterface $routeCollector): void
+    {
+        static::$routeCollector = $routeCollector;
+    }
+
+    public static function setRouteResolver(RouteResolverInterface $routeResolver): void
+    {
+        static::$routeResolver = $routeResolver;
+    }
+
+    public static function setMiddlewareDispatcher(MiddlewareDispatcherInterface $middlewareDispatcher): void
+    {
+        static::$middlewareDispatcher = $middlewareDispatcher;
+    }
+
+    public static function setSlimHttpDecoratorsAutomaticDetection(bool $enabled): void
+    {
+        static::$slimHttpDecoratorsAutomaticDetectionEnabled = $enabled;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/GuzzlePsr17Factory.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/GuzzlePsr17Factory.php
new file mode 100644
index 00000000..32a548a6
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/GuzzlePsr17Factory.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Factory\Psr17;
+
+class GuzzlePsr17Factory extends Psr17Factory
+{
+    protected static string $responseFactoryClass = 'GuzzleHttp\Psr7\HttpFactory';
+    protected static string $streamFactoryClass = 'GuzzleHttp\Psr7\HttpFactory';
+    protected static string $serverRequestCreatorClass = 'GuzzleHttp\Psr7\ServerRequest';
+    protected static string $serverRequestCreatorMethod = 'fromGlobals';
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/HttpSoftPsr17Factory.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/HttpSoftPsr17Factory.php
new file mode 100644
index 00000000..c305d7c1
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/HttpSoftPsr17Factory.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Factory\Psr17;
+
+class HttpSoftPsr17Factory extends Psr17Factory
+{
+    protected static string $responseFactoryClass = 'HttpSoft\Message\ResponseFactory';
+    protected static string $streamFactoryClass = 'HttpSoft\Message\StreamFactory';
+    protected static string $serverRequestCreatorClass = 'HttpSoft\ServerRequest\ServerRequestCreator';
+    protected static string $serverRequestCreatorMethod = 'createFromGlobals';
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/LaminasDiactorosPsr17Factory.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/LaminasDiactorosPsr17Factory.php
new file mode 100644
index 00000000..e6a9db1a
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/LaminasDiactorosPsr17Factory.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Factory\Psr17;
+
+class LaminasDiactorosPsr17Factory extends Psr17Factory
+{
+    protected static string $responseFactoryClass = 'Laminas\Diactoros\ResponseFactory';
+    protected static string $streamFactoryClass = 'Laminas\Diactoros\StreamFactory';
+    protected static string $serverRequestCreatorClass = 'Laminas\Diactoros\ServerRequestFactory';
+    protected static string $serverRequestCreatorMethod = 'fromGlobals';
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/NyholmPsr17Factory.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/NyholmPsr17Factory.php
new file mode 100644
index 00000000..ba11095a
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/NyholmPsr17Factory.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Slim\Factory\Psr17;
+
+use Slim\Interfaces\ServerRequestCreatorInterface;
+
+class NyholmPsr17Factory extends Psr17Factory
+{
+    protected static string $responseFactoryClass = 'Nyholm\Psr7\Factory\Psr17Factory';
+    protected static string $streamFactoryClass = 'Nyholm\Psr7\Factory\Psr17Factory';
+    protected static string $serverRequestCreatorClass = 'Nyholm\Psr7Server\ServerRequestCreator';
+    protected static string $serverRequestCreatorMethod = 'fromGlobals';
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getServerRequestCreator(): ServerRequestCreatorInterface
+    {
+        /*
+         * Nyholm Psr17Factory implements all factories in one unified
+         * factory which implements all of the PSR-17 factory interfaces
+         */
+        $psr17Factory = new static::$responseFactoryClass();
+
+        $serverRequestCreator = new static::$serverRequestCreatorClass(
+            $psr17Factory,
+            $psr17Factory,
+            $psr17Factory,
+            $psr17Factory
+        );
+
+        return new ServerRequestCreator($serverRequestCreator, static::$serverRequestCreatorMethod);
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/Psr17Factory.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/Psr17Factory.php
new file mode 100644
index 00000000..97977f9b
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/Psr17Factory.php
@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Factory\Psr17;
+
+use Psr\Http\Message\ResponseFactoryInterface;
+use Psr\Http\Message\StreamFactoryInterface;
+use RuntimeException;
+use Slim\Interfaces\Psr17FactoryInterface;
+use Slim\Interfaces\ServerRequestCreatorInterface;
+
+use function class_exists;
+use function get_called_class;
+
+abstract class Psr17Factory implements Psr17FactoryInterface
+{
+    protected static string $responseFactoryClass;
+
+    protected static string $streamFactoryClass;
+
+    protected static string $serverRequestCreatorClass;
+
+    protected static string $serverRequestCreatorMethod;
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getResponseFactory(): ResponseFactoryInterface
+    {
+        if (
+            !static::isResponseFactoryAvailable()
+            || !(($responseFactory = new static::$responseFactoryClass()) instanceof ResponseFactoryInterface)
+        ) {
+            throw new RuntimeException(get_called_class() . ' could not instantiate a response factory.');
+        }
+
+        return $responseFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getStreamFactory(): StreamFactoryInterface
+    {
+        if (
+            !static::isStreamFactoryAvailable()
+            || !(($streamFactory = new static::$streamFactoryClass()) instanceof StreamFactoryInterface)
+        ) {
+            throw new RuntimeException(get_called_class() . ' could not instantiate a stream factory.');
+        }
+
+        return $streamFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getServerRequestCreator(): ServerRequestCreatorInterface
+    {
+        if (!static::isServerRequestCreatorAvailable()) {
+            throw new RuntimeException(get_called_class() . ' could not instantiate a server request creator.');
+        }
+
+        return new ServerRequestCreator(static::$serverRequestCreatorClass, static::$serverRequestCreatorMethod);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function isResponseFactoryAvailable(): bool
+    {
+        return static::$responseFactoryClass && class_exists(static::$responseFactoryClass);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function isStreamFactoryAvailable(): bool
+    {
+        return static::$streamFactoryClass && class_exists(static::$streamFactoryClass);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function isServerRequestCreatorAvailable(): bool
+    {
+        return (
+            static::$serverRequestCreatorClass
+            && static::$serverRequestCreatorMethod
+            && class_exists(static::$serverRequestCreatorClass)
+        );
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/Psr17FactoryProvider.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/Psr17FactoryProvider.php
new file mode 100644
index 00000000..436d2af0
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/Psr17FactoryProvider.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Factory\Psr17;
+
+use Slim\Interfaces\Psr17FactoryProviderInterface;
+
+use function array_unshift;
+
+class Psr17FactoryProvider implements Psr17FactoryProviderInterface
+{
+    /**
+     * @var string[]
+     */
+    protected static array $factories = [
+        SlimPsr17Factory::class,
+        HttpSoftPsr17Factory::class,
+        NyholmPsr17Factory::class,
+        LaminasDiactorosPsr17Factory::class,
+        GuzzlePsr17Factory::class,
+    ];
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getFactories(): array
+    {
+        return static::$factories;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function setFactories(array $factories): void
+    {
+        static::$factories = $factories;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function addFactory(string $factory): void
+    {
+        array_unshift(static::$factories, $factory);
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/ServerRequestCreator.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/ServerRequestCreator.php
new file mode 100644
index 00000000..0fc6c066
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/ServerRequestCreator.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Factory\Psr17;
+
+use Closure;
+use Psr\Http\Message\ServerRequestInterface;
+use Slim\Interfaces\ServerRequestCreatorInterface;
+
+class ServerRequestCreator implements ServerRequestCreatorInterface
+{
+    /**
+     * @var object|string
+     */
+    protected $serverRequestCreator;
+
+    protected string $serverRequestCreatorMethod;
+
+    /**
+     * @param object|string $serverRequestCreator
+     */
+    public function __construct($serverRequestCreator, string $serverRequestCreatorMethod)
+    {
+        $this->serverRequestCreator = $serverRequestCreator;
+        $this->serverRequestCreatorMethod = $serverRequestCreatorMethod;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function createServerRequestFromGlobals(): ServerRequestInterface
+    {
+        /** @var callable $callable */
+        $callable = [$this->serverRequestCreator, $this->serverRequestCreatorMethod];
+        return (Closure::fromCallable($callable))();
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimHttpPsr17Factory.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimHttpPsr17Factory.php
new file mode 100644
index 00000000..5d636318
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimHttpPsr17Factory.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Factory\Psr17;
+
+use Psr\Http\Message\ResponseFactoryInterface;
+use Psr\Http\Message\StreamFactoryInterface;
+use RuntimeException;
+
+class SlimHttpPsr17Factory extends Psr17Factory
+{
+    protected static string $responseFactoryClass = 'Slim\Http\Factory\DecoratedResponseFactory';
+
+    /**
+     * @throws RuntimeException when the factory could not be instantiated
+     */
+    public static function createDecoratedResponseFactory(
+        ResponseFactoryInterface $responseFactory,
+        StreamFactoryInterface $streamFactory
+    ): ResponseFactoryInterface {
+        if (
+            !((
+                $decoratedResponseFactory = new static::$responseFactoryClass($responseFactory, $streamFactory)
+                ) instanceof ResponseFactoryInterface
+            )
+        ) {
+            throw new RuntimeException(get_called_class() . ' could not instantiate a decorated response factory.');
+        }
+
+        return $decoratedResponseFactory;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimHttpServerRequestCreator.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimHttpServerRequestCreator.php
new file mode 100644
index 00000000..eb50d484
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimHttpServerRequestCreator.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Factory\Psr17;
+
+use Psr\Http\Message\ServerRequestInterface;
+use RuntimeException;
+use Slim\Interfaces\ServerRequestCreatorInterface;
+
+use function class_exists;
+
+class SlimHttpServerRequestCreator implements ServerRequestCreatorInterface
+{
+    protected ServerRequestCreatorInterface $serverRequestCreator;
+
+    protected static string $serverRequestDecoratorClass = 'Slim\Http\ServerRequest';
+
+    public function __construct(ServerRequestCreatorInterface $serverRequestCreator)
+    {
+        $this->serverRequestCreator = $serverRequestCreator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function createServerRequestFromGlobals(): ServerRequestInterface
+    {
+        if (!static::isServerRequestDecoratorAvailable()) {
+            throw new RuntimeException('The Slim-Http ServerRequest decorator is not available.');
+        }
+
+        $request = $this->serverRequestCreator->createServerRequestFromGlobals();
+
+        if (
+            !((
+                $decoratedServerRequest = new static::$serverRequestDecoratorClass($request)
+                ) instanceof ServerRequestInterface)
+        ) {
+            throw new RuntimeException(get_called_class() . ' could not instantiate a decorated server request.');
+        }
+
+        return $decoratedServerRequest;
+    }
+
+    public static function isServerRequestDecoratorAvailable(): bool
+    {
+        return class_exists(static::$serverRequestDecoratorClass);
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimPsr17Factory.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimPsr17Factory.php
new file mode 100644
index 00000000..46c46f9c
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimPsr17Factory.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Factory\Psr17;
+
+class SlimPsr17Factory extends Psr17Factory
+{
+    protected static string $responseFactoryClass = 'Slim\Psr7\Factory\ResponseFactory';
+    protected static string $streamFactoryClass = 'Slim\Psr7\Factory\StreamFactory';
+    protected static string $serverRequestCreatorClass = 'Slim\Psr7\Factory\ServerRequestFactory';
+    protected static string $serverRequestCreatorMethod = 'createFromGlobals';
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/ServerRequestCreatorFactory.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/ServerRequestCreatorFactory.php
new file mode 100644
index 00000000..94f639d2
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/ServerRequestCreatorFactory.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Factory;
+
+use RuntimeException;
+use Slim\Factory\Psr17\Psr17Factory;
+use Slim\Factory\Psr17\Psr17FactoryProvider;
+use Slim\Factory\Psr17\SlimHttpServerRequestCreator;
+use Slim\Interfaces\Psr17FactoryProviderInterface;
+use Slim\Interfaces\ServerRequestCreatorInterface;
+
+class ServerRequestCreatorFactory
+{
+    protected static ?Psr17FactoryProviderInterface $psr17FactoryProvider = null;
+
+    protected static ?ServerRequestCreatorInterface $serverRequestCreator = null;
+
+    protected static bool $slimHttpDecoratorsAutomaticDetectionEnabled = true;
+
+    public static function create(): ServerRequestCreatorInterface
+    {
+        return static::determineServerRequestCreator();
+    }
+
+    /**
+     * @throws RuntimeException
+     */
+    public static function determineServerRequestCreator(): ServerRequestCreatorInterface
+    {
+        if (static::$serverRequestCreator) {
+            return static::attemptServerRequestCreatorDecoration(static::$serverRequestCreator);
+        }
+
+        $psr17FactoryProvider = static::$psr17FactoryProvider ?? new Psr17FactoryProvider();
+
+        /** @var Psr17Factory $psr17Factory */
+        foreach ($psr17FactoryProvider->getFactories() as $psr17Factory) {
+            if ($psr17Factory::isServerRequestCreatorAvailable()) {
+                $serverRequestCreator = $psr17Factory::getServerRequestCreator();
+                return static::attemptServerRequestCreatorDecoration($serverRequestCreator);
+            }
+        }
+
+        throw new RuntimeException(
+            "Could not detect any ServerRequest creator implementations. " .
+            "Please install a supported implementation in order to use `App::run()` " .
+            "without having to pass in a `ServerRequest` object. " .
+            "See https://github.com/slimphp/Slim/blob/4.x/README.md for a list of supported implementations."
+        );
+    }
+
+    protected static function attemptServerRequestCreatorDecoration(
+        ServerRequestCreatorInterface $serverRequestCreator
+    ): ServerRequestCreatorInterface {
+        if (
+            static::$slimHttpDecoratorsAutomaticDetectionEnabled
+            && SlimHttpServerRequestCreator::isServerRequestDecoratorAvailable()
+        ) {
+            return new SlimHttpServerRequestCreator($serverRequestCreator);
+        }
+
+        return $serverRequestCreator;
+    }
+
+    public static function setPsr17FactoryProvider(Psr17FactoryProviderInterface $psr17FactoryProvider): void
+    {
+        static::$psr17FactoryProvider = $psr17FactoryProvider;
+    }
+
+    public static function setServerRequestCreator(ServerRequestCreatorInterface $serverRequestCreator): void
+    {
+        self::$serverRequestCreator = $serverRequestCreator;
+    }
+
+    public static function setSlimHttpDecoratorsAutomaticDetection(bool $enabled): void
+    {
+        static::$slimHttpDecoratorsAutomaticDetectionEnabled = $enabled;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/AbstractError.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/AbstractError.php
deleted file mode 100644
index 42f8dde3..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/AbstractError.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Handlers;
-
-/**
- * Abstract Slim application error handler
- */
-abstract class AbstractError extends AbstractHandler
-{
-    /**
-     * @var bool
-     */
-    protected $displayErrorDetails;
-
-    /**
-     * Constructor
-     *
-     * @param bool $displayErrorDetails Set to true to display full details
-     */
-    public function __construct($displayErrorDetails = false)
-    {
-        $this->displayErrorDetails = (bool) $displayErrorDetails;
-    }
-
-    /**
-     * Write to the error log if displayErrorDetails is false
-     *
-     * @param \Exception|\Throwable $throwable
-     *
-     * @return void
-     */
-    protected function writeToErrorLog($throwable)
-    {
-        if ($this->displayErrorDetails) {
-            return;
-        }
-
-        $message = 'Slim Application Error:' . PHP_EOL;
-        $message .= $this->renderThrowableAsText($throwable);
-        while ($throwable = $throwable->getPrevious()) {
-            $message .= PHP_EOL . 'Previous error:' . PHP_EOL;
-            $message .= $this->renderThrowableAsText($throwable);
-        }
-
-        $message .= PHP_EOL . 'View in rendered output by enabling the "displayErrorDetails" setting.' . PHP_EOL;
-
-        $this->logError($message);
-    }
-
-    /**
-     * Render error as Text.
-     *
-     * @param \Exception|\Throwable $throwable
-     *
-     * @return string
-     */
-    protected function renderThrowableAsText($throwable)
-    {
-        $text = sprintf('Type: %s' . PHP_EOL, get_class($throwable));
-
-        if ($code = $throwable->getCode()) {
-            $text .= sprintf('Code: %s' . PHP_EOL, $code);
-        }
-
-        if ($message = $throwable->getMessage()) {
-            $text .= sprintf('Message: %s' . PHP_EOL, htmlentities($message));
-        }
-
-        if ($file = $throwable->getFile()) {
-            $text .= sprintf('File: %s' . PHP_EOL, $file);
-        }
-
-        if ($line = $throwable->getLine()) {
-            $text .= sprintf('Line: %s' . PHP_EOL, $line);
-        }
-
-        if ($trace = $throwable->getTraceAsString()) {
-            $text .= sprintf('Trace: %s', $trace);
-        }
-
-        return $text;
-    }
-
-    /**
-     * Wraps the error_log function so that this can be easily tested
-     *
-     * @param $message
-     */
-    protected function logError($message)
-    {
-        error_log($message);
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/AbstractHandler.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/AbstractHandler.php
deleted file mode 100644
index b166a156..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/AbstractHandler.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Handlers;
-
-use Psr\Http\Message\ServerRequestInterface;
-
-/**
- * Abstract Slim application handler
- */
-abstract class AbstractHandler
-{
-    /**
-     * Known handled content types
-     *
-     * @var array
-     */
-    protected $knownContentTypes = [
-        'application/json',
-        'application/xml',
-        'text/xml',
-        'text/html',
-    ];
-
-    /**
-     * Determine which content type we know about is wanted using Accept header
-     *
-     * Note: This method is a bare-bones implementation designed specifically for
-     * Slim's error handling requirements. Consider a fully-feature solution such
-     * as willdurand/negotiation for any other situation.
-     *
-     * @param ServerRequestInterface $request
-     * @return string
-     */
-    protected function determineContentType(ServerRequestInterface $request)
-    {
-        $acceptHeader = $request->getHeaderLine('Accept');
-        $selectedContentTypes = array_intersect(explode(',', $acceptHeader), $this->knownContentTypes);
-
-        if (count($selectedContentTypes)) {
-            return current($selectedContentTypes);
-        }
-
-        // handle +json and +xml specially
-        if (preg_match('/\+(json|xml)/', $acceptHeader, $matches)) {
-            $mediaType = 'application/' . $matches[1];
-            if (in_array($mediaType, $this->knownContentTypes)) {
-                return $mediaType;
-            }
-        }
-
-        return 'text/html';
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Error.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Error.php
deleted file mode 100644
index dd0bc8d4..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Error.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Handlers;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Slim\Http\Body;
-use UnexpectedValueException;
-
-/**
- * Default Slim application error handler
- *
- * It outputs the error message and diagnostic information in either JSON, XML,
- * or HTML based on the Accept header.
- */
-class Error extends AbstractError
-{
-    /**
-     * Invoke error handler
-     *
-     * @param ServerRequestInterface $request   The most recent Request object
-     * @param ResponseInterface      $response  The most recent Response object
-     * @param \Exception             $exception The caught Exception object
-     *
-     * @return ResponseInterface
-     * @throws UnexpectedValueException
-     */
-    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, \Exception $exception)
-    {
-        $contentType = $this->determineContentType($request);
-        switch ($contentType) {
-            case 'application/json':
-                $output = $this->renderJsonErrorMessage($exception);
-                break;
-
-            case 'text/xml':
-            case 'application/xml':
-                $output = $this->renderXmlErrorMessage($exception);
-                break;
-
-            case 'text/html':
-                $output = $this->renderHtmlErrorMessage($exception);
-                break;
-
-            default:
-                throw new UnexpectedValueException('Cannot render unknown content type ' . $contentType);
-        }
-
-        $this->writeToErrorLog($exception);
-
-        $body = new Body(fopen('php://temp', 'r+'));
-        $body->write($output);
-
-        return $response
-                ->withStatus(500)
-                ->withHeader('Content-type', $contentType)
-                ->withBody($body);
-    }
-
-    /**
-     * Render HTML error page
-     *
-     * @param  \Exception $exception
-     *
-     * @return string
-     */
-    protected function renderHtmlErrorMessage(\Exception $exception)
-    {
-        $title = 'Slim Application Error';
-
-        if ($this->displayErrorDetails) {
-            $html = '<p>The application could not run because of the following error:</p>';
-            $html .= '<h2>Details</h2>';
-            $html .= $this->renderHtmlException($exception);
-
-            while ($exception = $exception->getPrevious()) {
-                $html .= '<h2>Previous exception</h2>';
-                $html .= $this->renderHtmlExceptionOrError($exception);
-            }
-        } else {
-            $html = '<p>A website error has occurred. Sorry for the temporary inconvenience.</p>';
-        }
-
-        $output = sprintf(
-            "<html><head><meta http-equiv='Content-Type' content='text/html; charset=utf-8'>" .
-            "<title>%s</title><style>body{margin:0;padding:30px;font:12px/1.5 Helvetica,Arial,Verdana," .
-            "sans-serif;}h1{margin:0;font-size:48px;font-weight:normal;line-height:48px;}strong{" .
-            "display:inline-block;width:65px;}</style></head><body><h1>%s</h1>%s</body></html>",
-            $title,
-            $title,
-            $html
-        );
-
-        return $output;
-    }
-
-    /**
-     * Render exception as HTML.
-     *
-     * Provided for backwards compatibility; use renderHtmlExceptionOrError().
-     *
-     * @param \Exception $exception
-     *
-     * @return string
-     */
-    protected function renderHtmlException(\Exception $exception)
-    {
-        return $this->renderHtmlExceptionOrError($exception);
-    }
-
-    /**
-     * Render exception or error as HTML.
-     *
-     * @param \Exception|\Error $exception
-     *
-     * @return string
-     */
-    protected function renderHtmlExceptionOrError($exception)
-    {
-        if (!$exception instanceof \Exception && !$exception instanceof \Error) {
-            throw new \RuntimeException("Unexpected type. Expected Exception or Error.");
-        }
-
-        $html = sprintf('<div><strong>Type:</strong> %s</div>', get_class($exception));
-
-        if (($code = $exception->getCode())) {
-            $html .= sprintf('<div><strong>Code:</strong> %s</div>', $code);
-        }
-
-        if (($message = $exception->getMessage())) {
-            $html .= sprintf('<div><strong>Message:</strong> %s</div>', htmlentities($message));
-        }
-
-        if (($file = $exception->getFile())) {
-            $html .= sprintf('<div><strong>File:</strong> %s</div>', $file);
-        }
-
-        if (($line = $exception->getLine())) {
-            $html .= sprintf('<div><strong>Line:</strong> %s</div>', $line);
-        }
-
-        if (($trace = $exception->getTraceAsString())) {
-            $html .= '<h2>Trace</h2>';
-            $html .= sprintf('<pre>%s</pre>', htmlentities($trace));
-        }
-
-        return $html;
-    }
-
-    /**
-     * Render JSON error
-     *
-     * @param \Exception $exception
-     *
-     * @return string
-     */
-    protected function renderJsonErrorMessage(\Exception $exception)
-    {
-        $error = [
-            'message' => 'Slim Application Error',
-        ];
-
-        if ($this->displayErrorDetails) {
-            $error['exception'] = [];
-
-            do {
-                $error['exception'][] = [
-                    'type' => get_class($exception),
-                    'code' => $exception->getCode(),
-                    'message' => $exception->getMessage(),
-                    'file' => $exception->getFile(),
-                    'line' => $exception->getLine(),
-                    'trace' => explode("\n", $exception->getTraceAsString()),
-                ];
-            } while ($exception = $exception->getPrevious());
-        }
-
-        return json_encode($error, JSON_PRETTY_PRINT);
-    }
-
-    /**
-     * Render XML error
-     *
-     * @param \Exception $exception
-     *
-     * @return string
-     */
-    protected function renderXmlErrorMessage(\Exception $exception)
-    {
-        $xml = "<error>\n  <message>Slim Application Error</message>\n";
-        if ($this->displayErrorDetails) {
-            do {
-                $xml .= "  <exception>\n";
-                $xml .= "    <type>" . get_class($exception) . "</type>\n";
-                $xml .= "    <code>" . $exception->getCode() . "</code>\n";
-                $xml .= "    <message>" . $this->createCdataSection($exception->getMessage()) . "</message>\n";
-                $xml .= "    <file>" . $exception->getFile() . "</file>\n";
-                $xml .= "    <line>" . $exception->getLine() . "</line>\n";
-                $xml .= "    <trace>" . $this->createCdataSection($exception->getTraceAsString()) . "</trace>\n";
-                $xml .= "  </exception>\n";
-            } while ($exception = $exception->getPrevious());
-        }
-        $xml .= "</error>";
-
-        return $xml;
-    }
-
-    /**
-     * Returns a CDATA section with the given content.
-     *
-     * @param  string $content
-     * @return string
-     */
-    private function createCdataSection($content)
-    {
-        return sprintf('<![CDATA[%s]]>', str_replace(']]>', ']]]]><![CDATA[>', $content));
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/ErrorHandler.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/ErrorHandler.php
new file mode 100644
index 00000000..f9606e36
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/ErrorHandler.php
@@ -0,0 +1,308 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Handlers;
+
+use Psr\Http\Message\ResponseFactoryInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Log\LoggerInterface;
+use RuntimeException;
+use Slim\Error\Renderers\HtmlErrorRenderer;
+use Slim\Error\Renderers\JsonErrorRenderer;
+use Slim\Error\Renderers\PlainTextErrorRenderer;
+use Slim\Error\Renderers\XmlErrorRenderer;
+use Slim\Exception\HttpException;
+use Slim\Exception\HttpMethodNotAllowedException;
+use Slim\Interfaces\CallableResolverInterface;
+use Slim\Interfaces\ErrorHandlerInterface;
+use Slim\Interfaces\ErrorRendererInterface;
+use Slim\Logger;
+use Throwable;
+
+use function array_intersect;
+use function array_key_exists;
+use function array_keys;
+use function call_user_func;
+use function count;
+use function current;
+use function explode;
+use function implode;
+use function next;
+use function preg_match;
+
+/**
+ * Default Slim application error handler
+ *
+ * It outputs the error message and diagnostic information in one of the following formats:
+ * JSON, XML, Plain Text or HTML based on the Accept header.
+ */
+class ErrorHandler implements ErrorHandlerInterface
+{
+    protected string $defaultErrorRendererContentType = 'text/html';
+
+    /**
+     * @var ErrorRendererInterface|string|callable
+     */
+    protected $defaultErrorRenderer = HtmlErrorRenderer::class;
+
+    /**
+     * @var ErrorRendererInterface|string|callable
+     */
+    protected $logErrorRenderer = PlainTextErrorRenderer::class;
+
+    /**
+     * @var array<string|callable>
+     */
+    protected array $errorRenderers = [
+        'application/json' => JsonErrorRenderer::class,
+        'application/xml' => XmlErrorRenderer::class,
+        'text/xml' => XmlErrorRenderer::class,
+        'text/html' => HtmlErrorRenderer::class,
+        'text/plain' => PlainTextErrorRenderer::class,
+    ];
+
+    protected bool $displayErrorDetails = false;
+
+    protected bool $logErrors;
+
+    protected bool $logErrorDetails = false;
+
+    protected ?string $contentType = null;
+
+    protected ?string $method = null;
+
+    protected ServerRequestInterface $request;
+
+    protected Throwable $exception;
+
+    protected int $statusCode;
+
+    protected CallableResolverInterface $callableResolver;
+
+    protected ResponseFactoryInterface $responseFactory;
+
+    protected LoggerInterface $logger;
+
+    public function __construct(
+        CallableResolverInterface $callableResolver,
+        ResponseFactoryInterface $responseFactory,
+        ?LoggerInterface $logger = null
+    ) {
+        $this->callableResolver = $callableResolver;
+        $this->responseFactory = $responseFactory;
+        $this->logger = $logger ?: $this->getDefaultLogger();
+    }
+
+    /**
+     * Invoke error handler
+     *
+     * @param ServerRequestInterface $request             The most recent Request object
+     * @param Throwable              $exception           The caught Exception object
+     * @param bool                   $displayErrorDetails Whether or not to display the error details
+     * @param bool                   $logErrors           Whether or not to log errors
+     * @param bool                   $logErrorDetails     Whether or not to log error details
+     */
+    public function __invoke(
+        ServerRequestInterface $request,
+        Throwable $exception,
+        bool $displayErrorDetails,
+        bool $logErrors,
+        bool $logErrorDetails
+    ): ResponseInterface {
+        $this->displayErrorDetails = $displayErrorDetails;
+        $this->logErrors = $logErrors;
+        $this->logErrorDetails = $logErrorDetails;
+        $this->request = $request;
+        $this->exception = $exception;
+        $this->method = $request->getMethod();
+        $this->statusCode = $this->determineStatusCode();
+        if ($this->contentType === null) {
+            $this->contentType = $this->determineContentType($request);
+        }
+
+        if ($logErrors) {
+            $this->writeToErrorLog();
+        }
+
+        return $this->respond();
+    }
+
+    /**
+     * Force the content type for all error handler responses.
+     *
+     * @param string|null $contentType The content type
+     */
+    public function forceContentType(?string $contentType): void
+    {
+        $this->contentType = $contentType;
+    }
+
+    protected function determineStatusCode(): int
+    {
+        if ($this->method === 'OPTIONS') {
+            return 200;
+        }
+
+        if ($this->exception instanceof HttpException) {
+            return $this->exception->getCode();
+        }
+
+        return 500;
+    }
+
+    /**
+     * Determine which content type we know about is wanted using Accept header
+     *
+     * Note: This method is a bare-bones implementation designed specifically for
+     * Slim's error handling requirements. Consider a fully-feature solution such
+     * as willdurand/negotiation for any other situation.
+     */
+    protected function determineContentType(ServerRequestInterface $request): ?string
+    {
+        $acceptHeader = $request->getHeaderLine('Accept');
+        $selectedContentTypes = array_intersect(
+            explode(',', $acceptHeader),
+            array_keys($this->errorRenderers)
+        );
+        $count = count($selectedContentTypes);
+
+        if ($count) {
+            $current = current($selectedContentTypes);
+
+            /**
+             * Ensure other supported content types take precedence over text/plain
+             * when multiple content types are provided via Accept header.
+             */
+            if ($current === 'text/plain' && $count > 1) {
+                $next = next($selectedContentTypes);
+                if (is_string($next)) {
+                    return $next;
+                }
+            }
+
+            if (is_string($current)) {
+                return $current;
+            }
+        }
+
+        if (preg_match('/\+(json|xml)/', $acceptHeader, $matches)) {
+            $mediaType = 'application/' . $matches[1];
+            if (array_key_exists($mediaType, $this->errorRenderers)) {
+                return $mediaType;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Determine which renderer to use based on content type
+     *
+     * @throws RuntimeException
+     */
+    protected function determineRenderer(): callable
+    {
+        if ($this->contentType !== null && array_key_exists($this->contentType, $this->errorRenderers)) {
+            $renderer = $this->errorRenderers[$this->contentType];
+        } else {
+            $renderer = $this->defaultErrorRenderer;
+        }
+
+        return $this->callableResolver->resolve($renderer);
+    }
+
+    /**
+     * Register an error renderer for a specific content-type
+     *
+     * @param string  $contentType  The content-type this renderer should be registered to
+     * @param ErrorRendererInterface|string|callable $errorRenderer The error renderer
+     */
+    public function registerErrorRenderer(string $contentType, $errorRenderer): void
+    {
+        $this->errorRenderers[$contentType] = $errorRenderer;
+    }
+
+    /**
+     * Set the default error renderer
+     *
+     * @param string                                 $contentType   The content type of the default error renderer
+     * @param ErrorRendererInterface|string|callable $errorRenderer The default error renderer
+     */
+    public function setDefaultErrorRenderer(string $contentType, $errorRenderer): void
+    {
+        $this->defaultErrorRendererContentType = $contentType;
+        $this->defaultErrorRenderer = $errorRenderer;
+    }
+
+    /**
+     * Set the renderer for the error logger
+     *
+     * @param ErrorRendererInterface|string|callable $logErrorRenderer
+     */
+    public function setLogErrorRenderer($logErrorRenderer): void
+    {
+        $this->logErrorRenderer = $logErrorRenderer;
+    }
+
+    /**
+     * Write to the error log if $logErrors has been set to true
+     */
+    protected function writeToErrorLog(): void
+    {
+        $renderer = $this->callableResolver->resolve($this->logErrorRenderer);
+        $error = $renderer($this->exception, $this->logErrorDetails);
+        if (!$this->displayErrorDetails) {
+            $error .= "\nTips: To display error details in HTTP response ";
+            $error .= 'set "displayErrorDetails" to true in the ErrorHandler constructor.';
+        }
+        $this->logError($error);
+    }
+
+    /**
+     * Wraps the error_log function so that this can be easily tested
+     */
+    protected function logError(string $error): void
+    {
+        $this->logger->error($error);
+    }
+
+    /**
+     * Returns a default logger implementation.
+     */
+    protected function getDefaultLogger(): LoggerInterface
+    {
+        return new Logger();
+    }
+
+    protected function respond(): ResponseInterface
+    {
+        $response = $this->responseFactory->createResponse($this->statusCode);
+        if ($this->contentType !== null && array_key_exists($this->contentType, $this->errorRenderers)) {
+            $response = $response->withHeader('Content-type', $this->contentType);
+        } else {
+            $response = $response->withHeader('Content-type', $this->defaultErrorRendererContentType);
+        }
+
+        if ($this->exception instanceof HttpMethodNotAllowedException) {
+            $allowedMethods = implode(', ', $this->exception->getAllowedMethods());
+            $response = $response->withHeader('Allow', $allowedMethods);
+        }
+
+        $renderer = $this->determineRenderer();
+        $body = call_user_func($renderer, $this->exception, $this->displayErrorDetails);
+        if ($body !== false) {
+            /** @var string $body */
+            $response->getBody()->write($body);
+        }
+
+        return $response;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/NotAllowed.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/NotAllowed.php
deleted file mode 100644
index 345f0ff8..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/NotAllowed.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Handlers;
-
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Slim\Http\Body;
-use UnexpectedValueException;
-
-/**
- * Default Slim application not allowed handler
- *
- * It outputs a simple message in either JSON, XML or HTML based on the
- * Accept header.
- */
-class NotAllowed extends AbstractHandler
-{
-    /**
-     * Invoke error handler
-     *
-     * @param  ServerRequestInterface $request  The most recent Request object
-     * @param  ResponseInterface      $response The most recent Response object
-     * @param  string[]               $methods  Allowed HTTP methods
-     *
-     * @return ResponseInterface
-     * @throws UnexpectedValueException
-     */
-    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, array $methods)
-    {
-        if ($request->getMethod() === 'OPTIONS') {
-            $status = 200;
-            $contentType = 'text/plain';
-            $output = $this->renderPlainOptionsMessage($methods);
-        } else {
-            $status = 405;
-            $contentType = $this->determineContentType($request);
-            switch ($contentType) {
-                case 'application/json':
-                    $output = $this->renderJsonNotAllowedMessage($methods);
-                    break;
-
-                case 'text/xml':
-                case 'application/xml':
-                    $output = $this->renderXmlNotAllowedMessage($methods);
-                    break;
-
-                case 'text/html':
-                    $output = $this->renderHtmlNotAllowedMessage($methods);
-                    break;
-                default:
-                    throw new UnexpectedValueException('Cannot render unknown content type ' . $contentType);
-            }
-        }
-
-        $body = new Body(fopen('php://temp', 'r+'));
-        $body->write($output);
-        $allow = implode(', ', $methods);
-
-        return $response
-                ->withStatus($status)
-                ->withHeader('Content-type', $contentType)
-                ->withHeader('Allow', $allow)
-                ->withBody($body);
-    }
-
-    /**
-     * Render PLAIN message for OPTIONS response
-     *
-     * @param  array                  $methods
-     * @return string
-     */
-    protected function renderPlainOptionsMessage($methods)
-    {
-        $allow = implode(', ', $methods);
-
-        return 'Allowed methods: ' . $allow;
-    }
-
-    /**
-     * Render JSON not allowed message
-     *
-     * @param  array                  $methods
-     * @return string
-     */
-    protected function renderJsonNotAllowedMessage($methods)
-    {
-        $allow = implode(', ', $methods);
-
-        return '{"message":"Method not allowed. Must be one of: ' . $allow . '"}';
-    }
-
-    /**
-     * Render XML not allowed message
-     *
-     * @param  array                  $methods
-     * @return string
-     */
-    protected function renderXmlNotAllowedMessage($methods)
-    {
-        $allow = implode(', ', $methods);
-
-        return "<root><message>Method not allowed. Must be one of: $allow</message></root>";
-    }
-
-    /**
-     * Render HTML not allowed message
-     *
-     * @param  array                  $methods
-     * @return string
-     */
-    protected function renderHtmlNotAllowedMessage($methods)
-    {
-        $allow = implode(', ', $methods);
-        $output = <<<END
-<html>
-    <head>
-        <title>Method not allowed</title>
-        <style>
-            body{
-                margin:0;
-                padding:30px;
-                font:12px/1.5 Helvetica,Arial,Verdana,sans-serif;
-            }
-            h1{
-                margin:0;
-                font-size:48px;
-                font-weight:normal;
-                line-height:48px;
-            }
-        </style>
-    </head>
-    <body>
-        <h1>Method not allowed</h1>
-        <p>Method not allowed. Must be one of: <strong>$allow</strong></p>
-    </body>
-</html>
-END;
-
-        return $output;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/NotFound.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/NotFound.php
deleted file mode 100644
index b3330321..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/NotFound.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Handlers;
-
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Slim\Http\Body;
-use UnexpectedValueException;
-
-/**
- * Default Slim application not found handler.
- *
- * It outputs a simple message in either JSON, XML or HTML based on the
- * Accept header.
- */
-class NotFound extends AbstractHandler
-{
-    /**
-     * Invoke not found handler
-     *
-     * @param  ServerRequestInterface $request  The most recent Request object
-     * @param  ResponseInterface      $response The most recent Response object
-     *
-     * @return ResponseInterface
-     * @throws UnexpectedValueException
-     */
-    public function __invoke(ServerRequestInterface $request, ResponseInterface $response)
-    {
-        if ($request->getMethod() === 'OPTIONS') {
-            $contentType = 'text/plain';
-            $output = $this->renderPlainNotFoundOutput();
-        } else {
-            $contentType = $this->determineContentType($request);
-            switch ($contentType) {
-                case 'application/json':
-                    $output = $this->renderJsonNotFoundOutput();
-                    break;
-
-                case 'text/xml':
-                case 'application/xml':
-                    $output = $this->renderXmlNotFoundOutput();
-                    break;
-
-                case 'text/html':
-                    $output = $this->renderHtmlNotFoundOutput($request);
-                    break;
-
-                default:
-                    throw new UnexpectedValueException('Cannot render unknown content type ' . $contentType);
-            }
-        }
-
-        $body = new Body(fopen('php://temp', 'r+'));
-        $body->write($output);
-
-        return $response->withStatus(404)
-                        ->withHeader('Content-Type', $contentType)
-                        ->withBody($body);
-    }
-
-    /**
-     * Render plain not found message
-     *
-     * @return ResponseInterface
-     */
-    protected function renderPlainNotFoundOutput()
-    {
-        return 'Not found';
-    }
-
-    /**
-     * Return a response for application/json content not found
-     *
-     * @return ResponseInterface
-     */
-    protected function renderJsonNotFoundOutput()
-    {
-        return '{"message":"Not found"}';
-    }
-
-    /**
-     * Return a response for xml content not found
-     *
-     * @return ResponseInterface
-     */
-    protected function renderXmlNotFoundOutput()
-    {
-        return '<root><message>Not found</message></root>';
-    }
-
-    /**
-     * Return a response for text/html content not found
-     *
-     * @param  ServerRequestInterface $request  The most recent Request object
-     *
-     * @return ResponseInterface
-     */
-    protected function renderHtmlNotFoundOutput(ServerRequestInterface $request)
-    {
-        $homeUrl = (string)($request->getUri()->withPath('')->withQuery('')->withFragment(''));
-        return <<<END
-<html>
-    <head>
-        <title>Page Not Found</title>
-        <style>
-            body{
-                margin:0;
-                padding:30px;
-                font:12px/1.5 Helvetica,Arial,Verdana,sans-serif;
-            }
-            h1{
-                margin:0;
-                font-size:48px;
-                font-weight:normal;
-                line-height:48px;
-            }
-            strong{
-                display:inline-block;
-                width:65px;
-            }
-        </style>
-    </head>
-    <body>
-        <h1>Page Not Found</h1>
-        <p>
-            The page you are looking for could not be found. Check the address bar
-            to ensure your URL is spelled correctly. If all else fails, you can
-            visit our home page at the link below.
-        </p>
-        <a href='$homeUrl'>Visit the Home Page</a>
-    </body>
-</html>
-END;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/PhpError.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/PhpError.php
deleted file mode 100644
index 3ecce30c..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/PhpError.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Handlers;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Slim\Http\Body;
-use UnexpectedValueException;
-
-/**
- * Default Slim application error handler for PHP 7+ Throwables
- *
- * It outputs the error message and diagnostic information in either JSON, XML,
- * or HTML based on the Accept header.
- */
-class PhpError extends AbstractError
-{
-    /**
-     * Invoke error handler
-     *
-     * @param ServerRequestInterface $request   The most recent Request object
-     * @param ResponseInterface      $response  The most recent Response object
-     * @param \Throwable             $error     The caught Throwable object
-     *
-     * @return ResponseInterface
-     * @throws UnexpectedValueException
-     */
-    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, \Throwable $error)
-    {
-        $contentType = $this->determineContentType($request);
-        switch ($contentType) {
-            case 'application/json':
-                $output = $this->renderJsonErrorMessage($error);
-                break;
-
-            case 'text/xml':
-            case 'application/xml':
-                $output = $this->renderXmlErrorMessage($error);
-                break;
-
-            case 'text/html':
-                $output = $this->renderHtmlErrorMessage($error);
-                break;
-            default:
-                throw new UnexpectedValueException('Cannot render unknown content type ' . $contentType);
-        }
-
-        $this->writeToErrorLog($error);
-
-        $body = new Body(fopen('php://temp', 'r+'));
-        $body->write($output);
-
-        return $response
-                ->withStatus(500)
-                ->withHeader('Content-type', $contentType)
-                ->withBody($body);
-    }
-
-    /**
-     * Render HTML error page
-     *
-     * @param \Throwable $error
-     *
-     * @return string
-     */
-    protected function renderHtmlErrorMessage(\Throwable $error)
-    {
-        $title = 'Slim Application Error';
-
-        if ($this->displayErrorDetails) {
-            $html = '<p>The application could not run because of the following error:</p>';
-            $html .= '<h2>Details</h2>';
-            $html .= $this->renderHtmlError($error);
-
-            while ($error = $error->getPrevious()) {
-                $html .= '<h2>Previous error</h2>';
-                $html .= $this->renderHtmlError($error);
-            }
-        } else {
-            $html = '<p>A website error has occurred. Sorry for the temporary inconvenience.</p>';
-        }
-
-        $output = sprintf(
-            "<html><head><meta http-equiv='Content-Type' content='text/html; charset=utf-8'>" .
-            "<title>%s</title><style>body{margin:0;padding:30px;font:12px/1.5 Helvetica,Arial,Verdana," .
-            "sans-serif;}h1{margin:0;font-size:48px;font-weight:normal;line-height:48px;}strong{" .
-            "display:inline-block;width:65px;}</style></head><body><h1>%s</h1>%s</body></html>",
-            $title,
-            $title,
-            $html
-        );
-
-        return $output;
-    }
-
-    /**
-     * Render error as HTML.
-     *
-     * @param \Throwable $error
-     *
-     * @return string
-     */
-    protected function renderHtmlError(\Throwable $error)
-    {
-        $html = sprintf('<div><strong>Type:</strong> %s</div>', get_class($error));
-
-        if (($code = $error->getCode())) {
-            $html .= sprintf('<div><strong>Code:</strong> %s</div>', $code);
-        }
-
-        if (($message = $error->getMessage())) {
-            $html .= sprintf('<div><strong>Message:</strong> %s</div>', htmlentities($message));
-        }
-
-        if (($file = $error->getFile())) {
-            $html .= sprintf('<div><strong>File:</strong> %s</div>', $file);
-        }
-
-        if (($line = $error->getLine())) {
-            $html .= sprintf('<div><strong>Line:</strong> %s</div>', $line);
-        }
-
-        if (($trace = $error->getTraceAsString())) {
-            $html .= '<h2>Trace</h2>';
-            $html .= sprintf('<pre>%s</pre>', htmlentities($trace));
-        }
-
-        return $html;
-    }
-
-    /**
-     * Render JSON error
-     *
-     * @param \Throwable $error
-     *
-     * @return string
-     */
-    protected function renderJsonErrorMessage(\Throwable $error)
-    {
-        $json = [
-            'message' => 'Slim Application Error',
-        ];
-
-        if ($this->displayErrorDetails) {
-            $json['error'] = [];
-
-            do {
-                $json['error'][] = [
-                    'type' => get_class($error),
-                    'code' => $error->getCode(),
-                    'message' => $error->getMessage(),
-                    'file' => $error->getFile(),
-                    'line' => $error->getLine(),
-                    'trace' => explode("\n", $error->getTraceAsString()),
-                ];
-            } while ($error = $error->getPrevious());
-        }
-
-        return json_encode($json, JSON_PRETTY_PRINT);
-    }
-
-    /**
-     * Render XML error
-     *
-     * @param \Throwable $error
-     *
-     * @return string
-     */
-    protected function renderXmlErrorMessage(\Throwable $error)
-    {
-        $xml = "<error>\n  <message>Slim Application Error</message>\n";
-        if ($this->displayErrorDetails) {
-            do {
-                $xml .= "  <error>\n";
-                $xml .= "    <type>" . get_class($error) . "</type>\n";
-                $xml .= "    <code>" . $error->getCode() . "</code>\n";
-                $xml .= "    <message>" . $this->createCdataSection($error->getMessage()) . "</message>\n";
-                $xml .= "    <file>" . $error->getFile() . "</file>\n";
-                $xml .= "    <line>" . $error->getLine() . "</line>\n";
-                $xml .= "    <trace>" . $this->createCdataSection($error->getTraceAsString()) . "</trace>\n";
-                $xml .= "  </error>\n";
-            } while ($error = $error->getPrevious());
-        }
-        $xml .= "</error>";
-
-        return $xml;
-    }
-
-    /**
-     * Returns a CDATA section with the given content.
-     *
-     * @param  string $content
-     * @return string
-     */
-    private function createCdataSection($content)
-    {
-        return sprintf('<![CDATA[%s]]>', str_replace(']]>', ']]]]><![CDATA[>', $content));
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestHandler.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestHandler.php
new file mode 100644
index 00000000..ea88a5f1
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestHandler.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Handlers\Strategies;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Slim\Interfaces\RequestHandlerInvocationStrategyInterface;
+
+/**
+ * PSR-15 RequestHandler invocation strategy
+ */
+class RequestHandler implements RequestHandlerInvocationStrategyInterface
+{
+    protected bool $appendRouteArgumentsToRequestAttributes;
+
+    public function __construct(bool $appendRouteArgumentsToRequestAttributes = false)
+    {
+        $this->appendRouteArgumentsToRequestAttributes = $appendRouteArgumentsToRequestAttributes;
+    }
+
+    /**
+     * Invoke a route callable that implements RequestHandlerInterface
+     *
+     * @param array<string, string>  $routeArguments
+     */
+    public function __invoke(
+        callable $callable,
+        ServerRequestInterface $request,
+        ResponseInterface $response,
+        array $routeArguments
+    ): ResponseInterface {
+        if ($this->appendRouteArgumentsToRequestAttributes) {
+            foreach ($routeArguments as $k => $v) {
+                $request = $request->withAttribute($k, $v);
+            }
+        }
+
+        return $callable($request);
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestResponse.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestResponse.php
index ad99b56e..45b2c05a 100644
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestResponse.php
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestResponse.php
@@ -1,11 +1,13 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
  */
+
+declare(strict_types=1);
+
 namespace Slim\Handlers\Strategies;
 
 use Psr\Http\Message\ResponseInterface;
@@ -21,23 +23,18 @@ class RequestResponse implements InvocationStrategyInterface
      * Invoke a route callable with request, response, and all route parameters
      * as an array of arguments.
      *
-     * @param array|callable         $callable
-     * @param ServerRequestInterface $request
-     * @param ResponseInterface      $response
-     * @param array                  $routeArguments
-     *
-     * @return mixed
+     * @param array<string, string>  $routeArguments
      */
     public function __invoke(
         callable $callable,
         ServerRequestInterface $request,
         ResponseInterface $response,
         array $routeArguments
-    ) {
+    ): ResponseInterface {
         foreach ($routeArguments as $k => $v) {
             $request = $request->withAttribute($k, $v);
         }
 
-        return call_user_func($callable, $request, $response, $routeArguments);
+        return $callable($request, $response, $routeArguments);
     }
 }
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestResponseArgs.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestResponseArgs.php
index 739cc7ee..c4ab16df 100644
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestResponseArgs.php
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestResponseArgs.php
@@ -1,42 +1,38 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
  */
+
+declare(strict_types=1);
+
 namespace Slim\Handlers\Strategies;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Slim\Interfaces\InvocationStrategyInterface;
 
+use function array_values;
+
 /**
  * Route callback strategy with route parameters as individual arguments.
  */
 class RequestResponseArgs implements InvocationStrategyInterface
 {
-
     /**
      * Invoke a route callable with request, response and all route parameters
      * as individual arguments.
      *
-     * @param array|callable         $callable
-     * @param ServerRequestInterface $request
-     * @param ResponseInterface      $response
-     * @param array                  $routeArguments
-     *
-     * @return mixed
+     * @param array<string, string>  $routeArguments
      */
     public function __invoke(
         callable $callable,
         ServerRequestInterface $request,
         ResponseInterface $response,
         array $routeArguments
-    ) {
-        array_unshift($routeArguments, $request, $response);
-
-        return call_user_func_array($callable, $routeArguments);
+    ): ResponseInterface {
+        return $callable($request, $response, ...array_values($routeArguments));
     }
 }
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestResponseNamedArgs.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestResponseNamedArgs.php
new file mode 100644
index 00000000..651111dd
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestResponseNamedArgs.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Handlers\Strategies;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Slim\Interfaces\InvocationStrategyInterface;
+use RuntimeException;
+
+/**
+ * Route callback strategy with route parameters as individual arguments.
+ */
+class RequestResponseNamedArgs implements InvocationStrategyInterface
+{
+    public function __construct()
+    {
+        if (PHP_VERSION_ID < 80000) {
+            throw new RuntimeException('Named arguments are only available for PHP >= 8.0.0');
+        }
+    }
+
+    /**
+     * Invoke a route callable with request, response and all route parameters
+     * as individual arguments.
+     *
+     * @param array<string, string>  $routeArguments
+     */
+    public function __invoke(
+        callable $callable,
+        ServerRequestInterface $request,
+        ResponseInterface $response,
+        array $routeArguments
+    ): ResponseInterface {
+        return $callable($request, $response, ...$routeArguments);
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Body.php b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Body.php
deleted file mode 100644
index 7a7b4df8..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Body.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Http;
-
-/**
- * Body
- *
- * This class represents an HTTP message body and encapsulates a
- * streamable resource according to the PSR-7 standard.
- *
- * @link https://github.com/php-fig/http-message/blob/master/src/StreamInterface.php
- */
-class Body extends Stream
-{
-
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Cookies.php b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Cookies.php
deleted file mode 100644
index c07c96f2..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Cookies.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Http;
-
-use InvalidArgumentException;
-use Slim\Interfaces\Http\CookiesInterface;
-
-/**
- * Cookie helper
- */
-class Cookies implements CookiesInterface
-{
-    /**
-     * Cookies from HTTP request
-     *
-     * @var array
-     */
-    protected $requestCookies = [];
-
-    /**
-     * Cookies for HTTP response
-     *
-     * @var array
-     */
-    protected $responseCookies = [];
-
-    /**
-     * Default cookie properties
-     *
-     * @var array
-     */
-    protected $defaults = [
-        'value' => '',
-        'domain' => null,
-        'hostonly' => null,
-        'path' => null,
-        'expires' => null,
-        'secure' => false,
-        'httponly' => false
-    ];
-
-    /**
-     * Create new cookies helper
-     *
-     * @param array $cookies
-     */
-    public function __construct(array $cookies = [])
-    {
-        $this->requestCookies = $cookies;
-    }
-
-    /**
-     * Set default cookie properties
-     *
-     * @param array $settings
-     */
-    public function setDefaults(array $settings)
-    {
-        $this->defaults = array_replace($this->defaults, $settings);
-    }
-
-    /**
-     * Get request cookie
-     *
-     * @param  string $name    Cookie name
-     * @param  mixed  $default Cookie default value
-     *
-     * @return mixed Cookie value if present, else default
-     */
-    public function get($name, $default = null)
-    {
-        return isset($this->requestCookies[$name]) ? $this->requestCookies[$name] : $default;
-    }
-
-    /**
-     * Set response cookie
-     *
-     * @param string       $name  Cookie name
-     * @param string|array $value Cookie value, or cookie properties
-     */
-    public function set($name, $value)
-    {
-        if (!is_array($value)) {
-            $value = ['value' => (string)$value];
-        }
-        $this->responseCookies[$name] = array_replace($this->defaults, $value);
-    }
-
-    /**
-     * Convert to `Set-Cookie` headers
-     *
-     * @return string[]
-     */
-    public function toHeaders()
-    {
-        $headers = [];
-        foreach ($this->responseCookies as $name => $properties) {
-            $headers[] = $this->toHeader($name, $properties);
-        }
-
-        return $headers;
-    }
-
-    /**
-     * Convert to `Set-Cookie` header
-     *
-     * @param  string $name       Cookie name
-     * @param  array  $properties Cookie properties
-     *
-     * @return string
-     */
-    protected function toHeader($name, array $properties)
-    {
-        $result = urlencode($name) . '=' . urlencode($properties['value']);
-
-        if (isset($properties['domain'])) {
-            $result .= '; domain=' . $properties['domain'];
-        }
-
-        if (isset($properties['path'])) {
-            $result .= '; path=' . $properties['path'];
-        }
-
-        if (isset($properties['expires'])) {
-            if (is_string($properties['expires'])) {
-                $timestamp = strtotime($properties['expires']);
-            } else {
-                $timestamp = (int)$properties['expires'];
-            }
-            if ($timestamp !== 0) {
-                $result .= '; expires=' . gmdate('D, d-M-Y H:i:s e', $timestamp);
-            }
-        }
-
-        if (isset($properties['secure']) && $properties['secure']) {
-            $result .= '; secure';
-        }
-
-        if (isset($properties['hostonly']) && $properties['hostonly']) {
-            $result .= '; HostOnly';
-        }
-
-        if (isset($properties['httponly']) && $properties['httponly']) {
-            $result .= '; HttpOnly';
-        }
-
-        return $result;
-    }
-
-    /**
-     * Parse HTTP request `Cookie:` header and extract
-     * into a PHP associative array.
-     *
-     * @param  string $header The raw HTTP request `Cookie:` header
-     *
-     * @return array Associative array of cookie names and values
-     *
-     * @throws InvalidArgumentException if the cookie data cannot be parsed
-     */
-    public static function parseHeader($header)
-    {
-        if (is_array($header) === true) {
-            $header = isset($header[0]) ? $header[0] : '';
-        }
-
-        if (is_string($header) === false) {
-            throw new InvalidArgumentException('Cannot parse Cookie data. Header value must be a string.');
-        }
-
-        $header = rtrim($header, "\r\n");
-        $pieces = preg_split('@[;]\s*@', $header);
-        $cookies = [];
-
-        foreach ($pieces as $cookie) {
-            $cookie = explode('=', $cookie, 2);
-
-            if (count($cookie) === 2) {
-                $key = urldecode($cookie[0]);
-                $value = urldecode($cookie[1]);
-
-                if (!isset($cookies[$key])) {
-                    $cookies[$key] = $value;
-                }
-            }
-        }
-
-        return $cookies;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Environment.php b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Environment.php
deleted file mode 100644
index cd452fcf..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Environment.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Http;
-
-use Slim\Collection;
-use Slim\Interfaces\Http\EnvironmentInterface;
-
-/**
- * Environment
- *
- * This class decouples the Slim application from the global PHP environment.
- * This is particularly useful for unit testing, but it also lets us create
- * custom sub-requests.
- */
-class Environment extends Collection implements EnvironmentInterface
-{
-    /**
-     * Create mock environment
-     *
-     * @param  array $userData Array of custom environment keys and values
-     *
-     * @return self
-     */
-    public static function mock(array $userData = [])
-    {
-        //Validates if default protocol is HTTPS to set default port 443
-        if ((isset($userData['HTTPS']) && $userData['HTTPS'] !== 'off') ||
-            ((isset($userData['REQUEST_SCHEME']) && $userData['REQUEST_SCHEME'] === 'https'))) {
-            $defscheme = 'https';
-            $defport = 443;
-        } else {
-            $defscheme = 'http';
-            $defport = 80;
-        }
-
-        $data = array_merge([
-            'SERVER_PROTOCOL'      => 'HTTP/1.1',
-            'REQUEST_METHOD'       => 'GET',
-            'REQUEST_SCHEME'       => $defscheme,
-            'SCRIPT_NAME'          => '',
-            'REQUEST_URI'          => '',
-            'QUERY_STRING'         => '',
-            'SERVER_NAME'          => 'localhost',
-            'SERVER_PORT'          => $defport,
-            'HTTP_HOST'            => 'localhost',
-            'HTTP_ACCEPT'          => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
-            'HTTP_ACCEPT_LANGUAGE' => 'en-US,en;q=0.8',
-            'HTTP_ACCEPT_CHARSET'  => 'ISO-8859-1,utf-8;q=0.7,*;q=0.3',
-            'HTTP_USER_AGENT'      => 'Slim Framework',
-            'REMOTE_ADDR'          => '127.0.0.1',
-            'REQUEST_TIME'         => time(),
-            'REQUEST_TIME_FLOAT'   => microtime(true),
-        ], $userData);
-
-        return new static($data);
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Headers.php b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Headers.php
deleted file mode 100644
index ef50f84b..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Headers.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Http;
-
-use Slim\Collection;
-use Slim\Interfaces\Http\HeadersInterface;
-
-/**
- * Headers
- *
- * This class represents a collection of HTTP headers
- * that is used in both the HTTP request and response objects.
- * It also enables header name case-insensitivity when
- * getting or setting a header value.
- *
- * Each HTTP header can have multiple values. This class
- * stores values into an array for each header name. When
- * you request a header value, you receive an array of values
- * for that header.
- */
-class Headers extends Collection implements HeadersInterface
-{
-    /**
-     * Special HTTP headers that do not have the "HTTP_" prefix
-     *
-     * @var array
-     */
-    protected static $special = [
-        'CONTENT_TYPE' => 1,
-        'CONTENT_LENGTH' => 1,
-        'PHP_AUTH_USER' => 1,
-        'PHP_AUTH_PW' => 1,
-        'PHP_AUTH_DIGEST' => 1,
-        'AUTH_TYPE' => 1,
-    ];
-
-    /**
-     * Create new headers collection with data extracted from
-     * the application Environment object
-     *
-     * @param Environment $environment The Slim application Environment
-     *
-     * @return self
-     */
-    public static function createFromEnvironment(Environment $environment)
-    {
-        $data = [];
-        $environment = self::determineAuthorization($environment);
-        foreach ($environment as $key => $value) {
-            $key = strtoupper($key);
-            if (isset(static::$special[$key]) || strpos($key, 'HTTP_') === 0) {
-                if ($key !== 'HTTP_CONTENT_LENGTH') {
-                    $data[$key] =  $value;
-                }
-            }
-        }
-
-        return new static($data);
-    }
-
-    /**
-     * If HTTP_AUTHORIZATION does not exist tries to get it from
-     * getallheaders() when available.
-     *
-     * @param Environment $environment The Slim application Environment
-     *
-     * @return Environment
-     */
-
-    public static function determineAuthorization(Environment $environment)
-    {
-        $authorization = $environment->get('HTTP_AUTHORIZATION');
-
-        if (empty($authorization) && is_callable('getallheaders')) {
-            $headers = getallheaders();
-            $headers = array_change_key_case($headers, CASE_LOWER);
-            if (isset($headers['authorization'])) {
-                $environment->set('HTTP_AUTHORIZATION', $headers['authorization']);
-            }
-        }
-
-        return $environment;
-    }
-
-    /**
-     * Return array of HTTP header names and values.
-     * This method returns the _original_ header name
-     * as specified by the end user.
-     *
-     * @return array
-     */
-    public function all()
-    {
-        $all = parent::all();
-        $out = [];
-        foreach ($all as $key => $props) {
-            $out[$props['originalKey']] = $props['value'];
-        }
-
-        return $out;
-    }
-
-    /**
-     * Set HTTP header value
-     *
-     * This method sets a header value. It replaces
-     * any values that may already exist for the header name.
-     *
-     * @param string $key   The case-insensitive header name
-     * @param string $value The header value
-     */
-    public function set($key, $value)
-    {
-        if (!is_array($value)) {
-            $value = [$value];
-        }
-        parent::set($this->normalizeKey($key), [
-            'value' => $value,
-            'originalKey' => $key
-        ]);
-    }
-
-    /**
-     * Get HTTP header value
-     *
-     * @param  string  $key     The case-insensitive header name
-     * @param  mixed   $default The default value if key does not exist
-     *
-     * @return string[]
-     */
-    public function get($key, $default = null)
-    {
-        if ($this->has($key)) {
-            return parent::get($this->normalizeKey($key))['value'];
-        }
-
-        return $default;
-    }
-
-    /**
-     * Get HTTP header key as originally specified
-     *
-     * @param  string   $key     The case-insensitive header name
-     * @param  mixed    $default The default value if key does not exist
-     *
-     * @return string
-     */
-    public function getOriginalKey($key, $default = null)
-    {
-        if ($this->has($key)) {
-            return parent::get($this->normalizeKey($key))['originalKey'];
-        }
-
-        return $default;
-    }
-
-    /**
-     * Add HTTP header value
-     *
-     * This method appends a header value. Unlike the set() method,
-     * this method _appends_ this new value to any values
-     * that already exist for this header name.
-     *
-     * @param string       $key   The case-insensitive header name
-     * @param array|string $value The new header value(s)
-     */
-    public function add($key, $value)
-    {
-        $oldValues = $this->get($key, []);
-        $newValues = is_array($value) ? $value : [$value];
-        $this->set($key, array_merge($oldValues, array_values($newValues)));
-    }
-
-    /**
-     * Does this collection have a given header?
-     *
-     * @param  string $key The case-insensitive header name
-     *
-     * @return bool
-     */
-    public function has($key)
-    {
-        return parent::has($this->normalizeKey($key));
-    }
-
-    /**
-     * Remove header from collection
-     *
-     * @param  string $key The case-insensitive header name
-     */
-    public function remove($key)
-    {
-        parent::remove($this->normalizeKey($key));
-    }
-
-    /**
-     * Normalize header name
-     *
-     * This method transforms header names into a
-     * normalized form. This is how we enable case-insensitive
-     * header names in the other methods in this class.
-     *
-     * @param  string $key The case-insensitive header name
-     *
-     * @return string Normalized header name
-     */
-    public function normalizeKey($key)
-    {
-        $key = strtr(strtolower($key), '_', '-');
-        if (strpos($key, 'http-') === 0) {
-            $key = substr($key, 5);
-        }
-
-        return $key;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Message.php b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Message.php
deleted file mode 100644
index 9195fb5b..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Message.php
+++ /dev/null
@@ -1,305 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Http;
-
-use InvalidArgumentException;
-use Psr\Http\Message\MessageInterface;
-use Psr\Http\Message\StreamInterface;
-
-/**
- * Abstract message (base class for Request and Response)
- *
- * This class represents a general HTTP message. It provides common properties and methods for
- * the HTTP request and response, as defined in the PSR-7 MessageInterface.
- *
- * @link https://github.com/php-fig/http-message/blob/master/src/MessageInterface.php
- * @see Slim\Http\Request
- * @see Slim\Http\Response
- */
-abstract class Message implements MessageInterface
-{
-    /**
-     * Protocol version
-     *
-     * @var string
-     */
-    protected $protocolVersion = '1.1';
-
-    /**
-     * A map of valid protocol versions
-     *
-     * @var array
-     */
-    protected static $validProtocolVersions = [
-        '1.0' => true,
-        '1.1' => true,
-        '2.0' => true,
-        '2' => true,
-    ];
-
-    /**
-     * Headers
-     *
-     * @var \Slim\Interfaces\Http\HeadersInterface
-     */
-    protected $headers;
-
-    /**
-     * Body object
-     *
-     * @var \Psr\Http\Message\StreamInterface
-     */
-    protected $body;
-
-
-    /**
-     * Disable magic setter to ensure immutability
-     */
-    public function __set($name, $value)
-    {
-        // Do nothing
-    }
-
-    /*******************************************************************************
-     * Protocol
-     ******************************************************************************/
-
-    /**
-     * Retrieves the HTTP protocol version as a string.
-     *
-     * The string MUST contain only the HTTP version number (e.g., "1.1", "1.0").
-     *
-     * @return string HTTP protocol version.
-     */
-    public function getProtocolVersion()
-    {
-        return $this->protocolVersion;
-    }
-
-    /**
-     * Return an instance with the specified HTTP protocol version.
-     *
-     * The version string MUST contain only the HTTP version number (e.g.,
-     * "1.1", "1.0").
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * new protocol version.
-     *
-     * @param string $version HTTP protocol version
-     * @return static
-     * @throws InvalidArgumentException if the http version is an invalid number
-     */
-    public function withProtocolVersion($version)
-    {
-        if (!isset(self::$validProtocolVersions[$version])) {
-            throw new InvalidArgumentException(
-                'Invalid HTTP version. Must be one of: '
-                . implode(', ', array_keys(self::$validProtocolVersions))
-            );
-        }
-        $clone = clone $this;
-        $clone->protocolVersion = $version;
-
-        return $clone;
-    }
-
-    /*******************************************************************************
-     * Headers
-     ******************************************************************************/
-
-    /**
-     * Retrieves all message header values.
-     *
-     * The keys represent the header name as it will be sent over the wire, and
-     * each value is an array of strings associated with the header.
-     *
-     *     // Represent the headers as a string
-     *     foreach ($message->getHeaders() as $name => $values) {
-     *         echo $name . ": " . implode(", ", $values);
-     *     }
-     *
-     *     // Emit headers iteratively:
-     *     foreach ($message->getHeaders() as $name => $values) {
-     *         foreach ($values as $value) {
-     *             header(sprintf('%s: %s', $name, $value), false);
-     *         }
-     *     }
-     *
-     * While header names are not case-sensitive, getHeaders() will preserve the
-     * exact case in which headers were originally specified.
-     *
-     * @return array Returns an associative array of the message's headers. Each
-     *     key MUST be a header name, and each value MUST be an array of strings
-     *     for that header.
-     */
-    public function getHeaders()
-    {
-        return $this->headers->all();
-    }
-
-    /**
-     * Checks if a header exists by the given case-insensitive name.
-     *
-     * @param string $name Case-insensitive header field name.
-     * @return bool Returns true if any header names match the given header
-     *     name using a case-insensitive string comparison. Returns false if
-     *     no matching header name is found in the message.
-     */
-    public function hasHeader($name)
-    {
-        return $this->headers->has($name);
-    }
-
-    /**
-     * Retrieves a message header value by the given case-insensitive name.
-     *
-     * This method returns an array of all the header values of the given
-     * case-insensitive header name.
-     *
-     * If the header does not appear in the message, this method MUST return an
-     * empty array.
-     *
-     * @param string $name Case-insensitive header field name.
-     * @return string[] An array of string values as provided for the given
-     *    header. If the header does not appear in the message, this method MUST
-     *    return an empty array.
-     */
-    public function getHeader($name)
-    {
-        return $this->headers->get($name, []);
-    }
-
-    /**
-     * Retrieves a comma-separated string of the values for a single header.
-     *
-     * This method returns all of the header values of the given
-     * case-insensitive header name as a string concatenated together using
-     * a comma.
-     *
-     * NOTE: Not all header values may be appropriately represented using
-     * comma concatenation. For such headers, use getHeader() instead
-     * and supply your own delimiter when concatenating.
-     *
-     * If the header does not appear in the message, this method MUST return
-     * an empty string.
-     *
-     * @param string $name Case-insensitive header field name.
-     * @return string A string of values as provided for the given header
-     *    concatenated together using a comma. If the header does not appear in
-     *    the message, this method MUST return an empty string.
-     */
-    public function getHeaderLine($name)
-    {
-        return implode(',', $this->headers->get($name, []));
-    }
-
-    /**
-     * Return an instance with the provided value replacing the specified header.
-     *
-     * While header names are case-insensitive, the casing of the header will
-     * be preserved by this function, and returned from getHeaders().
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * new and/or updated header and value.
-     *
-     * @param string $name Case-insensitive header field name.
-     * @param string|string[] $value Header value(s).
-     * @return static
-     * @throws \InvalidArgumentException for invalid header names or values.
-     */
-    public function withHeader($name, $value)
-    {
-        $clone = clone $this;
-        $clone->headers->set($name, $value);
-
-        return $clone;
-    }
-
-    /**
-     * Return an instance with the specified header appended with the given value.
-     *
-     * Existing values for the specified header will be maintained. The new
-     * value(s) will be appended to the existing list. If the header did not
-     * exist previously, it will be added.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * new header and/or value.
-     *
-     * @param string $name Case-insensitive header field name to add.
-     * @param string|string[] $value Header value(s).
-     * @return static
-     * @throws \InvalidArgumentException for invalid header names or values.
-     */
-    public function withAddedHeader($name, $value)
-    {
-        $clone = clone $this;
-        $clone->headers->add($name, $value);
-
-        return $clone;
-    }
-
-    /**
-     * Return an instance without the specified header.
-     *
-     * Header resolution MUST be done without case-sensitivity.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that removes
-     * the named header.
-     *
-     * @param string $name Case-insensitive header field name to remove.
-     * @return static
-     */
-    public function withoutHeader($name)
-    {
-        $clone = clone $this;
-        $clone->headers->remove($name);
-
-        return $clone;
-    }
-
-    /*******************************************************************************
-     * Body
-     ******************************************************************************/
-
-    /**
-     * Gets the body of the message.
-     *
-     * @return StreamInterface Returns the body as a stream.
-     */
-    public function getBody()
-    {
-        return $this->body;
-    }
-
-    /**
-     * Return an instance with the specified message body.
-     *
-     * The body MUST be a StreamInterface object.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return a new instance that has the
-     * new body stream.
-     *
-     * @param StreamInterface $body Body.
-     * @return static
-     * @throws \InvalidArgumentException When the body is not valid.
-     */
-    public function withBody(StreamInterface $body)
-    {
-        // TODO: Test for invalid body?
-        $clone = clone $this;
-        $clone->body = $body;
-
-        return $clone;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Request.php b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Request.php
deleted file mode 100644
index 4bea07e9..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Request.php
+++ /dev/null
@@ -1,1227 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Http;
-
-use Closure;
-use InvalidArgumentException;
-use Psr\Http\Message\UploadedFileInterface;
-use RuntimeException;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\UriInterface;
-use Psr\Http\Message\StreamInterface;
-use Slim\Collection;
-use Slim\Exception\InvalidMethodException;
-use Slim\Interfaces\Http\HeadersInterface;
-
-/**
- * Request
- *
- * This class represents an HTTP request. It manages
- * the request method, URI, headers, cookies, and body
- * according to the PSR-7 standard.
- *
- * @link https://github.com/php-fig/http-message/blob/master/src/MessageInterface.php
- * @link https://github.com/php-fig/http-message/blob/master/src/RequestInterface.php
- * @link https://github.com/php-fig/http-message/blob/master/src/ServerRequestInterface.php
- */
-class Request extends Message implements ServerRequestInterface
-{
-    /**
-     * The request method
-     *
-     * @var string
-     */
-    protected $method;
-
-    /**
-     * The original request method (ignoring override)
-     *
-     * @var string
-     */
-    protected $originalMethod;
-
-    /**
-     * The request URI object
-     *
-     * @var \Psr\Http\Message\UriInterface
-     */
-    protected $uri;
-
-    /**
-     * The request URI target (path + query string)
-     *
-     * @var string
-     */
-    protected $requestTarget;
-
-    /**
-     * The request query string params
-     *
-     * @var array
-     */
-    protected $queryParams;
-
-    /**
-     * The request cookies
-     *
-     * @var array
-     */
-    protected $cookies;
-
-    /**
-     * The server environment variables at the time the request was created.
-     *
-     * @var array
-     */
-    protected $serverParams;
-
-    /**
-     * The request attributes (route segment names and values)
-     *
-     * @var \Slim\Collection
-     */
-    protected $attributes;
-
-    /**
-     * The request body parsed (if possible) into a PHP array or object
-     *
-     * @var null|array|object
-     */
-    protected $bodyParsed = false;
-
-    /**
-     * List of request body parsers (e.g., url-encoded, JSON, XML, multipart)
-     *
-     * @var callable[]
-     */
-    protected $bodyParsers = [];
-
-    /**
-     * List of uploaded files
-     *
-     * @var UploadedFileInterface[]
-     */
-    protected $uploadedFiles;
-
-    /**
-     * Valid request methods
-     *
-     * @var string[]
-     * @deprecated
-     */
-    protected $validMethods = [
-        'CONNECT' => 1,
-        'DELETE' => 1,
-        'GET' => 1,
-        'HEAD' => 1,
-        'OPTIONS' => 1,
-        'PATCH' => 1,
-        'POST' => 1,
-        'PUT' => 1,
-        'TRACE' => 1,
-    ];
-
-    /**
-     * Create new HTTP request with data extracted from the application
-     * Environment object
-     *
-     * @param  Environment $environment The Slim application Environment
-     *
-     * @return static
-     */
-    public static function createFromEnvironment(Environment $environment)
-    {
-        $method = $environment['REQUEST_METHOD'];
-        $uri = Uri::createFromEnvironment($environment);
-        $headers = Headers::createFromEnvironment($environment);
-        $cookies = Cookies::parseHeader($headers->get('Cookie', []));
-        $serverParams = $environment->all();
-        $body = new RequestBody();
-        $uploadedFiles = UploadedFile::createFromEnvironment($environment);
-
-        $request = new static($method, $uri, $headers, $cookies, $serverParams, $body, $uploadedFiles);
-
-        if ($method === 'POST' &&
-            in_array($request->getMediaType(), ['application/x-www-form-urlencoded', 'multipart/form-data'])
-        ) {
-            // parsed body must be $_POST
-            $request = $request->withParsedBody($_POST);
-        }
-        return $request;
-    }
-
-    /**
-     * Create new HTTP request.
-     *
-     * Adds a host header when none was provided and a host is defined in uri.
-     *
-     * @param string           $method        The request method
-     * @param UriInterface     $uri           The request URI object
-     * @param HeadersInterface $headers       The request headers collection
-     * @param array            $cookies       The request cookies collection
-     * @param array            $serverParams  The server environment variables
-     * @param StreamInterface  $body          The request body object
-     * @param array            $uploadedFiles The request uploadedFiles collection
-     * @throws InvalidMethodException on invalid HTTP method
-     */
-    public function __construct(
-        $method,
-        UriInterface $uri,
-        HeadersInterface $headers,
-        array $cookies,
-        array $serverParams,
-        StreamInterface $body,
-        array $uploadedFiles = []
-    ) {
-        try {
-            $this->originalMethod = $this->filterMethod($method);
-        } catch (InvalidMethodException $e) {
-            $this->originalMethod = $method;
-        }
-
-        $this->uri = $uri;
-        $this->headers = $headers;
-        $this->cookies = $cookies;
-        $this->serverParams = $serverParams;
-        $this->attributes = new Collection();
-        $this->body = $body;
-        $this->uploadedFiles = $uploadedFiles;
-
-        if (isset($serverParams['SERVER_PROTOCOL'])) {
-            $this->protocolVersion = str_replace('HTTP/', '', $serverParams['SERVER_PROTOCOL']);
-        }
-
-        if (!$this->headers->has('Host') || $this->uri->getHost() !== '') {
-            $this->headers->set('Host', $this->uri->getHost());
-        }
-
-        $this->registerMediaTypeParser('application/json', function ($input) {
-            $result = json_decode($input, true);
-            if (!is_array($result)) {
-                return null;
-            }
-            return $result;
-        });
-
-        $this->registerMediaTypeParser('application/xml', function ($input) {
-            $backup = libxml_disable_entity_loader(true);
-            $backup_errors = libxml_use_internal_errors(true);
-            $result = simplexml_load_string($input);
-            libxml_disable_entity_loader($backup);
-            libxml_clear_errors();
-            libxml_use_internal_errors($backup_errors);
-            if ($result === false) {
-                return null;
-            }
-            return $result;
-        });
-
-        $this->registerMediaTypeParser('text/xml', function ($input) {
-            $backup = libxml_disable_entity_loader(true);
-            $backup_errors = libxml_use_internal_errors(true);
-            $result = simplexml_load_string($input);
-            libxml_disable_entity_loader($backup);
-            libxml_clear_errors();
-            libxml_use_internal_errors($backup_errors);
-            if ($result === false) {
-                return null;
-            }
-            return $result;
-        });
-
-        $this->registerMediaTypeParser('application/x-www-form-urlencoded', function ($input) {
-            parse_str($input, $data);
-            return $data;
-        });
-
-        // if the request had an invalid method, we can throw it now
-        if (isset($e) && $e instanceof InvalidMethodException) {
-            throw $e;
-        }
-    }
-
-    /**
-     * This method is applied to the cloned object
-     * after PHP performs an initial shallow-copy. This
-     * method completes a deep-copy by creating new objects
-     * for the cloned object's internal reference pointers.
-     */
-    public function __clone()
-    {
-        $this->headers = clone $this->headers;
-        $this->attributes = clone $this->attributes;
-        $this->body = clone $this->body;
-    }
-
-    /*******************************************************************************
-     * Method
-     ******************************************************************************/
-
-    /**
-     * Retrieves the HTTP method of the request.
-     *
-     * @return string Returns the request method.
-     */
-    public function getMethod()
-    {
-        if ($this->method === null) {
-            $this->method = $this->originalMethod;
-            $customMethod = $this->getHeaderLine('X-Http-Method-Override');
-
-            if ($customMethod) {
-                $this->method = $this->filterMethod($customMethod);
-            } elseif ($this->originalMethod === 'POST') {
-                $overrideMethod = $this->filterMethod($this->getParsedBodyParam('_METHOD'));
-                if ($overrideMethod !== null) {
-                    $this->method = $overrideMethod;
-                }
-
-                if ($this->getBody()->eof()) {
-                    $this->getBody()->rewind();
-                }
-            }
-        }
-
-        return $this->method;
-    }
-
-    /**
-     * Get the original HTTP method (ignore override).
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return string
-     */
-    public function getOriginalMethod()
-    {
-        return $this->originalMethod;
-    }
-
-    /**
-     * Return an instance with the provided HTTP method.
-     *
-     * While HTTP method names are typically all uppercase characters, HTTP
-     * method names are case-sensitive and thus implementations SHOULD NOT
-     * modify the given string.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * changed request method.
-     *
-     * @param string $method Case-sensitive method.
-     * @return static
-     * @throws \InvalidArgumentException for invalid HTTP methods.
-     */
-    public function withMethod($method)
-    {
-        $method = $this->filterMethod($method);
-        $clone = clone $this;
-        $clone->originalMethod = $method;
-        $clone->method = $method;
-
-        return $clone;
-    }
-
-    /**
-     * Validate the HTTP method
-     *
-     * @param  null|string $method
-     * @return null|string
-     * @throws \InvalidArgumentException on invalid HTTP method.
-     */
-    protected function filterMethod($method)
-    {
-        if ($method === null) {
-            return $method;
-        }
-
-        if (!is_string($method)) {
-            throw new InvalidArgumentException(sprintf(
-                'Unsupported HTTP method; must be a string, received %s',
-                (is_object($method) ? get_class($method) : gettype($method))
-            ));
-        }
-
-        $method = strtoupper($method);
-        if (preg_match("/^[!#$%&'*+.^_`|~0-9a-z-]+$/i", $method) !== 1) {
-            throw new InvalidMethodException($this, $method);
-        }
-
-        return $method;
-    }
-
-    /**
-     * Does this request use a given method?
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @param  string $method HTTP method
-     * @return bool
-     */
-    public function isMethod($method)
-    {
-        return $this->getMethod() === $method;
-    }
-
-    /**
-     * Is this a GET request?
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return bool
-     */
-    public function isGet()
-    {
-        return $this->isMethod('GET');
-    }
-
-    /**
-     * Is this a POST request?
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return bool
-     */
-    public function isPost()
-    {
-        return $this->isMethod('POST');
-    }
-
-    /**
-     * Is this a PUT request?
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return bool
-     */
-    public function isPut()
-    {
-        return $this->isMethod('PUT');
-    }
-
-    /**
-     * Is this a PATCH request?
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return bool
-     */
-    public function isPatch()
-    {
-        return $this->isMethod('PATCH');
-    }
-
-    /**
-     * Is this a DELETE request?
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return bool
-     */
-    public function isDelete()
-    {
-        return $this->isMethod('DELETE');
-    }
-
-    /**
-     * Is this a HEAD request?
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return bool
-     */
-    public function isHead()
-    {
-        return $this->isMethod('HEAD');
-    }
-
-    /**
-     * Is this a OPTIONS request?
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return bool
-     */
-    public function isOptions()
-    {
-        return $this->isMethod('OPTIONS');
-    }
-
-    /**
-     * Is this an XHR request?
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return bool
-     */
-    public function isXhr()
-    {
-        return $this->getHeaderLine('X-Requested-With') === 'XMLHttpRequest';
-    }
-
-    /*******************************************************************************
-     * URI
-     ******************************************************************************/
-
-    /**
-     * Retrieves the message's request target.
-     *
-     * Retrieves the message's request-target either as it will appear (for
-     * clients), as it appeared at request (for servers), or as it was
-     * specified for the instance (see withRequestTarget()).
-     *
-     * In most cases, this will be the origin-form of the composed URI,
-     * unless a value was provided to the concrete implementation (see
-     * withRequestTarget() below).
-     *
-     * If no URI is available, and no request-target has been specifically
-     * provided, this method MUST return the string "/".
-     *
-     * @return string
-     */
-    public function getRequestTarget()
-    {
-        if ($this->requestTarget) {
-            return $this->requestTarget;
-        }
-
-        if ($this->uri === null) {
-            return '/';
-        }
-
-        $basePath = $this->uri->getBasePath();
-        $path = $this->uri->getPath();
-        $path = $basePath . '/' . ltrim($path, '/');
-
-        $query = $this->uri->getQuery();
-        if ($query) {
-            $path .= '?' . $query;
-        }
-        $this->requestTarget = $path;
-
-        return $this->requestTarget;
-    }
-
-    /**
-     * Return an instance with the specific request-target.
-     *
-     * If the request needs a non-origin-form request-target — e.g., for
-     * specifying an absolute-form, authority-form, or asterisk-form —
-     * this method may be used to create an instance with the specified
-     * request-target, verbatim.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * changed request target.
-     *
-     * @link http://tools.ietf.org/html/rfc7230#section-2.7 (for the various
-     *     request-target forms allowed in request messages)
-     * @param mixed $requestTarget
-     * @return static
-     * @throws InvalidArgumentException if the request target is invalid
-     */
-    public function withRequestTarget($requestTarget)
-    {
-        if (preg_match('#\s#', $requestTarget)) {
-            throw new InvalidArgumentException(
-                'Invalid request target provided; must be a string and cannot contain whitespace'
-            );
-        }
-        $clone = clone $this;
-        $clone->requestTarget = $requestTarget;
-
-        return $clone;
-    }
-
-    /**
-     * Retrieves the URI instance.
-     *
-     * This method MUST return a UriInterface instance.
-     *
-     * @link http://tools.ietf.org/html/rfc3986#section-4.3
-     * @return UriInterface Returns a UriInterface instance
-     *     representing the URI of the request.
-     */
-    public function getUri()
-    {
-        return $this->uri;
-    }
-
-    /**
-     * Returns an instance with the provided URI.
-     *
-     * This method MUST update the Host header of the returned request by
-     * default if the URI contains a host component. If the URI does not
-     * contain a host component, any pre-existing Host header MUST be carried
-     * over to the returned request.
-     *
-     * You can opt-in to preserving the original state of the Host header by
-     * setting `$preserveHost` to `true`. When `$preserveHost` is set to
-     * `true`, this method interacts with the Host header in the following ways:
-     *
-     * - If the the Host header is missing or empty, and the new URI contains
-     *   a host component, this method MUST update the Host header in the returned
-     *   request.
-     * - If the Host header is missing or empty, and the new URI does not contain a
-     *   host component, this method MUST NOT update the Host header in the returned
-     *   request.
-     * - If a Host header is present and non-empty, this method MUST NOT update
-     *   the Host header in the returned request.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * new UriInterface instance.
-     *
-     * @link http://tools.ietf.org/html/rfc3986#section-4.3
-     * @param UriInterface $uri New request URI to use.
-     * @param bool $preserveHost Preserve the original state of the Host header.
-     * @return static
-     */
-    public function withUri(UriInterface $uri, $preserveHost = false)
-    {
-        $clone = clone $this;
-        $clone->uri = $uri;
-
-        if (!$preserveHost) {
-            if ($uri->getHost() !== '') {
-                $clone->headers->set('Host', $uri->getHost());
-            }
-        } else {
-            if ($uri->getHost() !== '' && (!$this->hasHeader('Host') || $this->getHeaderLine('Host') === '')) {
-                $clone->headers->set('Host', $uri->getHost());
-            }
-        }
-
-        return $clone;
-    }
-
-    /**
-     * Get request content type.
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return string|null The request content type, if known
-     */
-    public function getContentType()
-    {
-        $result = $this->getHeader('Content-Type');
-
-        return $result ? $result[0] : null;
-    }
-
-    /**
-     * Get request media type, if known.
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return string|null The request media type, minus content-type params
-     */
-    public function getMediaType()
-    {
-        $contentType = $this->getContentType();
-        if ($contentType) {
-            $contentTypeParts = preg_split('/\s*[;,]\s*/', $contentType);
-
-            return strtolower($contentTypeParts[0]);
-        }
-
-        return null;
-    }
-
-    /**
-     * Get request media type params, if known.
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return array
-     */
-    public function getMediaTypeParams()
-    {
-        $contentType = $this->getContentType();
-        $contentTypeParams = [];
-        if ($contentType) {
-            $contentTypeParts = preg_split('/\s*[;,]\s*/', $contentType);
-            $contentTypePartsLength = count($contentTypeParts);
-            for ($i = 1; $i < $contentTypePartsLength; $i++) {
-                $paramParts = explode('=', $contentTypeParts[$i]);
-                $contentTypeParams[strtolower($paramParts[0])] = $paramParts[1];
-            }
-        }
-
-        return $contentTypeParams;
-    }
-
-    /**
-     * Get request content character set, if known.
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return string|null
-     */
-    public function getContentCharset()
-    {
-        $mediaTypeParams = $this->getMediaTypeParams();
-        if (isset($mediaTypeParams['charset'])) {
-            return $mediaTypeParams['charset'];
-        }
-
-        return null;
-    }
-
-    /**
-     * Get request content length, if known.
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return int|null
-     */
-    public function getContentLength()
-    {
-        $result = $this->headers->get('Content-Length');
-
-        return $result ? (int)$result[0] : null;
-    }
-
-    /*******************************************************************************
-     * Cookies
-     ******************************************************************************/
-
-    /**
-     * Retrieve cookies.
-     *
-     * Retrieves cookies sent by the client to the server.
-     *
-     * The data MUST be compatible with the structure of the $_COOKIE
-     * superglobal.
-     *
-     * @return array
-     */
-    public function getCookieParams()
-    {
-        return $this->cookies;
-    }
-
-    /**
-     * Fetch cookie value from cookies sent by the client to the server.
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @param string $key     The attribute name.
-     * @param mixed  $default Default value to return if the attribute does not exist.
-     *
-     * @return mixed
-     */
-    public function getCookieParam($key, $default = null)
-    {
-        $cookies = $this->getCookieParams();
-        $result = $default;
-        if (isset($cookies[$key])) {
-            $result = $cookies[$key];
-        }
-
-        return $result;
-    }
-
-    /**
-     * Return an instance with the specified cookies.
-     *
-     * The data IS NOT REQUIRED to come from the $_COOKIE superglobal, but MUST
-     * be compatible with the structure of $_COOKIE. Typically, this data will
-     * be injected at instantiation.
-     *
-     * This method MUST NOT update the related Cookie header of the request
-     * instance, nor related values in the server params.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * updated cookie values.
-     *
-     * @param array $cookies Array of key/value pairs representing cookies.
-     * @return static
-     */
-    public function withCookieParams(array $cookies)
-    {
-        $clone = clone $this;
-        $clone->cookies = $cookies;
-
-        return $clone;
-    }
-
-    /*******************************************************************************
-     * Query Params
-     ******************************************************************************/
-
-    /**
-     * Retrieve query string arguments.
-     *
-     * Retrieves the deserialized query string arguments, if any.
-     *
-     * Note: the query params might not be in sync with the URI or server
-     * params. If you need to ensure you are only getting the original
-     * values, you may need to parse the query string from `getUri()->getQuery()`
-     * or from the `QUERY_STRING` server param.
-     *
-     * @return array
-     */
-    public function getQueryParams()
-    {
-        if (is_array($this->queryParams)) {
-            return $this->queryParams;
-        }
-
-        if ($this->uri === null) {
-            return [];
-        }
-
-        parse_str($this->uri->getQuery(), $this->queryParams); // <-- URL decodes data
-
-        return $this->queryParams;
-    }
-
-    /**
-     * Return an instance with the specified query string arguments.
-     *
-     * These values SHOULD remain immutable over the course of the incoming
-     * request. They MAY be injected during instantiation, such as from PHP's
-     * $_GET superglobal, or MAY be derived from some other value such as the
-     * URI. In cases where the arguments are parsed from the URI, the data
-     * MUST be compatible with what PHP's parse_str() would return for
-     * purposes of how duplicate query parameters are handled, and how nested
-     * sets are handled.
-     *
-     * Setting query string arguments MUST NOT change the URI stored by the
-     * request, nor the values in the server params.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * updated query string arguments.
-     *
-     * @param array $query Array of query string arguments, typically from
-     *     $_GET.
-     * @return static
-     */
-    public function withQueryParams(array $query)
-    {
-        $clone = clone $this;
-        $clone->queryParams = $query;
-
-        return $clone;
-    }
-
-    /*******************************************************************************
-     * File Params
-     ******************************************************************************/
-
-    /**
-     * Retrieve normalized file upload data.
-     *
-     * This method returns upload metadata in a normalized tree, with each leaf
-     * an instance of Psr\Http\Message\UploadedFileInterface.
-     *
-     * These values MAY be prepared from $_FILES or the message body during
-     * instantiation, or MAY be injected via withUploadedFiles().
-     *
-     * @return array An array tree of UploadedFileInterface instances; an empty
-     *     array MUST be returned if no data is present.
-     */
-    public function getUploadedFiles()
-    {
-        return $this->uploadedFiles;
-    }
-
-    /**
-     * Create a new instance with the specified uploaded files.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * updated body parameters.
-     *
-     * @param array $uploadedFiles An array tree of UploadedFileInterface instances.
-     * @return static
-     * @throws \InvalidArgumentException if an invalid structure is provided.
-     */
-    public function withUploadedFiles(array $uploadedFiles)
-    {
-        $clone = clone $this;
-        $clone->uploadedFiles = $uploadedFiles;
-
-        return $clone;
-    }
-
-    /*******************************************************************************
-     * Server Params
-     ******************************************************************************/
-
-    /**
-     * Retrieve server parameters.
-     *
-     * Retrieves data related to the incoming request environment,
-     * typically derived from PHP's $_SERVER superglobal. The data IS NOT
-     * REQUIRED to originate from $_SERVER.
-     *
-     * @return array
-     */
-    public function getServerParams()
-    {
-        return $this->serverParams;
-    }
-
-    /**
-     * Retrieve a server parameter.
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @param  string $key
-     * @param  mixed  $default
-     * @return mixed
-     */
-    public function getServerParam($key, $default = null)
-    {
-        $serverParams = $this->getServerParams();
-
-        return isset($serverParams[$key]) ? $serverParams[$key] : $default;
-    }
-
-    /*******************************************************************************
-     * Attributes
-     ******************************************************************************/
-
-    /**
-     * Retrieve attributes derived from the request.
-     *
-     * The request "attributes" may be used to allow injection of any
-     * parameters derived from the request: e.g., the results of path
-     * match operations; the results of decrypting cookies; the results of
-     * deserializing non-form-encoded message bodies; etc. Attributes
-     * will be application and request specific, and CAN be mutable.
-     *
-     * @return array Attributes derived from the request.
-     */
-    public function getAttributes()
-    {
-        return $this->attributes->all();
-    }
-
-    /**
-     * Retrieve a single derived request attribute.
-     *
-     * Retrieves a single derived request attribute as described in
-     * getAttributes(). If the attribute has not been previously set, returns
-     * the default value as provided.
-     *
-     * This method obviates the need for a hasAttribute() method, as it allows
-     * specifying a default value to return if the attribute is not found.
-     *
-     * @see getAttributes()
-     * @param string $name The attribute name.
-     * @param mixed $default Default value to return if the attribute does not exist.
-     * @return mixed
-     */
-    public function getAttribute($name, $default = null)
-    {
-        return $this->attributes->get($name, $default);
-    }
-
-    /**
-     * Return an instance with the specified derived request attribute.
-     *
-     * This method allows setting a single derived request attribute as
-     * described in getAttributes().
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * updated attribute.
-     *
-     * @see getAttributes()
-     * @param string $name The attribute name.
-     * @param mixed $value The value of the attribute.
-     * @return static
-     */
-    public function withAttribute($name, $value)
-    {
-        $clone = clone $this;
-        $clone->attributes->set($name, $value);
-
-        return $clone;
-    }
-
-    /**
-     * Create a new instance with the specified derived request attributes.
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * This method allows setting all new derived request attributes as
-     * described in getAttributes().
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return a new instance that has the
-     * updated attributes.
-     *
-     * @param  array $attributes New attributes
-     * @return static
-     */
-    public function withAttributes(array $attributes)
-    {
-        $clone = clone $this;
-        $clone->attributes = new Collection($attributes);
-
-        return $clone;
-    }
-
-    /**
-     * Return an instance that removes the specified derived request attribute.
-     *
-     * This method allows removing a single derived request attribute as
-     * described in getAttributes().
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that removes
-     * the attribute.
-     *
-     * @see getAttributes()
-     * @param string $name The attribute name.
-     * @return static
-     */
-    public function withoutAttribute($name)
-    {
-        $clone = clone $this;
-        $clone->attributes->remove($name);
-
-        return $clone;
-    }
-
-    /*******************************************************************************
-     * Body
-     ******************************************************************************/
-
-    /**
-     * Retrieve any parameters provided in the request body.
-     *
-     * If the request Content-Type is either application/x-www-form-urlencoded
-     * or multipart/form-data, and the request method is POST, this method MUST
-     * return the contents of $_POST.
-     *
-     * Otherwise, this method may return any results of deserializing
-     * the request body content; as parsing returns structured content, the
-     * potential types MUST be arrays or objects only. A null value indicates
-     * the absence of body content.
-     *
-     * @return null|array|object The deserialized body parameters, if any.
-     *     These will typically be an array or object.
-     * @throws RuntimeException if the request body media type parser returns an invalid value
-     */
-    public function getParsedBody()
-    {
-        if ($this->bodyParsed !== false) {
-            return $this->bodyParsed;
-        }
-
-        if (!$this->body) {
-            return null;
-        }
-
-        $mediaType = $this->getMediaType();
-
-        // look for a media type with a structured syntax suffix (RFC 6839)
-        $parts = explode('+', $mediaType);
-        if (count($parts) >= 2) {
-            $mediaType = 'application/' . $parts[count($parts)-1];
-        }
-
-        if (isset($this->bodyParsers[$mediaType]) === true) {
-            $body = (string)$this->getBody();
-            $parsed = $this->bodyParsers[$mediaType]($body);
-
-            if (!is_null($parsed) && !is_object($parsed) && !is_array($parsed)) {
-                throw new RuntimeException(
-                    'Request body media type parser return value must be an array, an object, or null'
-                );
-            }
-            $this->bodyParsed = $parsed;
-            return $this->bodyParsed;
-        }
-
-        return null;
-    }
-
-    /**
-     * Return an instance with the specified body parameters.
-     *
-     * These MAY be injected during instantiation.
-     *
-     * If the request Content-Type is either application/x-www-form-urlencoded
-     * or multipart/form-data, and the request method is POST, use this method
-     * ONLY to inject the contents of $_POST.
-     *
-     * The data IS NOT REQUIRED to come from $_POST, but MUST be the results of
-     * deserializing the request body content. Deserialization/parsing returns
-     * structured data, and, as such, this method ONLY accepts arrays or objects,
-     * or a null value if nothing was available to parse.
-     *
-     * As an example, if content negotiation determines that the request data
-     * is a JSON payload, this method could be used to create a request
-     * instance with the deserialized parameters.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * updated body parameters.
-     *
-     * @param null|array|object $data The deserialized body data. This will
-     *     typically be in an array or object.
-     * @return static
-     * @throws \InvalidArgumentException if an unsupported argument type is
-     *     provided.
-     */
-    public function withParsedBody($data)
-    {
-        if (!is_null($data) && !is_object($data) && !is_array($data)) {
-            throw new InvalidArgumentException('Parsed body value must be an array, an object, or null');
-        }
-
-        $clone = clone $this;
-        $clone->bodyParsed = $data;
-
-        return $clone;
-    }
-
-    /**
-     * Force Body to be parsed again.
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return $this
-     */
-    public function reparseBody()
-    {
-        $this->bodyParsed = false;
-
-        return $this;
-    }
-
-    /**
-     * Register media type parser.
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @param string   $mediaType A HTTP media type (excluding content-type
-     *     params).
-     * @param callable $callable  A callable that returns parsed contents for
-     *     media type.
-     */
-    public function registerMediaTypeParser($mediaType, callable $callable)
-    {
-        if ($callable instanceof Closure) {
-            $callable = $callable->bindTo($this);
-        }
-        $this->bodyParsers[(string)$mediaType] = $callable;
-    }
-
-    /*******************************************************************************
-     * Parameters (e.g., POST and GET data)
-     ******************************************************************************/
-
-    /**
-     * Fetch request parameter value from body or query string (in that order).
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @param  string $key The parameter key.
-     * @param  string $default The default value.
-     *
-     * @return mixed The parameter value.
-     */
-    public function getParam($key, $default = null)
-    {
-        $postParams = $this->getParsedBody();
-        $getParams = $this->getQueryParams();
-        $result = $default;
-        if (is_array($postParams) && isset($postParams[$key])) {
-            $result = $postParams[$key];
-        } elseif (is_object($postParams) && property_exists($postParams, $key)) {
-            $result = $postParams->$key;
-        } elseif (isset($getParams[$key])) {
-            $result = $getParams[$key];
-        }
-
-        return $result;
-    }
-
-    /**
-     * Fetch parameter value from request body.
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @param string $key
-     * @param mixed $default
-     *
-     * @return mixed
-     */
-    public function getParsedBodyParam($key, $default = null)
-    {
-        $postParams = $this->getParsedBody();
-        $result = $default;
-        if (is_array($postParams) && isset($postParams[$key])) {
-            $result = $postParams[$key];
-        } elseif (is_object($postParams) && property_exists($postParams, $key)) {
-            $result = $postParams->$key;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Fetch parameter value from query string.
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @param string $key
-     * @param mixed $default
-     *
-     * @return mixed
-     */
-    public function getQueryParam($key, $default = null)
-    {
-        $getParams = $this->getQueryParams();
-        $result = $default;
-        if (isset($getParams[$key])) {
-            $result = $getParams[$key];
-        }
-
-        return $result;
-    }
-
-    /**
-     * Fetch associative array of body and query string parameters.
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @param array|null $only list the keys to retrieve.
-     * @return array|null
-     */
-    public function getParams(array $only = null)
-    {
-        $params = $this->getQueryParams();
-        $postParams = $this->getParsedBody();
-        if ($postParams) {
-            $params = array_merge($params, (array)$postParams);
-        }
-
-        if ($only) {
-            $onlyParams = [];
-            foreach ($only as $key) {
-                if (array_key_exists($key, $params)) {
-                    $onlyParams[$key] = $params[$key];
-                }
-            }
-            return $onlyParams;
-        }
-
-        return $params;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Http/RequestBody.php b/advancedcontentfilter/vendor/slim/slim/Slim/Http/RequestBody.php
deleted file mode 100644
index 50887fdd..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Http/RequestBody.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Http;
-
-/**
- * Provides a PSR-7 implementation of a reusable raw request body
- */
-class RequestBody extends Body
-{
-    /**
-     * Create a new RequestBody.
-     */
-    public function __construct()
-    {
-        $stream = fopen('php://temp', 'w+');
-        stream_copy_to_stream(fopen('php://input', 'r'), $stream);
-        rewind($stream);
-
-        parent::__construct($stream);
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Response.php b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Response.php
deleted file mode 100644
index d8fb8dcb..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Response.php
+++ /dev/null
@@ -1,508 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Http;
-
-use InvalidArgumentException;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\StreamInterface;
-use Psr\Http\Message\UriInterface;
-use Slim\Interfaces\Http\HeadersInterface;
-
-/**
- * Response
- *
- * This class represents an HTTP response. It manages
- * the response status, headers, and body
- * according to the PSR-7 standard.
- *
- * @link https://github.com/php-fig/http-message/blob/master/src/MessageInterface.php
- * @link https://github.com/php-fig/http-message/blob/master/src/ResponseInterface.php
- */
-class Response extends Message implements ResponseInterface
-{
-    /**
-     * Status code
-     *
-     * @var int
-     */
-    protected $status = 200;
-
-    /**
-     * Reason phrase
-     *
-     * @var string
-     */
-    protected $reasonPhrase = '';
-
-    /**
-     * Status codes and reason phrases
-     *
-     * @var array
-     */
-    protected static $messages = [
-        //Informational 1xx
-        100 => 'Continue',
-        101 => 'Switching Protocols',
-        102 => 'Processing',
-        //Successful 2xx
-        200 => 'OK',
-        201 => 'Created',
-        202 => 'Accepted',
-        203 => 'Non-Authoritative Information',
-        204 => 'No Content',
-        205 => 'Reset Content',
-        206 => 'Partial Content',
-        207 => 'Multi-Status',
-        208 => 'Already Reported',
-        226 => 'IM Used',
-        //Redirection 3xx
-        300 => 'Multiple Choices',
-        301 => 'Moved Permanently',
-        302 => 'Found',
-        303 => 'See Other',
-        304 => 'Not Modified',
-        305 => 'Use Proxy',
-        306 => '(Unused)',
-        307 => 'Temporary Redirect',
-        308 => 'Permanent Redirect',
-        //Client Error 4xx
-        400 => 'Bad Request',
-        401 => 'Unauthorized',
-        402 => 'Payment Required',
-        403 => 'Forbidden',
-        404 => 'Not Found',
-        405 => 'Method Not Allowed',
-        406 => 'Not Acceptable',
-        407 => 'Proxy Authentication Required',
-        408 => 'Request Timeout',
-        409 => 'Conflict',
-        410 => 'Gone',
-        411 => 'Length Required',
-        412 => 'Precondition Failed',
-        413 => 'Request Entity Too Large',
-        414 => 'Request-URI Too Long',
-        415 => 'Unsupported Media Type',
-        416 => 'Requested Range Not Satisfiable',
-        417 => 'Expectation Failed',
-        418 => 'I\'m a teapot',
-        421 => 'Misdirected Request',
-        422 => 'Unprocessable Entity',
-        423 => 'Locked',
-        424 => 'Failed Dependency',
-        426 => 'Upgrade Required',
-        428 => 'Precondition Required',
-        429 => 'Too Many Requests',
-        431 => 'Request Header Fields Too Large',
-        444 => 'Connection Closed Without Response',
-        451 => 'Unavailable For Legal Reasons',
-        499 => 'Client Closed Request',
-        //Server Error 5xx
-        500 => 'Internal Server Error',
-        501 => 'Not Implemented',
-        502 => 'Bad Gateway',
-        503 => 'Service Unavailable',
-        504 => 'Gateway Timeout',
-        505 => 'HTTP Version Not Supported',
-        506 => 'Variant Also Negotiates',
-        507 => 'Insufficient Storage',
-        508 => 'Loop Detected',
-        510 => 'Not Extended',
-        511 => 'Network Authentication Required',
-        599 => 'Network Connect Timeout Error',
-    ];
-
-    /**
-     * EOL characters used for HTTP response.
-     *
-     * @var string
-     */
-     const EOL = "\r\n";
-
-    /**
-     * Create new HTTP response.
-     *
-     * @param int                   $status  The response status code.
-     * @param HeadersInterface|null $headers The response headers.
-     * @param StreamInterface|null  $body    The response body.
-     */
-    public function __construct($status = 200, HeadersInterface $headers = null, StreamInterface $body = null)
-    {
-        $this->status = $this->filterStatus($status);
-        $this->headers = $headers ? $headers : new Headers();
-        $this->body = $body ? $body : new Body(fopen('php://temp', 'r+'));
-    }
-
-    /**
-     * This method is applied to the cloned object
-     * after PHP performs an initial shallow-copy. This
-     * method completes a deep-copy by creating new objects
-     * for the cloned object's internal reference pointers.
-     */
-    public function __clone()
-    {
-        $this->headers = clone $this->headers;
-    }
-
-    /*******************************************************************************
-     * Status
-     ******************************************************************************/
-
-    /**
-     * Gets the response status code.
-     *
-     * The status code is a 3-digit integer result code of the server's attempt
-     * to understand and satisfy the request.
-     *
-     * @return int Status code.
-     */
-    public function getStatusCode()
-    {
-        return $this->status;
-    }
-
-    /**
-     * Return an instance with the specified status code and, optionally, reason phrase.
-     *
-     * If no reason phrase is specified, implementations MAY choose to default
-     * to the RFC 7231 or IANA recommended reason phrase for the response's
-     * status code.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * updated status and reason phrase.
-     *
-     * @link http://tools.ietf.org/html/rfc7231#section-6
-     * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
-     * @param int $code The 3-digit integer result code to set.
-     * @param string $reasonPhrase The reason phrase to use with the
-     *     provided status code; if none is provided, implementations MAY
-     *     use the defaults as suggested in the HTTP specification.
-     * @return static
-     * @throws \InvalidArgumentException For invalid status code arguments.
-     */
-    public function withStatus($code, $reasonPhrase = '')
-    {
-        $code = $this->filterStatus($code);
-
-        if (!is_string($reasonPhrase) && !method_exists($reasonPhrase, '__toString')) {
-            throw new InvalidArgumentException('ReasonPhrase must be a string');
-        }
-
-        $clone = clone $this;
-        $clone->status = $code;
-        if ($reasonPhrase === '' && isset(static::$messages[$code])) {
-            $reasonPhrase = static::$messages[$code];
-        }
-
-        if ($reasonPhrase === '') {
-            throw new InvalidArgumentException('ReasonPhrase must be supplied for this code');
-        }
-
-        $clone->reasonPhrase = $reasonPhrase;
-
-        return $clone;
-    }
-
-    /**
-     * Filter HTTP status code.
-     *
-     * @param  int $status HTTP status code.
-     * @return int
-     * @throws \InvalidArgumentException If an invalid HTTP status code is provided.
-     */
-    protected function filterStatus($status)
-    {
-        if (!is_integer($status) || $status<100 || $status>599) {
-            throw new InvalidArgumentException('Invalid HTTP status code');
-        }
-
-        return $status;
-    }
-
-    /**
-     * Gets the response reason phrase associated with the status code.
-     *
-     * Because a reason phrase is not a required element in a response
-     * status line, the reason phrase value MAY be null. Implementations MAY
-     * choose to return the default RFC 7231 recommended reason phrase (or those
-     * listed in the IANA HTTP Status Code Registry) for the response's
-     * status code.
-     *
-     * @link http://tools.ietf.org/html/rfc7231#section-6
-     * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
-     * @return string Reason phrase; must return an empty string if none present.
-     */
-    public function getReasonPhrase()
-    {
-        if ($this->reasonPhrase) {
-            return $this->reasonPhrase;
-        }
-        if (isset(static::$messages[$this->status])) {
-            return static::$messages[$this->status];
-        }
-        return '';
-    }
-
-    /*******************************************************************************
-     * Headers
-     ******************************************************************************/
-
-    /**
-     * Return an instance with the provided value replacing the specified header.
-     *
-     * If a Location header is set and the status code is 200, then set the status
-     * code to 302 to mimic what PHP does. See https://github.com/slimphp/Slim/issues/1730
-     *
-     * @param string $name Case-insensitive header field name.
-     * @param string|string[] $value Header value(s).
-     * @return static
-     * @throws \InvalidArgumentException for invalid header names or values.
-     */
-    public function withHeader($name, $value)
-    {
-        $clone = clone $this;
-        $clone->headers->set($name, $value);
-
-        if ($clone->getStatusCode() === 200 && strtolower($name) === 'location') {
-            $clone = $clone->withStatus(302);
-        }
-
-        return $clone;
-    }
-
-
-    /*******************************************************************************
-     * Body
-     ******************************************************************************/
-
-    /**
-     * Write data to the response body.
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * Proxies to the underlying stream and writes the provided data to it.
-     *
-     * @param string $data
-     * @return $this
-     */
-    public function write($data)
-    {
-        $this->getBody()->write($data);
-
-        return $this;
-    }
-
-    /*******************************************************************************
-     * Response Helpers
-     ******************************************************************************/
-
-    /**
-     * Redirect.
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * This method prepares the response object to return an HTTP Redirect
-     * response to the client.
-     *
-     * @param  string|UriInterface $url    The redirect destination.
-     * @param  int|null            $status The redirect HTTP status code.
-     * @return static
-     */
-    public function withRedirect($url, $status = null)
-    {
-        $responseWithRedirect = $this->withHeader('Location', (string)$url);
-
-        if (is_null($status) && $this->getStatusCode() === 200) {
-            $status = 302;
-        }
-
-        if (!is_null($status)) {
-            return $responseWithRedirect->withStatus($status);
-        }
-
-        return $responseWithRedirect;
-    }
-
-    /**
-     * Json.
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * This method prepares the response object to return an HTTP Json
-     * response to the client.
-     *
-     * @param  mixed  $data   The data
-     * @param  int    $status The HTTP status code.
-     * @param  int    $encodingOptions Json encoding options
-     * @throws \RuntimeException
-     * @return static
-     */
-    public function withJson($data, $status = null, $encodingOptions = 0)
-    {
-        $response = $this->withBody(new Body(fopen('php://temp', 'r+')));
-        $response->body->write($json = json_encode($data, $encodingOptions));
-
-        // Ensure that the json encoding passed successfully
-        if ($json === false) {
-            throw new \RuntimeException(json_last_error_msg(), json_last_error());
-        }
-
-        $responseWithJson = $response->withHeader('Content-Type', 'application/json;charset=utf-8');
-        if (isset($status)) {
-            return $responseWithJson->withStatus($status);
-        }
-        return $responseWithJson;
-    }
-
-    /**
-     * Is this response empty?
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return bool
-     */
-    public function isEmpty()
-    {
-        return in_array($this->getStatusCode(), [204, 205, 304]);
-    }
-
-    /**
-     * Is this response informational?
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return bool
-     */
-    public function isInformational()
-    {
-        return $this->getStatusCode() >= 100 && $this->getStatusCode() < 200;
-    }
-
-    /**
-     * Is this response OK?
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return bool
-     */
-    public function isOk()
-    {
-        return $this->getStatusCode() === 200;
-    }
-
-    /**
-     * Is this response successful?
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return bool
-     */
-    public function isSuccessful()
-    {
-        return $this->getStatusCode() >= 200 && $this->getStatusCode() < 300;
-    }
-
-    /**
-     * Is this response a redirect?
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return bool
-     */
-    public function isRedirect()
-    {
-        return in_array($this->getStatusCode(), [301, 302, 303, 307]);
-    }
-
-    /**
-     * Is this response a redirection?
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return bool
-     */
-    public function isRedirection()
-    {
-        return $this->getStatusCode() >= 300 && $this->getStatusCode() < 400;
-    }
-
-    /**
-     * Is this response forbidden?
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return bool
-     * @api
-     */
-    public function isForbidden()
-    {
-        return $this->getStatusCode() === 403;
-    }
-
-    /**
-     * Is this response not Found?
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return bool
-     */
-    public function isNotFound()
-    {
-        return $this->getStatusCode() === 404;
-    }
-
-    /**
-     * Is this response a client error?
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return bool
-     */
-    public function isClientError()
-    {
-        return $this->getStatusCode() >= 400 && $this->getStatusCode() < 500;
-    }
-
-    /**
-     * Is this response a server error?
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return bool
-     */
-    public function isServerError()
-    {
-        return $this->getStatusCode() >= 500 && $this->getStatusCode() < 600;
-    }
-
-    /**
-     * Convert response to string.
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        $output = sprintf(
-            'HTTP/%s %s %s',
-            $this->getProtocolVersion(),
-            $this->getStatusCode(),
-            $this->getReasonPhrase()
-        );
-        $output .= Response::EOL;
-        foreach ($this->getHeaders() as $name => $values) {
-            $output .= sprintf('%s: %s', $name, $this->getHeaderLine($name)) . Response::EOL;
-        }
-        $output .= Response::EOL;
-        $output .= (string)$this->getBody();
-
-        return $output;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Stream.php b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Stream.php
deleted file mode 100644
index 27c7a764..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Stream.php
+++ /dev/null
@@ -1,450 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Http;
-
-use InvalidArgumentException;
-use Psr\Http\Message\StreamInterface;
-use RuntimeException;
-
-/**
- * Represents a data stream as defined in PSR-7.
- *
- * @link https://github.com/php-fig/http-message/blob/master/src/StreamInterface.php
- */
-class Stream implements StreamInterface
-{
-    /**
-     * Bit mask to determine if the stream is a pipe
-     *
-     * This is octal as per header stat.h
-     */
-    const FSTAT_MODE_S_IFIFO = 0010000;
-
-    /**
-     * Resource modes
-     *
-     * @var  array
-     * @link http://php.net/manual/function.fopen.php
-     */
-    protected static $modes = [
-        'readable' => ['r', 'r+', 'w+', 'a+', 'x+', 'c+'],
-        'writable' => ['r+', 'w', 'w+', 'a', 'a+', 'x', 'x+', 'c', 'c+'],
-    ];
-
-    /**
-     * The underlying stream resource
-     *
-     * @var resource
-     */
-    protected $stream;
-
-    /**
-     * Stream metadata
-     *
-     * @var array
-     */
-    protected $meta;
-
-    /**
-     * Is this stream readable?
-     *
-     * @var bool
-     */
-    protected $readable;
-
-    /**
-     * Is this stream writable?
-     *
-     * @var bool
-     */
-    protected $writable;
-
-    /**
-     * Is this stream seekable?
-     *
-     * @var bool
-     */
-    protected $seekable;
-
-    /**
-     * The size of the stream if known
-     *
-     * @var null|int
-     */
-    protected $size;
-
-    /**
-     * Is this stream a pipe?
-     *
-     * @var bool
-     */
-    protected $isPipe;
-
-    /**
-     * Create a new Stream.
-     *
-     * @param  resource $stream A PHP resource handle.
-     *
-     * @throws InvalidArgumentException If argument is not a resource.
-     */
-    public function __construct($stream)
-    {
-        $this->attach($stream);
-    }
-
-    /**
-     * Get stream metadata as an associative array or retrieve a specific key.
-     *
-     * The keys returned are identical to the keys returned from PHP's
-     * stream_get_meta_data() function.
-     *
-     * @link http://php.net/manual/en/function.stream-get-meta-data.php
-     *
-     * @param string $key Specific metadata to retrieve.
-     *
-     * @return array|mixed|null Returns an associative array if no key is
-     *     provided. Returns a specific key value if a key is provided and the
-     *     value is found, or null if the key is not found.
-     */
-    public function getMetadata($key = null)
-    {
-        $this->meta = stream_get_meta_data($this->stream);
-        if (is_null($key) === true) {
-            return $this->meta;
-        }
-
-        return isset($this->meta[$key]) ? $this->meta[$key] : null;
-    }
-
-    /**
-     * Is a resource attached to this stream?
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @return bool
-     */
-    protected function isAttached()
-    {
-        return is_resource($this->stream);
-    }
-
-    /**
-     * Attach new resource to this object.
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @param resource $newStream A PHP resource handle.
-     *
-     * @throws InvalidArgumentException If argument is not a valid PHP resource.
-     */
-    protected function attach($newStream)
-    {
-        if (is_resource($newStream) === false) {
-            throw new InvalidArgumentException(__METHOD__ . ' argument must be a valid PHP resource');
-        }
-
-        if ($this->isAttached() === true) {
-            $this->detach();
-        }
-
-        $this->stream = $newStream;
-    }
-
-    /**
-     * Separates any underlying resources from the stream.
-     *
-     * After the stream has been detached, the stream is in an unusable state.
-     *
-     * @return resource|null Underlying PHP stream, if any
-     */
-    public function detach()
-    {
-        $oldResource = $this->stream;
-        $this->stream = null;
-        $this->meta = null;
-        $this->readable = null;
-        $this->writable = null;
-        $this->seekable = null;
-        $this->size = null;
-        $this->isPipe = null;
-
-        return $oldResource;
-    }
-
-    /**
-     * Reads all data from the stream into a string, from the beginning to end.
-     *
-     * This method MUST attempt to seek to the beginning of the stream before
-     * reading data and read the stream until the end is reached.
-     *
-     * Warning: This could attempt to load a large amount of data into memory.
-     *
-     * This method MUST NOT raise an exception in order to conform with PHP's
-     * string casting operations.
-     *
-     * @see http://php.net/manual/en/language.oop5.magic.php#object.tostring
-     * @return string
-     */
-    public function __toString()
-    {
-        if (!$this->isAttached()) {
-            return '';
-        }
-
-        try {
-            $this->rewind();
-            return $this->getContents();
-        } catch (RuntimeException $e) {
-            return '';
-        }
-    }
-
-    /**
-     * Closes the stream and any underlying resources.
-     */
-    public function close()
-    {
-        if ($this->isAttached() === true) {
-            if ($this->isPipe()) {
-                pclose($this->stream);
-            } else {
-                fclose($this->stream);
-            }
-        }
-
-        $this->detach();
-    }
-
-    /**
-     * Get the size of the stream if known.
-     *
-     * @return int|null Returns the size in bytes if known, or null if unknown.
-     */
-    public function getSize()
-    {
-        if (!$this->size && $this->isAttached() === true) {
-            $stats = fstat($this->stream);
-            $this->size = isset($stats['size']) && !$this->isPipe() ? $stats['size'] : null;
-        }
-
-        return $this->size;
-    }
-
-    /**
-     * Returns the current position of the file read/write pointer
-     *
-     * @return int Position of the file pointer
-     *
-     * @throws RuntimeException on error.
-     */
-    public function tell()
-    {
-        if (!$this->isAttached() || ($position = ftell($this->stream)) === false || $this->isPipe()) {
-            throw new RuntimeException('Could not get the position of the pointer in stream');
-        }
-
-        return $position;
-    }
-
-    /**
-     * Returns true if the stream is at the end of the stream.
-     *
-     * @return bool
-     */
-    public function eof()
-    {
-        return $this->isAttached() ? feof($this->stream) : true;
-    }
-
-    /**
-     * Returns whether or not the stream is readable.
-     *
-     * @return bool
-     */
-    public function isReadable()
-    {
-        if ($this->readable === null) {
-            if ($this->isPipe()) {
-                $this->readable = true;
-            } else {
-                $this->readable = false;
-                if ($this->isAttached()) {
-                    $meta = $this->getMetadata();
-                    foreach (self::$modes['readable'] as $mode) {
-                        if (strpos($meta['mode'], $mode) === 0) {
-                            $this->readable = true;
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-
-        return $this->readable;
-    }
-
-    /**
-     * Returns whether or not the stream is writable.
-     *
-     * @return bool
-     */
-    public function isWritable()
-    {
-        if ($this->writable === null) {
-            $this->writable = false;
-            if ($this->isAttached()) {
-                $meta = $this->getMetadata();
-                foreach (self::$modes['writable'] as $mode) {
-                    if (strpos($meta['mode'], $mode) === 0) {
-                        $this->writable = true;
-                        break;
-                    }
-                }
-            }
-        }
-
-        return $this->writable;
-    }
-
-    /**
-     * Returns whether or not the stream is seekable.
-     *
-     * @return bool
-     */
-    public function isSeekable()
-    {
-        if ($this->seekable === null) {
-            $this->seekable = false;
-            if ($this->isAttached()) {
-                $meta = $this->getMetadata();
-                $this->seekable = !$this->isPipe() && $meta['seekable'];
-            }
-        }
-
-        return $this->seekable;
-    }
-
-    /**
-     * Seek to a position in the stream.
-     *
-     * @link http://www.php.net/manual/en/function.fseek.php
-     *
-     * @param int $offset Stream offset
-     * @param int $whence Specifies how the cursor position will be calculated
-     *     based on the seek offset. Valid values are identical to the built-in
-     *     PHP $whence values for `fseek()`.  SEEK_SET: Set position equal to
-     *     offset bytes SEEK_CUR: Set position to current location plus offset
-     *     SEEK_END: Set position to end-of-stream plus offset.
-     *
-     * @throws RuntimeException on failure.
-     */
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        // Note that fseek returns 0 on success!
-        if (!$this->isSeekable() || fseek($this->stream, $offset, $whence) === -1) {
-            throw new RuntimeException('Could not seek in stream');
-        }
-    }
-
-    /**
-     * Seek to the beginning of the stream.
-     *
-     * If the stream is not seekable, this method will raise an exception;
-     * otherwise, it will perform a seek(0).
-     *
-     * @see seek()
-     *
-     * @link http://www.php.net/manual/en/function.fseek.php
-     *
-     * @throws RuntimeException on failure.
-     */
-    public function rewind()
-    {
-        if (!$this->isSeekable() || rewind($this->stream) === false) {
-            throw new RuntimeException('Could not rewind stream');
-        }
-    }
-
-    /**
-     * Read data from the stream.
-     *
-     * @param int $length Read up to $length bytes from the object and return
-     *     them. Fewer than $length bytes may be returned if underlying stream
-     *     call returns fewer bytes.
-     *
-     * @return string Returns the data read from the stream, or an empty string
-     *     if no bytes are available.
-     *
-     * @throws RuntimeException if an error occurs.
-     */
-    public function read($length)
-    {
-        if (!$this->isReadable() || ($data = fread($this->stream, $length)) === false) {
-            throw new RuntimeException('Could not read from stream');
-        }
-
-        return $data;
-    }
-
-    /**
-     * Write data to the stream.
-     *
-     * @param string $string The string that is to be written.
-     *
-     * @return int Returns the number of bytes written to the stream.
-     *
-     * @throws RuntimeException on failure.
-     */
-    public function write($string)
-    {
-        if (!$this->isWritable() || ($written = fwrite($this->stream, $string)) === false) {
-            throw new RuntimeException('Could not write to stream');
-        }
-
-        // reset size so that it will be recalculated on next call to getSize()
-        $this->size = null;
-
-        return $written;
-    }
-
-    /**
-     * Returns the remaining contents in a string
-     *
-     * @return string
-     *
-     * @throws RuntimeException if unable to read or an error occurs while
-     *     reading.
-     */
-    public function getContents()
-    {
-        if (!$this->isReadable() || ($contents = stream_get_contents($this->stream)) === false) {
-            throw new RuntimeException('Could not get contents of stream');
-        }
-
-        return $contents;
-    }
-
-    /**
-     * Returns whether or not the stream is a pipe.
-     *
-     * @return bool
-     */
-    public function isPipe()
-    {
-        if ($this->isPipe === null) {
-            $this->isPipe = false;
-            if ($this->isAttached()) {
-                $mode = fstat($this->stream)['mode'];
-                $this->isPipe = ($mode & self::FSTAT_MODE_S_IFIFO) !== 0;
-            }
-        }
-
-        return $this->isPipe;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Http/UploadedFile.php b/advancedcontentfilter/vendor/slim/slim/Slim/Http/UploadedFile.php
deleted file mode 100644
index ae5dfb65..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Http/UploadedFile.php
+++ /dev/null
@@ -1,327 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Http;
-
-use RuntimeException;
-use InvalidArgumentException;
-use Psr\Http\Message\StreamInterface;
-use Psr\Http\Message\UploadedFileInterface;
-
-/**
- * Represents Uploaded Files.
- *
- * It manages and normalizes uploaded files according to the PSR-7 standard.
- *
- * @link https://github.com/php-fig/http-message/blob/master/src/UploadedFileInterface.php
- * @link https://github.com/php-fig/http-message/blob/master/src/StreamInterface.php
- */
-class UploadedFile implements UploadedFileInterface
-{
-    /**
-     * The client-provided full path to the file
-     *
-     * @note this is public to maintain BC with 3.1.0 and earlier.
-     *
-     * @var string
-     */
-    public $file;
-    /**
-     * The client-provided file name.
-     *
-     * @var string
-     */
-    protected $name;
-    /**
-     * The client-provided media type of the file.
-     *
-     * @var string
-     */
-    protected $type;
-    /**
-     * The size of the file in bytes.
-     *
-     * @var int
-     */
-    protected $size;
-    /**
-     * A valid PHP UPLOAD_ERR_xxx code for the file upload.
-     *
-     * @var int
-     */
-    protected $error = UPLOAD_ERR_OK;
-    /**
-     * Indicates if the upload is from a SAPI environment.
-     *
-     * @var bool
-     */
-    protected $sapi = false;
-    /**
-     * An optional StreamInterface wrapping the file resource.
-     *
-     * @var StreamInterface
-     */
-    protected $stream;
-    /**
-     * Indicates if the uploaded file has already been moved.
-     *
-     * @var bool
-     */
-    protected $moved = false;
-
-    /**
-     * Create a normalized tree of UploadedFile instances from the Environment.
-     *
-     * @param Environment $env The environment
-     *
-     * @return array|null A normalized tree of UploadedFile instances or null if none are provided.
-     */
-    public static function createFromEnvironment(Environment $env)
-    {
-        if (is_array($env['slim.files']) && $env->has('slim.files')) {
-            return $env['slim.files'];
-        } elseif (isset($_FILES)) {
-            return static::parseUploadedFiles($_FILES);
-        }
-
-        return [];
-    }
-
-    /**
-     * Parse a non-normalized, i.e. $_FILES superglobal, tree of uploaded file data.
-     *
-     * @param array $uploadedFiles The non-normalized tree of uploaded file data.
-     *
-     * @return array A normalized tree of UploadedFile instances.
-     */
-    private static function parseUploadedFiles(array $uploadedFiles)
-    {
-        $parsed = [];
-        foreach ($uploadedFiles as $field => $uploadedFile) {
-            if (!isset($uploadedFile['error'])) {
-                if (is_array($uploadedFile)) {
-                    $parsed[$field] = static::parseUploadedFiles($uploadedFile);
-                }
-                continue;
-            }
-
-            $parsed[$field] = [];
-            if (!is_array($uploadedFile['error'])) {
-                $parsed[$field] = new static(
-                    $uploadedFile['tmp_name'],
-                    isset($uploadedFile['name']) ? $uploadedFile['name'] : null,
-                    isset($uploadedFile['type']) ? $uploadedFile['type'] : null,
-                    isset($uploadedFile['size']) ? $uploadedFile['size'] : null,
-                    $uploadedFile['error'],
-                    true
-                );
-            } else {
-                $subArray = [];
-                foreach ($uploadedFile['error'] as $fileIdx => $error) {
-                    // normalise subarray and re-parse to move the input's keyname up a level
-                    $subArray[$fileIdx]['name'] = $uploadedFile['name'][$fileIdx];
-                    $subArray[$fileIdx]['type'] = $uploadedFile['type'][$fileIdx];
-                    $subArray[$fileIdx]['tmp_name'] = $uploadedFile['tmp_name'][$fileIdx];
-                    $subArray[$fileIdx]['error'] = $uploadedFile['error'][$fileIdx];
-                    $subArray[$fileIdx]['size'] = $uploadedFile['size'][$fileIdx];
-
-                    $parsed[$field] = static::parseUploadedFiles($subArray);
-                }
-            }
-        }
-
-        return $parsed;
-    }
-
-    /**
-     * Construct a new UploadedFile instance.
-     *
-     * @param string      $file The full path to the uploaded file provided by the client.
-     * @param string|null $name The file name.
-     * @param string|null $type The file media type.
-     * @param int|null    $size The file size in bytes.
-     * @param int         $error The UPLOAD_ERR_XXX code representing the status of the upload.
-     * @param bool        $sapi Indicates if the upload is in a SAPI environment.
-     */
-    public function __construct($file, $name = null, $type = null, $size = null, $error = UPLOAD_ERR_OK, $sapi = false)
-    {
-        $this->file = $file;
-        $this->name = $name;
-        $this->type = $type;
-        $this->size = $size;
-        $this->error = $error;
-        $this->sapi = $sapi;
-    }
-
-    /**
-     * Retrieve a stream representing the uploaded file.
-     *
-     * This method MUST return a StreamInterface instance, representing the
-     * uploaded file. The purpose of this method is to allow utilizing native PHP
-     * stream functionality to manipulate the file upload, such as
-     * stream_copy_to_stream() (though the result will need to be decorated in a
-     * native PHP stream wrapper to work with such functions).
-     *
-     * If the moveTo() method has been called previously, this method MUST raise
-     * an exception.
-     *
-     * @return StreamInterface Stream representation of the uploaded file.
-     * @throws \RuntimeException in cases when no stream is available or can be
-     *     created.
-     */
-    public function getStream()
-    {
-        if ($this->moved) {
-            throw new \RuntimeException(sprintf('Uploaded file %1s has already been moved', $this->name));
-        }
-        if ($this->stream === null) {
-            $this->stream = new Stream(fopen($this->file, 'r'));
-        }
-
-        return $this->stream;
-    }
-
-    /**
-     * Move the uploaded file to a new location.
-     *
-     * Use this method as an alternative to move_uploaded_file(). This method is
-     * guaranteed to work in both SAPI and non-SAPI environments.
-     * Implementations must determine which environment they are in, and use the
-     * appropriate method (move_uploaded_file(), rename(), or a stream
-     * operation) to perform the operation.
-     *
-     * $targetPath may be an absolute path, or a relative path. If it is a
-     * relative path, resolution should be the same as used by PHP's rename()
-     * function.
-     *
-     * The original file or stream MUST be removed on completion.
-     *
-     * If this method is called more than once, any subsequent calls MUST raise
-     * an exception.
-     *
-     * When used in an SAPI environment where $_FILES is populated, when writing
-     * files via moveTo(), is_uploaded_file() and move_uploaded_file() SHOULD be
-     * used to ensure permissions and upload status are verified correctly.
-     *
-     * If you wish to move to a stream, use getStream(), as SAPI operations
-     * cannot guarantee writing to stream destinations.
-     *
-     * @see http://php.net/is_uploaded_file
-     * @see http://php.net/move_uploaded_file
-     *
-     * @param string $targetPath Path to which to move the uploaded file.
-     *
-     * @throws InvalidArgumentException if the $path specified is invalid.
-     * @throws RuntimeException on any error during the move operation, or on
-     *     the second or subsequent call to the method.
-     */
-    public function moveTo($targetPath)
-    {
-        if ($this->moved) {
-            throw new RuntimeException('Uploaded file already moved');
-        }
-
-        $targetIsStream = strpos($targetPath, '://') > 0;
-        if (!$targetIsStream && !is_writable(dirname($targetPath))) {
-            throw new InvalidArgumentException('Upload target path is not writable');
-        }
-
-        if ($targetIsStream) {
-            if (!copy($this->file, $targetPath)) {
-                throw new RuntimeException(sprintf('Error moving uploaded file %1s to %2s', $this->name, $targetPath));
-            }
-            if (!unlink($this->file)) {
-                throw new RuntimeException(sprintf('Error removing uploaded file %1s', $this->name));
-            }
-        } elseif ($this->sapi) {
-            if (!is_uploaded_file($this->file)) {
-                throw new RuntimeException(sprintf('%1s is not a valid uploaded file', $this->file));
-            }
-
-            if (!move_uploaded_file($this->file, $targetPath)) {
-                throw new RuntimeException(sprintf('Error moving uploaded file %1s to %2s', $this->name, $targetPath));
-            }
-        } else {
-            if (!rename($this->file, $targetPath)) {
-                throw new RuntimeException(sprintf('Error moving uploaded file %1s to %2s', $this->name, $targetPath));
-            }
-        }
-
-        $this->moved = true;
-    }
-
-    /**
-     * Retrieve the error associated with the uploaded file.
-     *
-     * The return value MUST be one of PHP's UPLOAD_ERR_XXX constants.
-     *
-     * If the file was uploaded successfully, this method MUST return
-     * UPLOAD_ERR_OK.
-     *
-     * Implementations SHOULD return the value stored in the "error" key of
-     * the file in the $_FILES array.
-     *
-     * @see http://php.net/manual/en/features.file-upload.errors.php
-     *
-     * @return int One of PHP's UPLOAD_ERR_XXX constants.
-     */
-    public function getError()
-    {
-        return $this->error;
-    }
-
-    /**
-     * Retrieve the filename sent by the client.
-     *
-     * Do not trust the value returned by this method. A client could send
-     * a malicious filename with the intention to corrupt or hack your
-     * application.
-     *
-     * Implementations SHOULD return the value stored in the "name" key of
-     * the file in the $_FILES array.
-     *
-     * @return string|null The filename sent by the client or null if none
-     *     was provided.
-     */
-    public function getClientFilename()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Retrieve the media type sent by the client.
-     *
-     * Do not trust the value returned by this method. A client could send
-     * a malicious media type with the intention to corrupt or hack your
-     * application.
-     *
-     * Implementations SHOULD return the value stored in the "type" key of
-     * the file in the $_FILES array.
-     *
-     * @return string|null The media type sent by the client or null if none
-     *     was provided.
-     */
-    public function getClientMediaType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * Retrieve the file size.
-     *
-     * Implementations SHOULD return the value stored in the "size" key of
-     * the file in the $_FILES array if available, as PHP calculates this based
-     * on the actual size transmitted.
-     *
-     * @return int|null The file size in bytes or null if unknown.
-     */
-    public function getSize()
-    {
-        return $this->size;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Uri.php b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Uri.php
deleted file mode 100644
index fb0f04b5..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Uri.php
+++ /dev/null
@@ -1,845 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Http;
-
-use InvalidArgumentException;
-use \Psr\Http\Message\UriInterface;
-use Slim\Http\Environment;
-
-/**
- * Value object representing a URI.
- *
- * This interface is meant to represent URIs according to RFC 3986 and to
- * provide methods for most common operations. Additional functionality for
- * working with URIs can be provided on top of the interface or externally.
- * Its primary use is for HTTP requests, but may also be used in other
- * contexts.
- *
- * Instances of this interface are considered immutable; all methods that
- * might change state MUST be implemented such that they retain the internal
- * state of the current instance and return an instance that contains the
- * changed state.
- *
- * Typically the Host header will be also be present in the request message.
- * For server-side requests, the scheme will typically be discoverable in the
- * server parameters.
- *
- * @link http://tools.ietf.org/html/rfc3986 (the URI specification)
- */
-class Uri implements UriInterface
-{
-    /**
-     * Uri scheme (without "://" suffix)
-     *
-     * @var string
-     */
-    protected $scheme = '';
-
-    /**
-     * Uri user
-     *
-     * @var string
-     */
-    protected $user = '';
-
-    /**
-     * Uri password
-     *
-     * @var string
-     */
-    protected $password = '';
-
-    /**
-     * Uri host
-     *
-     * @var string
-     */
-    protected $host = '';
-
-    /**
-     * Uri port number
-     *
-     * @var null|int
-     */
-    protected $port;
-
-    /**
-     * Uri base path
-     *
-     * @var string
-     */
-    protected $basePath = '';
-
-    /**
-     * Uri path
-     *
-     * @var string
-     */
-    protected $path = '';
-
-    /**
-     * Uri query string (without "?" prefix)
-     *
-     * @var string
-     */
-    protected $query = '';
-
-    /**
-     * Uri fragment string (without "#" prefix)
-     *
-     * @var string
-     */
-    protected $fragment = '';
-
-    /**
-     * Create new Uri.
-     *
-     * @param string $scheme   Uri scheme.
-     * @param string $host     Uri host.
-     * @param int    $port     Uri port number.
-     * @param string $path     Uri path.
-     * @param string $query    Uri query string.
-     * @param string $fragment Uri fragment.
-     * @param string $user     Uri user.
-     * @param string $password Uri password.
-     */
-    public function __construct(
-        $scheme,
-        $host,
-        $port = null,
-        $path = '/',
-        $query = '',
-        $fragment = '',
-        $user = '',
-        $password = ''
-    ) {
-        $this->scheme = $this->filterScheme($scheme);
-        $this->host = $host;
-        $this->port = $this->filterPort($port);
-        $this->path = empty($path) ? '/' : $this->filterPath($path);
-        $this->query = $this->filterQuery($query);
-        $this->fragment = $this->filterQuery($fragment);
-        $this->user = $user;
-        $this->password = $password;
-    }
-
-    /**
-     * Create new Uri from string.
-     *
-     * @param  string $uri Complete Uri string
-     *     (i.e., https://user:pass@host:443/path?query).
-     *
-     * @return self
-     */
-    public static function createFromString($uri)
-    {
-        if (!is_string($uri) && !method_exists($uri, '__toString')) {
-            throw new InvalidArgumentException('Uri must be a string');
-        }
-
-        $parts = parse_url($uri);
-        $scheme = isset($parts['scheme']) ? $parts['scheme'] : '';
-        $user = isset($parts['user']) ? $parts['user'] : '';
-        $pass = isset($parts['pass']) ? $parts['pass'] : '';
-        $host = isset($parts['host']) ? $parts['host'] : '';
-        $port = isset($parts['port']) ? $parts['port'] : null;
-        $path = isset($parts['path']) ? $parts['path'] : '';
-        $query = isset($parts['query']) ? $parts['query'] : '';
-        $fragment = isset($parts['fragment']) ? $parts['fragment'] : '';
-
-        return new static($scheme, $host, $port, $path, $query, $fragment, $user, $pass);
-    }
-
-    /**
-     * Create new Uri from environment.
-     *
-     * @param Environment $env
-     *
-     * @return self
-     */
-    public static function createFromEnvironment(Environment $env)
-    {
-        // Scheme
-        $isSecure = $env->get('HTTPS');
-        $scheme = (empty($isSecure) || $isSecure === 'off') ? 'http' : 'https';
-
-        // Authority: Username and password
-        $username = $env->get('PHP_AUTH_USER', '');
-        $password = $env->get('PHP_AUTH_PW', '');
-
-        // Authority: Host
-        if ($env->has('HTTP_HOST')) {
-            $host = $env->get('HTTP_HOST');
-        } else {
-            $host = $env->get('SERVER_NAME');
-        }
-
-        // Authority: Port
-        $port = (int)$env->get('SERVER_PORT', 80);
-        if (preg_match('/^(\[[a-fA-F0-9:.]+\])(:\d+)?\z/', $host, $matches)) {
-            $host = $matches[1];
-
-            if (isset($matches[2])) {
-                $port = (int) substr($matches[2], 1);
-            }
-        } else {
-            $pos = strpos($host, ':');
-            if ($pos !== false) {
-                $port = (int) substr($host, $pos + 1);
-                $host = strstr($host, ':', true);
-            }
-        }
-
-        // Path
-        $requestScriptName = parse_url($env->get('SCRIPT_NAME'), PHP_URL_PATH);
-        $requestScriptDir = dirname($requestScriptName);
-
-        // parse_url() requires a full URL. As we don't extract the domain name or scheme,
-        // we use a stand-in.
-        $requestUri = parse_url('http://example.com' . $env->get('REQUEST_URI'), PHP_URL_PATH);
-
-        $basePath = '';
-        $virtualPath = $requestUri;
-        if (stripos($requestUri, $requestScriptName) === 0) {
-            $basePath = $requestScriptName;
-        } elseif ($requestScriptDir !== '/' && stripos($requestUri, $requestScriptDir) === 0) {
-            $basePath = $requestScriptDir;
-        }
-
-        if ($basePath) {
-            $virtualPath = ltrim(substr($requestUri, strlen($basePath)), '/');
-        }
-
-        // Query string
-        $queryString = $env->get('QUERY_STRING', '');
-        if ($queryString === '') {
-            $queryString = parse_url('http://example.com' . $env->get('REQUEST_URI'), PHP_URL_QUERY);
-        }
-
-        // Fragment
-        $fragment = '';
-
-        // Build Uri
-        $uri = new static($scheme, $host, $port, $virtualPath, $queryString, $fragment, $username, $password);
-        if ($basePath) {
-            $uri = $uri->withBasePath($basePath);
-        }
-
-        return $uri;
-    }
-
-    /********************************************************************************
-     * Scheme
-     *******************************************************************************/
-
-    /**
-     * Retrieve the scheme component of the URI.
-     *
-     * If no scheme is present, this method MUST return an empty string.
-     *
-     * The value returned MUST be normalized to lowercase, per RFC 3986
-     * Section 3.1.
-     *
-     * The trailing ":" character is not part of the scheme and MUST NOT be
-     * added.
-     *
-     * @see https://tools.ietf.org/html/rfc3986#section-3.1
-     * @return string The URI scheme.
-     */
-    public function getScheme()
-    {
-        return $this->scheme;
-    }
-
-    /**
-     * Return an instance with the specified scheme.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified scheme.
-     *
-     * Implementations MUST support the schemes "http" and "https" case
-     * insensitively, and MAY accommodate other schemes if required.
-     *
-     * An empty scheme is equivalent to removing the scheme.
-     *
-     * @param string $scheme The scheme to use with the new instance.
-     * @return self A new instance with the specified scheme.
-     * @throws \InvalidArgumentException for invalid or unsupported schemes.
-     */
-    public function withScheme($scheme)
-    {
-        $scheme = $this->filterScheme($scheme);
-        $clone = clone $this;
-        $clone->scheme = $scheme;
-
-        return $clone;
-    }
-
-    /**
-     * Filter Uri scheme.
-     *
-     * @param  string $scheme Raw Uri scheme.
-     * @return string
-     *
-     * @throws InvalidArgumentException If the Uri scheme is not a string.
-     * @throws InvalidArgumentException If Uri scheme is not "", "https", or "http".
-     */
-    protected function filterScheme($scheme)
-    {
-        static $valid = [
-            '' => true,
-            'https' => true,
-            'http' => true,
-        ];
-
-        if (!is_string($scheme) && !method_exists($scheme, '__toString')) {
-            throw new InvalidArgumentException('Uri scheme must be a string');
-        }
-
-        $scheme = str_replace('://', '', strtolower((string)$scheme));
-        if (!isset($valid[$scheme])) {
-            throw new InvalidArgumentException('Uri scheme must be one of: "", "https", "http"');
-        }
-
-        return $scheme;
-    }
-
-    /********************************************************************************
-     * Authority
-     *******************************************************************************/
-
-    /**
-     * Retrieve the authority component of the URI.
-     *
-     * If no authority information is present, this method MUST return an empty
-     * string.
-     *
-     * The authority syntax of the URI is:
-     *
-     * <pre>
-     * [user-info@]host[:port]
-     * </pre>
-     *
-     * If the port component is not set or is the standard port for the current
-     * scheme, it SHOULD NOT be included.
-     *
-     * @see https://tools.ietf.org/html/rfc3986#section-3.2
-     * @return string The URI authority, in "[user-info@]host[:port]" format.
-     */
-    public function getAuthority()
-    {
-        $userInfo = $this->getUserInfo();
-        $host = $this->getHost();
-        $port = $this->getPort();
-
-        return ($userInfo ? $userInfo . '@' : '') . $host . ($port !== null ? ':' . $port : '');
-    }
-
-    /**
-     * Retrieve the user information component of the URI.
-     *
-     * If no user information is present, this method MUST return an empty
-     * string.
-     *
-     * If a user is present in the URI, this will return that value;
-     * additionally, if the password is also present, it will be appended to the
-     * user value, with a colon (":") separating the values.
-     *
-     * The trailing "@" character is not part of the user information and MUST
-     * NOT be added.
-     *
-     * @return string The URI user information, in "username[:password]" format.
-     */
-    public function getUserInfo()
-    {
-        return $this->user . ($this->password ? ':' . $this->password : '');
-    }
-
-    /**
-     * Return an instance with the specified user information.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified user information.
-     *
-     * Password is optional, but the user information MUST include the
-     * user; an empty string for the user is equivalent to removing user
-     * information.
-     *
-     * @param string $user The user name to use for authority.
-     * @param null|string $password The password associated with $user.
-     * @return self A new instance with the specified user information.
-     */
-    public function withUserInfo($user, $password = null)
-    {
-        $clone = clone $this;
-        $clone->user = $this->filterUserInfo($user);
-        if ($clone->user) {
-            $clone->password = $password ? $this->filterUserInfo($password) : '';
-        } else {
-            $clone->password = '';
-        }
-
-        return $clone;
-    }
-
-    /**
-     * Filters the user info string.
-     *
-     * @param string $query The raw uri query string.
-     * @return string The percent-encoded query string.
-     */
-    protected function filterUserInfo($query)
-    {
-        return preg_replace_callback(
-            '/(?:[^a-zA-Z0-9_\-\.~!\$&\'\(\)\*\+,;=]+|%(?![A-Fa-f0-9]{2}))/u',
-            function ($match) {
-                return rawurlencode($match[0]);
-            },
-            $query
-        );
-    }
-
-    /**
-     * Retrieve the host component of the URI.
-     *
-     * If no host is present, this method MUST return an empty string.
-     *
-     * The value returned MUST be normalized to lowercase, per RFC 3986
-     * Section 3.2.2.
-     *
-     * @see http://tools.ietf.org/html/rfc3986#section-3.2.2
-     * @return string The URI host.
-     */
-    public function getHost()
-    {
-        return $this->host;
-    }
-
-    /**
-     * Return an instance with the specified host.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified host.
-     *
-     * An empty host value is equivalent to removing the host.
-     *
-     * @param string $host The hostname to use with the new instance.
-     * @return self A new instance with the specified host.
-     * @throws \InvalidArgumentException for invalid hostnames.
-     */
-    public function withHost($host)
-    {
-        $clone = clone $this;
-        $clone->host = $host;
-
-        return $clone;
-    }
-
-    /**
-     * Retrieve the port component of the URI.
-     *
-     * If a port is present, and it is non-standard for the current scheme,
-     * this method MUST return it as an integer. If the port is the standard port
-     * used with the current scheme, this method SHOULD return null.
-     *
-     * If no port is present, and no scheme is present, this method MUST return
-     * a null value.
-     *
-     * If no port is present, but a scheme is present, this method MAY return
-     * the standard port for that scheme, but SHOULD return null.
-     *
-     * @return null|int The URI port.
-     */
-    public function getPort()
-    {
-        return $this->port && !$this->hasStandardPort() ? $this->port : null;
-    }
-
-    /**
-     * Return an instance with the specified port.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified port.
-     *
-     * Implementations MUST raise an exception for ports outside the
-     * established TCP and UDP port ranges.
-     *
-     * A null value provided for the port is equivalent to removing the port
-     * information.
-     *
-     * @param null|int $port The port to use with the new instance; a null value
-     *     removes the port information.
-     * @return self A new instance with the specified port.
-     * @throws \InvalidArgumentException for invalid ports.
-     */
-    public function withPort($port)
-    {
-        $port = $this->filterPort($port);
-        $clone = clone $this;
-        $clone->port = $port;
-
-        return $clone;
-    }
-
-    /**
-     * Does this Uri use a standard port?
-     *
-     * @return bool
-     */
-    protected function hasStandardPort()
-    {
-        return ($this->scheme === 'http' && $this->port === 80) || ($this->scheme === 'https' && $this->port === 443);
-    }
-
-    /**
-     * Filter Uri port.
-     *
-     * @param  null|int $port The Uri port number.
-     * @return null|int
-     *
-     * @throws InvalidArgumentException If the port is invalid.
-     */
-    protected function filterPort($port)
-    {
-        if (is_null($port) || (is_integer($port) && ($port >= 1 && $port <= 65535))) {
-            return $port;
-        }
-
-        throw new InvalidArgumentException('Uri port must be null or an integer between 1 and 65535 (inclusive)');
-    }
-
-    /********************************************************************************
-     * Path
-     *******************************************************************************/
-
-    /**
-     * Retrieve the path component of the URI.
-     *
-     * The path can either be empty or absolute (starting with a slash) or
-     * rootless (not starting with a slash). Implementations MUST support all
-     * three syntaxes.
-     *
-     * Normally, the empty path "" and absolute path "/" are considered equal as
-     * defined in RFC 7230 Section 2.7.3. But this method MUST NOT automatically
-     * do this normalization because in contexts with a trimmed base path, e.g.
-     * the front controller, this difference becomes significant. It's the task
-     * of the user to handle both "" and "/".
-     *
-     * The value returned MUST be percent-encoded, but MUST NOT double-encode
-     * any characters. To determine what characters to encode, please refer to
-     * RFC 3986, Sections 2 and 3.3.
-     *
-     * As an example, if the value should include a slash ("/") not intended as
-     * delimiter between path segments, that value MUST be passed in encoded
-     * form (e.g., "%2F") to the instance.
-     *
-     * @see https://tools.ietf.org/html/rfc3986#section-2
-     * @see https://tools.ietf.org/html/rfc3986#section-3.3
-     * @return string The URI path.
-     */
-    public function getPath()
-    {
-        return $this->path;
-    }
-
-    /**
-     * Return an instance with the specified path.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified path.
-     *
-     * The path can either be empty or absolute (starting with a slash) or
-     * rootless (not starting with a slash). Implementations MUST support all
-     * three syntaxes.
-     *
-     * If the path is intended to be domain-relative rather than path relative then
-     * it must begin with a slash ("/"). Paths not starting with a slash ("/")
-     * are assumed to be relative to some base path known to the application or
-     * consumer.
-     *
-     * Users can provide both encoded and decoded path characters.
-     * Implementations ensure the correct encoding as outlined in getPath().
-     *
-     * @param string $path The path to use with the new instance.
-     * @return self A new instance with the specified path.
-     * @throws \InvalidArgumentException for invalid paths.
-     */
-    public function withPath($path)
-    {
-        if (!is_string($path)) {
-            throw new InvalidArgumentException('Uri path must be a string');
-        }
-
-        $clone = clone $this;
-        $clone->path = $this->filterPath($path);
-
-        // if the path is absolute, then clear basePath
-        if (substr($path, 0, 1) == '/') {
-            $clone->basePath = '';
-        }
-
-        return $clone;
-    }
-
-    /**
-     * Retrieve the base path segment of the URI.
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * This method MUST return a string; if no path is present it MUST return
-     * an empty string.
-     *
-     * @return string The base path segment of the URI.
-     */
-    public function getBasePath()
-    {
-        return $this->basePath;
-    }
-
-    /**
-     * Set base path.
-     *
-     * Note: This method is not part of the PSR-7 standard.
-     *
-     * @param  string $basePath
-     * @return self
-     */
-    public function withBasePath($basePath)
-    {
-        if (!is_string($basePath)) {
-            throw new InvalidArgumentException('Uri path must be a string');
-        }
-        if (!empty($basePath)) {
-            $basePath = '/' . trim($basePath, '/'); // <-- Trim on both sides
-        }
-        $clone = clone $this;
-
-        if ($basePath !== '/') {
-            $clone->basePath = $this->filterPath($basePath);
-        }
-
-        return $clone;
-    }
-
-    /**
-     * Filter Uri path.
-     *
-     * This method percent-encodes all reserved
-     * characters in the provided path string. This method
-     * will NOT double-encode characters that are already
-     * percent-encoded.
-     *
-     * @param  string $path The raw uri path.
-     * @return string       The RFC 3986 percent-encoded uri path.
-     * @link   http://www.faqs.org/rfcs/rfc3986.html
-     */
-    protected function filterPath($path)
-    {
-        return preg_replace_callback(
-            '/(?:[^a-zA-Z0-9_\-\.~:@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/',
-            function ($match) {
-                return rawurlencode($match[0]);
-            },
-            $path
-        );
-    }
-
-    /********************************************************************************
-     * Query
-     *******************************************************************************/
-
-    /**
-     * Retrieve the query string of the URI.
-     *
-     * If no query string is present, this method MUST return an empty string.
-     *
-     * The leading "?" character is not part of the query and MUST NOT be
-     * added.
-     *
-     * The value returned MUST be percent-encoded, but MUST NOT double-encode
-     * any characters. To determine what characters to encode, please refer to
-     * RFC 3986, Sections 2 and 3.4.
-     *
-     * As an example, if a value in a key/value pair of the query string should
-     * include an ampersand ("&") not intended as a delimiter between values,
-     * that value MUST be passed in encoded form (e.g., "%26") to the instance.
-     *
-     * @see https://tools.ietf.org/html/rfc3986#section-2
-     * @see https://tools.ietf.org/html/rfc3986#section-3.4
-     * @return string The URI query string.
-     */
-    public function getQuery()
-    {
-        return $this->query;
-    }
-
-    /**
-     * Return an instance with the specified query string.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified query string.
-     *
-     * Users can provide both encoded and decoded query characters.
-     * Implementations ensure the correct encoding as outlined in getQuery().
-     *
-     * An empty query string value is equivalent to removing the query string.
-     *
-     * @param string $query The query string to use with the new instance.
-     * @return self A new instance with the specified query string.
-     * @throws \InvalidArgumentException for invalid query strings.
-     */
-    public function withQuery($query)
-    {
-        if (!is_string($query) && !method_exists($query, '__toString')) {
-            throw new InvalidArgumentException('Uri query must be a string');
-        }
-        $query = ltrim((string)$query, '?');
-        $clone = clone $this;
-        $clone->query = $this->filterQuery($query);
-
-        return $clone;
-    }
-
-    /**
-     * Filters the query string or fragment of a URI.
-     *
-     * @param string $query The raw uri query string.
-     * @return string The percent-encoded query string.
-     */
-    protected function filterQuery($query)
-    {
-        return preg_replace_callback(
-            '/(?:[^a-zA-Z0-9_\-\.~!\$&\'\(\)\*\+,;=%:@\/\?]+|%(?![A-Fa-f0-9]{2}))/',
-            function ($match) {
-                return rawurlencode($match[0]);
-            },
-            $query
-        );
-    }
-
-    /********************************************************************************
-     * Fragment
-     *******************************************************************************/
-
-    /**
-     * Retrieve the fragment component of the URI.
-     *
-     * If no fragment is present, this method MUST return an empty string.
-     *
-     * The leading "#" character is not part of the fragment and MUST NOT be
-     * added.
-     *
-     * The value returned MUST be percent-encoded, but MUST NOT double-encode
-     * any characters. To determine what characters to encode, please refer to
-     * RFC 3986, Sections 2 and 3.5.
-     *
-     * @see https://tools.ietf.org/html/rfc3986#section-2
-     * @see https://tools.ietf.org/html/rfc3986#section-3.5
-     * @return string The URI fragment.
-     */
-    public function getFragment()
-    {
-        return $this->fragment;
-    }
-
-    /**
-     * Return an instance with the specified URI fragment.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified URI fragment.
-     *
-     * Users can provide both encoded and decoded fragment characters.
-     * Implementations ensure the correct encoding as outlined in getFragment().
-     *
-     * An empty fragment value is equivalent to removing the fragment.
-     *
-     * @param string $fragment The fragment to use with the new instance.
-     * @return self A new instance with the specified fragment.
-     */
-    public function withFragment($fragment)
-    {
-        if (!is_string($fragment) && !method_exists($fragment, '__toString')) {
-            throw new InvalidArgumentException('Uri fragment must be a string');
-        }
-        $fragment = ltrim((string)$fragment, '#');
-        $clone = clone $this;
-        $clone->fragment = $this->filterQuery($fragment);
-
-        return $clone;
-    }
-
-    /********************************************************************************
-     * Helpers
-     *******************************************************************************/
-
-    /**
-     * Return the string representation as a URI reference.
-     *
-     * Depending on which components of the URI are present, the resulting
-     * string is either a full URI or relative reference according to RFC 3986,
-     * Section 4.1. The method concatenates the various components of the URI,
-     * using the appropriate delimiters:
-     *
-     * - If a scheme is present, it MUST be suffixed by ":".
-     * - If an authority is present, it MUST be prefixed by "//".
-     * - The path can be concatenated without delimiters. But there are two
-     *   cases where the path has to be adjusted to make the URI reference
-     *   valid as PHP does not allow to throw an exception in __toString():
-     *     - If the path is rootless and an authority is present, the path MUST
-     *       be prefixed by "/".
-     *     - If the path is starting with more than one "/" and no authority is
-     *       present, the starting slashes MUST be reduced to one.
-     * - If a query is present, it MUST be prefixed by "?".
-     * - If a fragment is present, it MUST be prefixed by "#".
-     *
-     * @see http://tools.ietf.org/html/rfc3986#section-4.1
-     * @return string
-     */
-    public function __toString()
-    {
-        $scheme = $this->getScheme();
-        $authority = $this->getAuthority();
-        $basePath = $this->getBasePath();
-        $path = $this->getPath();
-        $query = $this->getQuery();
-        $fragment = $this->getFragment();
-
-        $path = $basePath . '/' . ltrim($path, '/');
-
-        return ($scheme ? $scheme . ':' : '')
-            . ($authority ? '//' . $authority : '')
-            . $path
-            . ($query ? '?' . $query : '')
-            . ($fragment ? '#' . $fragment : '');
-    }
-
-    /**
-     * Return the fully qualified base URL.
-     *
-     * Note that this method never includes a trailing /
-     *
-     * This method is not part of PSR-7.
-     *
-     * @return string
-     */
-    public function getBaseUrl()
-    {
-        $scheme = $this->getScheme();
-        $authority = $this->getAuthority();
-        $basePath = $this->getBasePath();
-
-        if ($authority && substr($basePath, 0, 1) !== '/') {
-            $basePath = $basePath . '/' . $basePath;
-        }
-
-        return ($scheme ? $scheme . ':' : '')
-            . ($authority ? '//' . $authority : '')
-            . rtrim($basePath, '/');
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/AdvancedCallableResolverInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/AdvancedCallableResolverInterface.php
new file mode 100644
index 00000000..aa1d897d
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/AdvancedCallableResolverInterface.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Interfaces;
+
+interface AdvancedCallableResolverInterface extends CallableResolverInterface
+{
+    /**
+     * Resolve $toResolve into a callable
+     *
+     * @param string|callable $toResolve
+     */
+    public function resolveRoute($toResolve): callable;
+
+    /**
+     * Resolve $toResolve into a callable
+     *
+     * @param string|callable $toResolve
+     */
+    public function resolveMiddleware($toResolve): callable;
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/CallableResolverInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/CallableResolverInterface.php
index 17d81dbe..92bfda43 100644
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/CallableResolverInterface.php
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/CallableResolverInterface.php
@@ -1,27 +1,21 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
  */
+
+declare(strict_types=1);
+
 namespace Slim\Interfaces;
 
-/**
- * Resolves a callable.
- *
- * @package Slim
- * @since 3.0.0
- */
 interface CallableResolverInterface
 {
     /**
-     * Invoke the resolved callable.
+     * Resolve $toResolve into a callable
      *
-     * @param mixed $toResolve
-     *
-     * @return callable
+     * @param string|callable $toResolve
      */
-    public function resolve($toResolve);
+    public function resolve($toResolve): callable;
 }
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/CollectionInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/CollectionInterface.php
deleted file mode 100644
index be995bf4..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/CollectionInterface.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Interfaces;
-
-/**
- * Collection Interface
- *
- * @package Slim
- * @since   3.0.0
- */
-interface CollectionInterface extends \ArrayAccess, \Countable, \IteratorAggregate
-{
-    public function set($key, $value);
-
-    public function get($key, $default = null);
-
-    public function replace(array $items);
-
-    public function all();
-
-    public function has($key);
-
-    public function remove($key);
-
-    public function clear();
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/DispatcherInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/DispatcherInterface.php
new file mode 100644
index 00000000..63133793
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/DispatcherInterface.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Interfaces;
+
+use Slim\Routing\RoutingResults;
+
+interface DispatcherInterface
+{
+    /**
+     * Get routing results for a given request method and uri
+     */
+    public function dispatch(string $method, string $uri): RoutingResults;
+
+    /**
+     * Get allowed methods for a given uri
+     *
+     * @return string[]
+     */
+    public function getAllowedMethods(string $uri): array;
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/ErrorHandlerInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/ErrorHandlerInterface.php
new file mode 100644
index 00000000..8950e6ec
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/ErrorHandlerInterface.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Interfaces;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Throwable;
+
+interface ErrorHandlerInterface
+{
+    public function __invoke(
+        ServerRequestInterface $request,
+        Throwable $exception,
+        bool $displayErrorDetails,
+        bool $logErrors,
+        bool $logErrorDetails
+    ): ResponseInterface;
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/ErrorRendererInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/ErrorRendererInterface.php
new file mode 100644
index 00000000..05be6559
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/ErrorRendererInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Interfaces;
+
+use Throwable;
+
+interface ErrorRendererInterface
+{
+    public function __invoke(Throwable $exception, bool $displayErrorDetails): string;
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Http/CookiesInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Http/CookiesInterface.php
deleted file mode 100644
index 206175ad..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Http/CookiesInterface.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Interfaces\Http;
-
-/**
- * Cookies Interface
- *
- * @package Slim
- * @since   3.0.0
- */
-interface CookiesInterface
-{
-    public function get($name, $default = null);
-    public function set($name, $value);
-    public function toHeaders();
-    public static function parseHeader($header);
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Http/EnvironmentInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Http/EnvironmentInterface.php
deleted file mode 100644
index af19d28b..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Http/EnvironmentInterface.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Interfaces\Http;
-
-/**
- * Environment Interface
- *
- * @package Slim
- * @since   3.0.0
- */
-interface EnvironmentInterface
-{
-    public static function mock(array $settings = []);
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Http/HeadersInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Http/HeadersInterface.php
deleted file mode 100644
index b737705a..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Http/HeadersInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Interfaces\Http;
-
-use Slim\Interfaces\CollectionInterface;
-
-/**
- * Headers Interface
- *
- * @package Slim
- * @since   3.0.0
- */
-interface HeadersInterface extends CollectionInterface
-{
-    public function add($key, $value);
-
-    public function normalizeKey($key);
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/InvocationStrategyInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/InvocationStrategyInterface.php
index 14a92c1d..88d6476e 100644
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/InvocationStrategyInterface.php
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/InvocationStrategyInterface.php
@@ -1,11 +1,13 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
  */
+
+declare(strict_types=1);
+
 namespace Slim\Interfaces;
 
 use Psr\Http\Message\ResponseInterface;
@@ -19,17 +21,17 @@ interface InvocationStrategyInterface
     /**
      * Invoke a route callable.
      *
-     * @param callable               $callable The callable to invoke using the strategy.
-     * @param ServerRequestInterface $request The request object.
-     * @param ResponseInterface      $response The response object.
-     * @param array                  $routeArguments The route's placholder arguments
+     * @param callable               $callable       The callable to invoke using the strategy.
+     * @param ServerRequestInterface $request        The request object.
+     * @param ResponseInterface      $response       The response object.
+     * @param array<string, string>  $routeArguments The route's placeholder arguments
      *
-     * @return ResponseInterface|string The response from the callable.
+     * @return ResponseInterface The response from the callable.
      */
     public function __invoke(
         callable $callable,
         ServerRequestInterface $request,
         ResponseInterface $response,
         array $routeArguments
-    );
+    ): ResponseInterface;
 }
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/MiddlewareDispatcherInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/MiddlewareDispatcherInterface.php
new file mode 100644
index 00000000..aa7a26ad
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/MiddlewareDispatcherInterface.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Interfaces;
+
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+
+interface MiddlewareDispatcherInterface extends RequestHandlerInterface
+{
+    /**
+     * Add a new middleware to the stack
+     *
+     * Middleware are organized as a stack. That means middleware
+     * that have been added before will be executed after the newly
+     * added one (last in, first out).
+     *
+     * @param MiddlewareInterface|string|callable $middleware
+     */
+    public function add($middleware): self;
+
+    /**
+     * Add a new middleware to the stack
+     *
+     * Middleware are organized as a stack. That means middleware
+     * that have been added before will be executed after the newly
+     * added one (last in, first out).
+     */
+    public function addMiddleware(MiddlewareInterface $middleware): self;
+
+    /**
+     * Seed the middleware stack with the inner request handler
+     */
+    public function seedMiddlewareStack(RequestHandlerInterface $kernel): void;
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Psr17FactoryInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Psr17FactoryInterface.php
new file mode 100644
index 00000000..8cf01028
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Psr17FactoryInterface.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Interfaces;
+
+use Psr\Http\Message\ResponseFactoryInterface;
+use Psr\Http\Message\StreamFactoryInterface;
+use RuntimeException;
+
+interface Psr17FactoryInterface
+{
+    /**
+     * @throws RuntimeException when the factory could not be instantiated
+     */
+    public static function getResponseFactory(): ResponseFactoryInterface;
+
+    /**
+     * @throws RuntimeException when the factory could not be instantiated
+     */
+    public static function getStreamFactory(): StreamFactoryInterface;
+
+    /**
+     * @throws RuntimeException when the factory could not be instantiated
+     */
+    public static function getServerRequestCreator(): ServerRequestCreatorInterface;
+
+    /**
+     * Is the PSR-17 ResponseFactory available
+     */
+    public static function isResponseFactoryAvailable(): bool;
+
+    /**
+     * Is the PSR-17 StreamFactory available
+     */
+    public static function isStreamFactoryAvailable(): bool;
+
+    /**
+     * Is the ServerRequest creator available
+     */
+    public static function isServerRequestCreatorAvailable(): bool;
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Psr17FactoryProviderInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Psr17FactoryProviderInterface.php
new file mode 100644
index 00000000..c7b87aa7
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Psr17FactoryProviderInterface.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Interfaces;
+
+interface Psr17FactoryProviderInterface
+{
+    /**
+     * @return string[]
+     */
+    public static function getFactories(): array;
+
+    /**
+     * @param string[] $factories
+     */
+    public static function setFactories(array $factories): void;
+
+    public static function addFactory(string $factory): void;
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RequestHandlerInvocationStrategyInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RequestHandlerInvocationStrategyInterface.php
new file mode 100644
index 00000000..ec98fc6d
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RequestHandlerInvocationStrategyInterface.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Interfaces;
+
+interface RequestHandlerInvocationStrategyInterface extends InvocationStrategyInterface
+{
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteCollectorInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteCollectorInterface.php
new file mode 100644
index 00000000..921a2365
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteCollectorInterface.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Interfaces;
+
+use InvalidArgumentException;
+use RuntimeException;
+
+interface RouteCollectorInterface
+{
+    /**
+     * Get the route parser
+     */
+    public function getRouteParser(): RouteParserInterface;
+
+    /**
+     * Get default route invocation strategy
+     */
+    public function getDefaultInvocationStrategy(): InvocationStrategyInterface;
+
+    /**
+     * Set default route invocation strategy
+     */
+    public function setDefaultInvocationStrategy(InvocationStrategyInterface $strategy): RouteCollectorInterface;
+
+    /**
+     * Get path to FastRoute cache file
+     */
+    public function getCacheFile(): ?string;
+
+    /**
+     * Set path to FastRoute cache file
+     *
+     * @throws InvalidArgumentException
+     * @throws RuntimeException
+     */
+    public function setCacheFile(string $cacheFile): RouteCollectorInterface;
+
+    /**
+     * Get the base path used in pathFor()
+     */
+    public function getBasePath(): string;
+
+    /**
+     * Set the base path used in pathFor()
+     */
+    public function setBasePath(string $basePath): RouteCollectorInterface;
+
+    /**
+     * Get route objects
+     *
+     * @return RouteInterface[]
+     */
+    public function getRoutes(): array;
+
+    /**
+     * Get named route object
+     *
+     * @param string $name Route name
+     *
+     * @throws RuntimeException   If named route does not exist
+     */
+    public function getNamedRoute(string $name): RouteInterface;
+
+    /**
+     * Remove named route
+     *
+     * @param string $name Route name
+     *
+     * @throws RuntimeException   If named route does not exist
+     */
+    public function removeNamedRoute(string $name): RouteCollectorInterface;
+
+    /**
+     * Lookup a route via the route's unique identifier
+     *
+     * @throws RuntimeException   If route of identifier does not exist
+     */
+    public function lookupRoute(string $identifier): RouteInterface;
+
+    /**
+     * Add route group
+     * @param string|callable $callable
+     */
+    public function group(string $pattern, $callable): RouteGroupInterface;
+
+    /**
+     * Add route
+     *
+     * @param string[]        $methods Array of HTTP methods
+     * @param string          $pattern The route pattern
+     * @param callable|string $handler The route callable
+     */
+    public function map(array $methods, string $pattern, $handler): RouteInterface;
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteCollectorProxyInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteCollectorProxyInterface.php
new file mode 100644
index 00000000..fcbed92b
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteCollectorProxyInterface.php
@@ -0,0 +1,118 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Interfaces;
+
+use Psr\Container\ContainerInterface;
+use Psr\Http\Message\ResponseFactoryInterface;
+use Psr\Http\Message\UriInterface;
+
+interface RouteCollectorProxyInterface
+{
+    public function getResponseFactory(): ResponseFactoryInterface;
+
+    public function getCallableResolver(): CallableResolverInterface;
+
+    public function getContainer(): ?ContainerInterface;
+
+    public function getRouteCollector(): RouteCollectorInterface;
+
+    /**
+     * Get the RouteCollectorProxy's base path
+     */
+    public function getBasePath(): string;
+
+    /**
+     * Set the RouteCollectorProxy's base path
+     */
+    public function setBasePath(string $basePath): RouteCollectorProxyInterface;
+
+    /**
+     * Add GET route
+     *
+     * @param  string          $pattern  The route URI pattern
+     * @param  callable|string $callable The route callback routine
+     */
+    public function get(string $pattern, $callable): RouteInterface;
+
+    /**
+     * Add POST route
+     *
+     * @param  string          $pattern  The route URI pattern
+     * @param  callable|string $callable The route callback routine
+     */
+    public function post(string $pattern, $callable): RouteInterface;
+
+    /**
+     * Add PUT route
+     *
+     * @param  string          $pattern  The route URI pattern
+     * @param  callable|string $callable The route callback routine
+     */
+    public function put(string $pattern, $callable): RouteInterface;
+
+    /**
+     * Add PATCH route
+     *
+     * @param  string          $pattern  The route URI pattern
+     * @param  callable|string $callable The route callback routine
+     */
+    public function patch(string $pattern, $callable): RouteInterface;
+
+    /**
+     * Add DELETE route
+     *
+     * @param  string          $pattern  The route URI pattern
+     * @param  callable|string $callable The route callback routine
+     */
+    public function delete(string $pattern, $callable): RouteInterface;
+
+    /**
+     * Add OPTIONS route
+     *
+     * @param  string          $pattern  The route URI pattern
+     * @param  callable|string $callable The route callback routine
+     */
+    public function options(string $pattern, $callable): RouteInterface;
+
+    /**
+     * Add route for any HTTP method
+     *
+     * @param  string          $pattern  The route URI pattern
+     * @param  callable|string $callable The route callback routine
+     */
+    public function any(string $pattern, $callable): RouteInterface;
+
+    /**
+     * Add route with multiple methods
+     *
+     * @param  string[]        $methods  Numeric array of HTTP method names
+     * @param  string          $pattern  The route URI pattern
+     * @param  callable|string $callable The route callback routine
+     */
+    public function map(array $methods, string $pattern, $callable): RouteInterface;
+
+    /**
+     * Route Groups
+     *
+     * This method accepts a route pattern and a callback. All route
+     * declarations in the callback will be prepended by the group(s)
+     * that it is in.
+     * @param string|callable $callable
+     */
+    public function group(string $pattern, $callable): RouteGroupInterface;
+
+    /**
+     * Add a route that sends an HTTP redirect
+     *
+     * @param string|UriInterface $to
+     */
+    public function redirect(string $from, $to, int $status = 302): RouteInterface;
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteGroupInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteGroupInterface.php
index 5ed33037..0411ce94 100644
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteGroupInterface.php
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteGroupInterface.php
@@ -1,46 +1,41 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
  */
+
+declare(strict_types=1);
+
 namespace Slim\Interfaces;
 
-use Slim\App;
+use Psr\Http\Server\MiddlewareInterface;
+use Slim\MiddlewareDispatcher;
 
-/**
- * RouteGroup Interface
- *
- * @package Slim
- * @since   3.0.0
- */
 interface RouteGroupInterface
 {
-    /**
-     * Get route pattern
-     *
-     * @return string
-     */
-    public function getPattern();
+    public function collectRoutes(): RouteGroupInterface;
 
     /**
-     * Prepend middleware to the group middleware collection
+     * Add middleware to the route group
      *
-     * @param callable|string $callable The callback routine
-     *
-     * @return RouteGroupInterface
+     * @param MiddlewareInterface|string|callable $middleware
      */
-    public function add($callable);
+    public function add($middleware): RouteGroupInterface;
 
     /**
-     * Execute route group callable in the context of the Slim App
-     *
-     * This method invokes the route group object's callable, collecting
-     * nested route objects
-     *
-     * @param App $app
+     * Add middleware to the route group
      */
-    public function __invoke(App $app);
+    public function addMiddleware(MiddlewareInterface $middleware): RouteGroupInterface;
+
+    /**
+     * Append the group's middleware to the MiddlewareDispatcher
+     */
+    public function appendMiddlewareToDispatcher(MiddlewareDispatcher $dispatcher): RouteGroupInterface;
+
+    /**
+     * Get the RouteGroup's pattern
+     */
+    public function getPattern(): string;
 }
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteInterface.php
index 64be5341..c1533312 100644
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteInterface.php
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteInterface.php
@@ -1,115 +1,116 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
  */
+
+declare(strict_types=1);
+
 namespace Slim\Interfaces;
 
-use InvalidArgumentException;
-use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
 
-/**
- * Route Interface
- *
- * @package Slim
- * @since   3.0.0
- */
 interface RouteInterface
 {
-
     /**
-     * Retrieve a specific route argument
-     *
-     * @param string $name
-     * @param string|null $default
-     *
-     * @return string|null
+     * Get route invocation strategy
      */
-    public function getArgument($name, $default = null);
+    public function getInvocationStrategy(): InvocationStrategyInterface;
 
     /**
-     * Get route arguments
+     * Set route invocation strategy
+     */
+    public function setInvocationStrategy(InvocationStrategyInterface $invocationStrategy): RouteInterface;
+
+    /**
+     * Get route methods
      *
      * @return string[]
      */
-    public function getArguments();
-
-    /**
-     * Get route name
-     *
-     * @return null|string
-     */
-    public function getName();
+    public function getMethods(): array;
 
     /**
      * Get route pattern
-     *
-     * @return string
      */
-    public function getPattern();
+    public function getPattern(): string;
 
     /**
-     * Set a route argument
-     *
-     * @param string $name
-     * @param string $value
-     *
-     * @return self
+     * Set route pattern
      */
-    public function setArgument($name, $value);
+    public function setPattern(string $pattern): RouteInterface;
 
     /**
-     * Replace route arguments
+     * Get route callable
      *
-     * @param string[] $arguments
-     *
-     * @return self
+     * @return callable|string
      */
-    public function setArguments(array $arguments);
+    public function getCallable();
 
     /**
-     * Set output buffering mode
+     * Set route callable
      *
-     * One of: false, 'prepend' or 'append'
-     *
-     * @param boolean|string $mode
-     *
-     * @throws InvalidArgumentException If an unknown buffering mode is specified
+     * @param callable|string $callable
      */
-    public function setOutputBuffering($mode);
+    public function setCallable($callable): RouteInterface;
+
+    /**
+     * Get route name
+     */
+    public function getName(): ?string;
 
     /**
      * Set route name
      *
-     * @param string $name
-     *
      * @return static
-     * @throws InvalidArgumentException if the route name is not a string
      */
-    public function setName($name);
+    public function setName(string $name): RouteInterface;
 
     /**
-     * Add middleware
-     *
-     * This method prepends new middleware to the route's middleware stack.
-     *
-     * @param callable|string $callable The callback routine
-     *
-     * @return RouteInterface
+     * Get the route's unique identifier
      */
-    public function add($callable);
+    public function getIdentifier(): string;
+
+    /**
+     * Retrieve a specific route argument
+     */
+    public function getArgument(string $name, ?string $default = null): ?string;
+
+    /**
+     * Get route arguments
+     *
+     * @return array<string, string>
+     */
+    public function getArguments(): array;
+
+    /**
+     * Set a route argument
+     */
+    public function setArgument(string $name, string $value): RouteInterface;
+
+    /**
+     * Replace route arguments
+     *
+     * @param array<string, string> $arguments
+     */
+    public function setArguments(array $arguments): self;
+
+    /**
+     * @param MiddlewareInterface|string|callable $middleware
+     */
+    public function add($middleware): self;
+
+    public function addMiddleware(MiddlewareInterface $middleware): self;
 
     /**
      * Prepare the route for use
      *
-     * @param ServerRequestInterface $request
-     * @param array $arguments
+     * @param array<string, string> $arguments
      */
-    public function prepare(ServerRequestInterface $request, array $arguments);
+    public function prepare(array $arguments): self;
 
     /**
      * Run route
@@ -117,24 +118,6 @@ interface RouteInterface
      * This method traverses the middleware stack, including the route's callable
      * and captures the resultant HTTP response object. It then sends the response
      * back to the Application.
-     *
-     * @param ServerRequestInterface $request
-     * @param ResponseInterface $response
-     * @return ResponseInterface
      */
-    public function run(ServerRequestInterface $request, ResponseInterface $response);
-
-    /**
-     * Dispatch route callable against current Request and Response objects
-     *
-     * This method invokes the route object's callable. If middleware is
-     * registered for the route, each callable middleware is invoked in
-     * the order specified.
-     *
-     * @param ServerRequestInterface $request  The current Request object
-     * @param ResponseInterface      $response The current Response object
-     *
-     * @return ResponseInterface
-     */
-    public function __invoke(ServerRequestInterface $request, ResponseInterface $response);
+    public function run(ServerRequestInterface $request): ResponseInterface;
 }
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteParserInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteParserInterface.php
new file mode 100644
index 00000000..03d93266
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteParserInterface.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Interfaces;
+
+use InvalidArgumentException;
+use Psr\Http\Message\UriInterface;
+use RuntimeException;
+
+interface RouteParserInterface
+{
+    /**
+     * Build the path for a named route excluding the base path
+     *
+     * @param string                $routeName   Route name
+     * @param array<string, string> $data        Named argument replacement data
+     * @param array<string, string> $queryParams Optional query string parameters
+     *
+     * @throws RuntimeException         If named route does not exist
+     * @throws InvalidArgumentException If required data not provided
+     */
+    public function relativeUrlFor(string $routeName, array $data = [], array $queryParams = []): string;
+
+    /**
+     * Build the path for a named route including the base path
+     *
+     * @param string                $routeName   Route name
+     * @param array<string, string> $data        Named argument replacement data
+     * @param array<string, string> $queryParams Optional query string parameters
+     *
+     * @throws RuntimeException         If named route does not exist
+     * @throws InvalidArgumentException If required data not provided
+     */
+    public function urlFor(string $routeName, array $data = [], array $queryParams = []): string;
+
+    /**
+     * Get fully qualified URL for named route
+     *
+     * @param UriInterface              $uri
+     * @param string                    $routeName   Route name
+     * @param array<string, string>     $data        Named argument replacement data
+     * @param array<string, string>     $queryParams Optional query string parameters
+     */
+    public function fullUrlFor(UriInterface $uri, string $routeName, array $data = [], array $queryParams = []): string;
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteResolverInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteResolverInterface.php
new file mode 100644
index 00000000..256a3599
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteResolverInterface.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Slim\Interfaces;
+
+use Slim\Routing\RoutingResults;
+
+interface RouteResolverInterface
+{
+    /**
+     * @param string $uri Should be ServerRequestInterface::getUri()->getPath()
+     */
+    public function computeRoutingResults(string $uri, string $method): RoutingResults;
+
+    public function resolveRoute(string $identifier): RouteInterface;
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouterInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouterInterface.php
deleted file mode 100644
index 2ab8b678..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouterInterface.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim\Interfaces;
-
-use RuntimeException;
-use InvalidArgumentException;
-use Psr\Http\Message\ServerRequestInterface;
-
-/**
- * Router Interface
- *
- * @package Slim
- * @since   3.0.0
- */
-interface RouterInterface
-{
-    // array keys from route result
-    const DISPATCH_STATUS = 0;
-    const ALLOWED_METHODS = 1;
-
-    /**
-     * Add route
-     *
-     * @param string[] $methods Array of HTTP methods
-     * @param string   $pattern The route pattern
-     * @param callable $handler The route callable
-     *
-     * @return RouteInterface
-     */
-    public function map($methods, $pattern, $handler);
-
-    /**
-     * Dispatch router for HTTP request
-     *
-     * @param  ServerRequestInterface $request The current HTTP request object
-     *
-     * @return array
-     *
-     * @link   https://github.com/nikic/FastRoute/blob/master/src/Dispatcher.php
-     */
-    public function dispatch(ServerRequestInterface $request);
-
-    /**
-     * Add a route group to the array
-     *
-     * @param string   $pattern The group pattern
-     * @param callable $callable A group callable
-     *
-     * @return RouteGroupInterface
-     */
-    public function pushGroup($pattern, $callable);
-
-    /**
-     * Removes the last route group from the array
-     *
-     * @return bool True if successful, else False
-     */
-    public function popGroup();
-
-    /**
-     * Get named route object
-     *
-     * @param string $name        Route name
-     *
-     * @return \Slim\Interfaces\RouteInterface
-     *
-     * @throws RuntimeException   If named route does not exist
-     */
-    public function getNamedRoute($name);
-
-    /**
-     * @param $identifier
-     *
-     * @return \Slim\Interfaces\RouteInterface
-     */
-    public function lookupRoute($identifier);
-
-    /**
-     * Build the path for a named route excluding the base path
-     *
-     * @param string $name        Route name
-     * @param array  $data        Named argument replacement data
-     * @param array  $queryParams Optional query string parameters
-     *
-     * @return string
-     *
-     * @throws RuntimeException         If named route does not exist
-     * @throws InvalidArgumentException If required data not provided
-     */
-    public function relativePathFor($name, array $data = [], array $queryParams = []);
-
-    /**
-     * Build the path for a named route including the base path
-     *
-     * @param string $name        Route name
-     * @param array  $data        Named argument replacement data
-     * @param array  $queryParams Optional query string parameters
-     *
-     * @return string
-     *
-     * @throws RuntimeException         If named route does not exist
-     * @throws InvalidArgumentException If required data not provided
-     */
-    public function pathFor($name, array $data = [], array $queryParams = []);
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/ServerRequestCreatorInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/ServerRequestCreatorInterface.php
new file mode 100644
index 00000000..54d231ed
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/ServerRequestCreatorInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Interfaces;
+
+use Psr\Http\Message\ServerRequestInterface;
+
+interface ServerRequestCreatorInterface
+{
+    public function createServerRequestFromGlobals(): ServerRequestInterface;
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Logger.php b/advancedcontentfilter/vendor/slim/slim/Slim/Logger.php
new file mode 100644
index 00000000..31282175
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Logger.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim;
+
+use Psr\Log\AbstractLogger;
+use Psr\Log\InvalidArgumentException;
+use Stringable;
+
+use function error_log;
+
+class Logger extends AbstractLogger
+{
+    /**
+     * @param mixed             $level
+     * @param string|Stringable $message
+     * @param array<mixed>      $context
+     *
+     * @throws InvalidArgumentException
+     */
+    public function log($level, $message, array $context = []): void
+    {
+        error_log((string) $message);
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/BodyParsingMiddleware.php b/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/BodyParsingMiddleware.php
new file mode 100644
index 00000000..9a90f30c
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/BodyParsingMiddleware.php
@@ -0,0 +1,196 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Middleware;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use RuntimeException;
+
+use function count;
+use function explode;
+use function is_array;
+use function is_null;
+use function is_object;
+use function is_string;
+use function json_decode;
+use function libxml_clear_errors;
+use function libxml_disable_entity_loader;
+use function libxml_use_internal_errors;
+use function parse_str;
+use function simplexml_load_string;
+use function strtolower;
+use function trim;
+
+use const LIBXML_VERSION;
+
+class BodyParsingMiddleware implements MiddlewareInterface
+{
+    /**
+     * @var callable[]
+     */
+    protected array $bodyParsers;
+
+    /**
+     * @param callable[] $bodyParsers list of body parsers as an associative array of mediaType => callable
+     */
+    public function __construct(array $bodyParsers = [])
+    {
+        $this->registerDefaultBodyParsers();
+
+        foreach ($bodyParsers as $mediaType => $parser) {
+            $this->registerBodyParser($mediaType, $parser);
+        }
+    }
+
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        $parsedBody = $request->getParsedBody();
+
+        if (empty($parsedBody)) {
+            $parsedBody = $this->parseBody($request);
+            $request = $request->withParsedBody($parsedBody);
+        }
+
+        return $handler->handle($request);
+    }
+
+    /**
+     * @param string   $mediaType A HTTP media type (excluding content-type params).
+     * @param callable $callable  A callable that returns parsed contents for media type.
+     */
+    public function registerBodyParser(string $mediaType, callable $callable): self
+    {
+        $this->bodyParsers[$mediaType] = $callable;
+        return $this;
+    }
+
+    /**
+     * @param string   $mediaType A HTTP media type (excluding content-type params).
+     */
+    public function hasBodyParser(string $mediaType): bool
+    {
+        return isset($this->bodyParsers[$mediaType]);
+    }
+
+    /**
+     * @param string    $mediaType A HTTP media type (excluding content-type params).
+     * @throws RuntimeException
+     */
+    public function getBodyParser(string $mediaType): callable
+    {
+        if (!isset($this->bodyParsers[$mediaType])) {
+            throw new RuntimeException('No parser for type ' . $mediaType);
+        }
+        return $this->bodyParsers[$mediaType];
+    }
+
+    protected function registerDefaultBodyParsers(): void
+    {
+        $this->registerBodyParser('application/json', static function ($input) {
+            $result = json_decode($input, true);
+
+            if (!is_array($result)) {
+                return null;
+            }
+
+            return $result;
+        });
+
+        $this->registerBodyParser('application/x-www-form-urlencoded', static function ($input) {
+            parse_str($input, $data);
+            return $data;
+        });
+
+        $xmlCallable = static function ($input) {
+            $backup = self::disableXmlEntityLoader(true);
+            $backup_errors = libxml_use_internal_errors(true);
+            $result = simplexml_load_string($input);
+
+            self::disableXmlEntityLoader($backup);
+            libxml_clear_errors();
+            libxml_use_internal_errors($backup_errors);
+
+            if ($result === false) {
+                return null;
+            }
+
+            return $result;
+        };
+
+        $this->registerBodyParser('application/xml', $xmlCallable);
+        $this->registerBodyParser('text/xml', $xmlCallable);
+    }
+
+    /**
+     * @return null|array<mixed>|object
+     */
+    protected function parseBody(ServerRequestInterface $request)
+    {
+        $mediaType = $this->getMediaType($request);
+        if ($mediaType === null) {
+            return null;
+        }
+
+        // Check if this specific media type has a parser registered first
+        if (!isset($this->bodyParsers[$mediaType])) {
+            // If not, look for a media type with a structured syntax suffix (RFC 6839)
+            $parts = explode('+', $mediaType);
+            if (count($parts) >= 2) {
+                $mediaType = 'application/' . $parts[count($parts) - 1];
+            }
+        }
+
+        if (isset($this->bodyParsers[$mediaType])) {
+            $body = (string)$request->getBody();
+            $parsed = $this->bodyParsers[$mediaType]($body);
+
+            if ($parsed !== null && !is_object($parsed) && !is_array($parsed)) {
+                throw new RuntimeException(
+                    'Request body media type parser return value must be an array, an object, or null'
+                );
+            }
+
+            return $parsed;
+        }
+
+        return null;
+    }
+
+    /**
+     * @return string|null The serverRequest media type, minus content-type params
+     */
+    protected function getMediaType(ServerRequestInterface $request): ?string
+    {
+        $contentType = $request->getHeader('Content-Type')[0] ?? null;
+
+        if (is_string($contentType) && trim($contentType) !== '') {
+            $contentTypeParts = explode(';', $contentType);
+            return strtolower(trim($contentTypeParts[0]));
+        }
+
+        return null;
+    }
+
+    protected static function disableXmlEntityLoader(bool $disable): bool
+    {
+        if (LIBXML_VERSION >= 20900) {
+            // libxml >= 2.9.0 disables entity loading by default, so it is
+            // safe to skip the real call (deprecated in PHP 8).
+            return true;
+        }
+
+        // @codeCoverageIgnoreStart
+        return libxml_disable_entity_loader($disable);
+        // @codeCoverageIgnoreEnd
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/ContentLengthMiddleware.php b/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/ContentLengthMiddleware.php
new file mode 100644
index 00000000..8fa13bcf
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/ContentLengthMiddleware.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Middleware;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+
+class ContentLengthMiddleware implements MiddlewareInterface
+{
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        $response = $handler->handle($request);
+
+        // Add Content-Length header if not already added
+        $size = $response->getBody()->getSize();
+        if ($size !== null && !$response->hasHeader('Content-Length')) {
+            $response = $response->withHeader('Content-Length', (string) $size);
+        }
+
+        return $response;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/ErrorMiddleware.php b/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/ErrorMiddleware.php
new file mode 100644
index 00000000..2eb5cc96
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/ErrorMiddleware.php
@@ -0,0 +1,212 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Middleware;
+
+use Psr\Http\Message\ResponseFactoryInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use Psr\Log\LoggerInterface;
+use Slim\Exception\HttpException;
+use Slim\Handlers\ErrorHandler;
+use Slim\Interfaces\CallableResolverInterface;
+use Slim\Interfaces\ErrorHandlerInterface;
+use Throwable;
+
+use function get_class;
+use function is_subclass_of;
+
+class ErrorMiddleware implements MiddlewareInterface
+{
+    protected CallableResolverInterface $callableResolver;
+
+    protected ResponseFactoryInterface $responseFactory;
+
+    protected bool $displayErrorDetails;
+
+    protected bool $logErrors;
+
+    protected bool $logErrorDetails;
+
+    protected ?LoggerInterface $logger = null;
+
+    /**
+     * @var ErrorHandlerInterface[]|callable[]|string[]
+     */
+    protected array $handlers = [];
+
+    /**
+     * @var ErrorHandlerInterface[]|callable[]|string[]
+     */
+    protected array $subClassHandlers = [];
+
+    /**
+     * @var ErrorHandlerInterface|callable|string|null
+     */
+    protected $defaultErrorHandler;
+
+    public function __construct(
+        CallableResolverInterface $callableResolver,
+        ResponseFactoryInterface $responseFactory,
+        bool $displayErrorDetails,
+        bool $logErrors,
+        bool $logErrorDetails,
+        ?LoggerInterface $logger = null
+    ) {
+        $this->callableResolver = $callableResolver;
+        $this->responseFactory = $responseFactory;
+        $this->displayErrorDetails = $displayErrorDetails;
+        $this->logErrors = $logErrors;
+        $this->logErrorDetails = $logErrorDetails;
+        $this->logger = $logger;
+    }
+
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        try {
+            return $handler->handle($request);
+        } catch (Throwable $e) {
+            return $this->handleException($request, $e);
+        }
+    }
+
+    public function handleException(ServerRequestInterface $request, Throwable $exception): ResponseInterface
+    {
+        if ($exception instanceof HttpException) {
+            $request = $exception->getRequest();
+        }
+
+        $exceptionType = get_class($exception);
+        $handler = $this->getErrorHandler($exceptionType);
+
+        return $handler($request, $exception, $this->displayErrorDetails, $this->logErrors, $this->logErrorDetails);
+    }
+
+    /**
+     * Get callable to handle scenarios where an error
+     * occurs when processing the current request.
+     *
+     * @param string $type Exception/Throwable name. ie: RuntimeException::class
+     * @return callable|ErrorHandler
+     */
+    public function getErrorHandler(string $type)
+    {
+        if (isset($this->handlers[$type])) {
+            return $this->callableResolver->resolve($this->handlers[$type]);
+        }
+
+        if (isset($this->subClassHandlers[$type])) {
+            return $this->callableResolver->resolve($this->subClassHandlers[$type]);
+        }
+
+        foreach ($this->subClassHandlers as $class => $handler) {
+            if (is_subclass_of($type, $class)) {
+                return $this->callableResolver->resolve($handler);
+            }
+        }
+
+        return $this->getDefaultErrorHandler();
+    }
+
+    /**
+     * Get default error handler
+     *
+     * @return ErrorHandler|callable
+     */
+    public function getDefaultErrorHandler()
+    {
+        if ($this->defaultErrorHandler === null) {
+            $this->defaultErrorHandler = new ErrorHandler(
+                $this->callableResolver,
+                $this->responseFactory,
+                $this->logger
+            );
+        }
+
+        return $this->callableResolver->resolve($this->defaultErrorHandler);
+    }
+
+    /**
+     * Set callable as the default Slim application error handler.
+     *
+     * The callable signature MUST match the ErrorHandlerInterface
+     *
+     * @see \Slim\Interfaces\ErrorHandlerInterface
+     *
+     * 1. Instance of \Psr\Http\Message\ServerRequestInterface
+     * 2. Instance of \Throwable
+     * 3. Boolean $displayErrorDetails
+     * 4. Boolean $logErrors
+     * 5. Boolean $logErrorDetails
+     *
+     * The callable MUST return an instance of
+     * \Psr\Http\Message\ResponseInterface.
+     *
+     * @param string|callable|ErrorHandler $handler
+     */
+    public function setDefaultErrorHandler($handler): self
+    {
+        $this->defaultErrorHandler = $handler;
+        return $this;
+    }
+
+    /**
+     * Set callable to handle scenarios where an error
+     * occurs when processing the current request.
+     *
+     * The callable signature MUST match the ErrorHandlerInterface
+     *
+     * Pass true to $handleSubclasses to make the handler handle all subclasses of
+     * the type as well. Pass an array of classes to make the same function handle multiple exceptions.
+     *
+     * @see \Slim\Interfaces\ErrorHandlerInterface
+     *
+     * 1. Instance of \Psr\Http\Message\ServerRequestInterface
+     * 2. Instance of \Throwable
+     * 3. Boolean $displayErrorDetails
+     * 4. Boolean $logErrors
+     * 5. Boolean $logErrorDetails
+     *
+     * The callable MUST return an instance of
+     * \Psr\Http\Message\ResponseInterface.
+     *
+     * @param string|string[] $typeOrTypes Exception/Throwable name.
+     * ie: RuntimeException::class or an array of classes
+     * ie: [HttpNotFoundException::class, HttpMethodNotAllowedException::class]
+     * @param string|callable|ErrorHandlerInterface $handler
+     */
+    public function setErrorHandler($typeOrTypes, $handler, bool $handleSubclasses = false): self
+    {
+        if (is_array($typeOrTypes)) {
+            foreach ($typeOrTypes as $type) {
+                $this->addErrorHandler($type, $handler, $handleSubclasses);
+            }
+        } else {
+            $this->addErrorHandler($typeOrTypes, $handler, $handleSubclasses);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Used internally to avoid code repetition when passing multiple exceptions to setErrorHandler().
+     * @param string|callable|ErrorHandlerInterface $handler
+     */
+    private function addErrorHandler(string $type, $handler, bool $handleSubclasses): void
+    {
+        if ($handleSubclasses) {
+            $this->subClassHandlers[$type] = $handler;
+        } else {
+            $this->handlers[$type] = $handler;
+        }
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/MethodOverrideMiddleware.php b/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/MethodOverrideMiddleware.php
new file mode 100644
index 00000000..079a1f18
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/MethodOverrideMiddleware.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Middleware;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+
+use function is_array;
+use function strtoupper;
+
+class MethodOverrideMiddleware implements MiddlewareInterface
+{
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        $methodHeader = $request->getHeaderLine('X-Http-Method-Override');
+
+        if ($methodHeader) {
+            $request = $request->withMethod($methodHeader);
+        } elseif (strtoupper($request->getMethod()) === 'POST') {
+            $body = $request->getParsedBody();
+
+            if (is_array($body) && !empty($body['_METHOD'])) {
+                $request = $request->withMethod($body['_METHOD']);
+            }
+
+            if ($request->getBody()->eof()) {
+                $request->getBody()->rewind();
+            }
+        }
+
+        return $handler->handle($request);
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/OutputBufferingMiddleware.php b/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/OutputBufferingMiddleware.php
new file mode 100644
index 00000000..69ee1f6f
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/OutputBufferingMiddleware.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Middleware;
+
+use InvalidArgumentException;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\StreamFactoryInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use Throwable;
+
+use function in_array;
+use function ob_end_clean;
+use function ob_get_clean;
+use function ob_start;
+
+class OutputBufferingMiddleware implements MiddlewareInterface
+{
+    public const APPEND = 'append';
+    public const PREPEND = 'prepend';
+
+    protected StreamFactoryInterface $streamFactory;
+
+    protected string $style;
+
+    /**
+     * @param string $style Either "append" or "prepend"
+     */
+    public function __construct(StreamFactoryInterface $streamFactory, string $style = 'append')
+    {
+        $this->streamFactory = $streamFactory;
+        $this->style = $style;
+
+        if (!in_array($style, [static::APPEND, static::PREPEND], true)) {
+            throw new InvalidArgumentException("Invalid style `{$style}`. Must be `append` or `prepend`");
+        }
+    }
+
+    /**
+     * @throws Throwable
+     */
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        try {
+            ob_start();
+            $response = $handler->handle($request);
+            $output = ob_get_clean();
+        } catch (Throwable $e) {
+            ob_end_clean();
+            throw $e;
+        }
+
+        if (!empty($output)) {
+            if ($this->style === static::PREPEND) {
+                $body = $this->streamFactory->createStream();
+                $body->write($output . $response->getBody());
+                $response = $response->withBody($body);
+            } elseif ($this->style === static::APPEND && $response->getBody()->isWritable()) {
+                $response->getBody()->write($output);
+            }
+        }
+
+        return $response;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/RoutingMiddleware.php b/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/RoutingMiddleware.php
new file mode 100644
index 00000000..a3d3085b
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/RoutingMiddleware.php
@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Middleware;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use RuntimeException;
+use Slim\Exception\HttpMethodNotAllowedException;
+use Slim\Exception\HttpNotFoundException;
+use Slim\Interfaces\RouteParserInterface;
+use Slim\Interfaces\RouteResolverInterface;
+use Slim\Routing\RouteContext;
+use Slim\Routing\RoutingResults;
+
+class RoutingMiddleware implements MiddlewareInterface
+{
+    protected RouteResolverInterface $routeResolver;
+
+    protected RouteParserInterface $routeParser;
+
+    public function __construct(RouteResolverInterface $routeResolver, RouteParserInterface $routeParser)
+    {
+        $this->routeResolver = $routeResolver;
+        $this->routeParser = $routeParser;
+    }
+
+    /**
+     * @throws HttpNotFoundException
+     * @throws HttpMethodNotAllowedException
+     * @throws RuntimeException
+     */
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        $request = $this->performRouting($request);
+        return $handler->handle($request);
+    }
+
+    /**
+     * Perform routing
+     *
+     * @param  ServerRequestInterface $request PSR7 Server Request
+     *
+     * @throws HttpNotFoundException
+     * @throws HttpMethodNotAllowedException
+     * @throws RuntimeException
+     */
+    public function performRouting(ServerRequestInterface $request): ServerRequestInterface
+    {
+        $request = $request->withAttribute(RouteContext::ROUTE_PARSER, $this->routeParser);
+
+        $routingResults = $this->resolveRoutingResultsFromRequest($request);
+        $routeStatus = $routingResults->getRouteStatus();
+
+        $request = $request->withAttribute(RouteContext::ROUTING_RESULTS, $routingResults);
+
+        switch ($routeStatus) {
+            case RoutingResults::FOUND:
+                $routeArguments = $routingResults->getRouteArguments();
+                $routeIdentifier = $routingResults->getRouteIdentifier() ?? '';
+                $route = $this->routeResolver
+                    ->resolveRoute($routeIdentifier)
+                    ->prepare($routeArguments);
+                return $request->withAttribute(RouteContext::ROUTE, $route);
+
+            case RoutingResults::NOT_FOUND:
+                throw new HttpNotFoundException($request);
+
+            case RoutingResults::METHOD_NOT_ALLOWED:
+                $exception = new HttpMethodNotAllowedException($request);
+                $exception->setAllowedMethods($routingResults->getAllowedMethods());
+                throw $exception;
+
+            default:
+                throw new RuntimeException('An unexpected error occurred while performing routing.');
+        }
+    }
+
+    /**
+     * Resolves the route from the given request
+     */
+    protected function resolveRoutingResultsFromRequest(ServerRequestInterface $request): RoutingResults
+    {
+        return $this->routeResolver->computeRoutingResults(
+            $request->getUri()->getPath(),
+            $request->getMethod()
+        );
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/MiddlewareAwareTrait.php b/advancedcontentfilter/vendor/slim/slim/Slim/MiddlewareAwareTrait.php
deleted file mode 100644
index 8b8a1755..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/MiddlewareAwareTrait.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim;
-
-use RuntimeException;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use UnexpectedValueException;
-
-/**
- * Middleware
- *
- * This is an internal class that enables concentric middleware layers. This
- * class is an implementation detail and is used only inside of the Slim
- * application; it is not visible to—and should not be used by—end users.
- */
-trait MiddlewareAwareTrait
-{
-    /**
-     * Tip of the middleware call stack
-     *
-     * @var callable
-     */
-    protected $tip;
-
-    /**
-     * Middleware stack lock
-     *
-     * @var bool
-     */
-    protected $middlewareLock = false;
-
-    /**
-     * Add middleware
-     *
-     * This method prepends new middleware to the application middleware stack.
-     *
-     * @param callable $callable Any callable that accepts three arguments:
-     *                           1. A Request object
-     *                           2. A Response object
-     *                           3. A "next" middleware callable
-     * @return static
-     *
-     * @throws RuntimeException         If middleware is added while the stack is dequeuing
-     * @throws UnexpectedValueException If the middleware doesn't return a Psr\Http\Message\ResponseInterface
-     */
-    protected function addMiddleware(callable $callable)
-    {
-        if ($this->middlewareLock) {
-            throw new RuntimeException('Middleware can’t be added once the stack is dequeuing');
-        }
-
-        if (is_null($this->tip)) {
-            $this->seedMiddlewareStack();
-        }
-        $next = $this->tip;
-        $this->tip = function (
-            ServerRequestInterface $request,
-            ResponseInterface $response
-        ) use (
-            $callable,
-            $next
-        ) {
-            $result = call_user_func($callable, $request, $response, $next);
-            if ($result instanceof ResponseInterface === false) {
-                throw new UnexpectedValueException(
-                    'Middleware must return instance of \Psr\Http\Message\ResponseInterface'
-                );
-            }
-
-            return $result;
-        };
-
-        return $this;
-    }
-
-    /**
-     * Seed middleware stack with first callable
-     *
-     * @param callable $kernel The last item to run as middleware
-     *
-     * @throws RuntimeException if the stack is seeded more than once
-     */
-    protected function seedMiddlewareStack(callable $kernel = null)
-    {
-        if (!is_null($this->tip)) {
-            throw new RuntimeException('MiddlewareStack can only be seeded once.');
-        }
-        if ($kernel === null) {
-            $kernel = $this;
-        }
-        $this->tip = $kernel;
-    }
-
-    /**
-     * Call middleware stack
-     *
-     * @param  ServerRequestInterface $request A request object
-     * @param  ResponseInterface      $response A response object
-     *
-     * @return ResponseInterface
-     */
-    public function callMiddlewareStack(ServerRequestInterface $request, ResponseInterface $response)
-    {
-        if (is_null($this->tip)) {
-            $this->seedMiddlewareStack();
-        }
-        /** @var callable $start */
-        $start = $this->tip;
-        $this->middlewareLock = true;
-        $response = $start($request, $response);
-        $this->middlewareLock = false;
-        return $response;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/MiddlewareDispatcher.php b/advancedcontentfilter/vendor/slim/slim/Slim/MiddlewareDispatcher.php
new file mode 100644
index 00000000..7e056441
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/MiddlewareDispatcher.php
@@ -0,0 +1,275 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim;
+
+use Closure;
+use Psr\Container\ContainerInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use RuntimeException;
+use Slim\Interfaces\AdvancedCallableResolverInterface;
+use Slim\Interfaces\CallableResolverInterface;
+use Slim\Interfaces\MiddlewareDispatcherInterface;
+
+use function class_exists;
+use function function_exists;
+use function is_callable;
+use function is_string;
+use function preg_match;
+use function sprintf;
+
+class MiddlewareDispatcher implements MiddlewareDispatcherInterface
+{
+    /**
+     * Tip of the middleware call stack
+     */
+    protected RequestHandlerInterface $tip;
+
+    protected ?CallableResolverInterface $callableResolver;
+
+    protected ?ContainerInterface $container;
+
+    public function __construct(
+        RequestHandlerInterface $kernel,
+        ?CallableResolverInterface $callableResolver = null,
+        ?ContainerInterface $container = null
+    ) {
+        $this->seedMiddlewareStack($kernel);
+        $this->callableResolver = $callableResolver;
+        $this->container = $container;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function seedMiddlewareStack(RequestHandlerInterface $kernel): void
+    {
+        $this->tip = $kernel;
+    }
+
+    /**
+     * Invoke the middleware stack
+     */
+    public function handle(ServerRequestInterface $request): ResponseInterface
+    {
+        return $this->tip->handle($request);
+    }
+
+    /**
+     * Add a new middleware to the stack
+     *
+     * Middleware are organized as a stack. That means middleware
+     * that have been added before will be executed after the newly
+     * added one (last in, first out).
+     *
+     * @param MiddlewareInterface|string|callable $middleware
+     */
+    public function add($middleware): MiddlewareDispatcherInterface
+    {
+        if ($middleware instanceof MiddlewareInterface) {
+            return $this->addMiddleware($middleware);
+        }
+
+        if (is_string($middleware)) {
+            return $this->addDeferred($middleware);
+        }
+
+        if (is_callable($middleware)) {
+            return $this->addCallable($middleware);
+        }
+
+        /** @phpstan-ignore-next-line */
+        throw new RuntimeException(
+            'A middleware must be an object/class name referencing an implementation of ' .
+            'MiddlewareInterface or a callable with a matching signature.'
+        );
+    }
+
+    /**
+     * Add a new middleware to the stack
+     *
+     * Middleware are organized as a stack. That means middleware
+     * that have been added before will be executed after the newly
+     * added one (last in, first out).
+     */
+    public function addMiddleware(MiddlewareInterface $middleware): MiddlewareDispatcherInterface
+    {
+        $next = $this->tip;
+        $this->tip = new class ($middleware, $next) implements RequestHandlerInterface {
+            private MiddlewareInterface $middleware;
+
+            private RequestHandlerInterface $next;
+
+            public function __construct(MiddlewareInterface $middleware, RequestHandlerInterface $next)
+            {
+                $this->middleware = $middleware;
+                $this->next = $next;
+            }
+
+            public function handle(ServerRequestInterface $request): ResponseInterface
+            {
+                return $this->middleware->process($request, $this->next);
+            }
+        };
+
+        return $this;
+    }
+
+    /**
+     * Add a new middleware by class name
+     *
+     * Middleware are organized as a stack. That means middleware
+     * that have been added before will be executed after the newly
+     * added one (last in, first out).
+     */
+    public function addDeferred(string $middleware): self
+    {
+        $next = $this->tip;
+        $this->tip = new class (
+            $middleware,
+            $next,
+            $this->container,
+            $this->callableResolver
+        ) implements RequestHandlerInterface {
+            private string $middleware;
+
+            private RequestHandlerInterface $next;
+
+            private ?ContainerInterface $container;
+
+            private ?CallableResolverInterface $callableResolver;
+
+            public function __construct(
+                string $middleware,
+                RequestHandlerInterface $next,
+                ?ContainerInterface $container = null,
+                ?CallableResolverInterface $callableResolver = null
+            ) {
+                $this->middleware = $middleware;
+                $this->next = $next;
+                $this->container = $container;
+                $this->callableResolver = $callableResolver;
+            }
+
+            public function handle(ServerRequestInterface $request): ResponseInterface
+            {
+                if ($this->callableResolver instanceof AdvancedCallableResolverInterface) {
+                    $callable = $this->callableResolver->resolveMiddleware($this->middleware);
+                    return $callable($request, $this->next);
+                }
+
+                $callable = null;
+
+                if ($this->callableResolver instanceof CallableResolverInterface) {
+                    try {
+                        $callable = $this->callableResolver->resolve($this->middleware);
+                    } catch (RuntimeException $e) {
+                        // Do Nothing
+                    }
+                }
+
+                if (!$callable) {
+                    $resolved = $this->middleware;
+                    $instance = null;
+                    $method = null;
+
+                    // Check for Slim callable as `class:method`
+                    if (preg_match(CallableResolver::$callablePattern, $resolved, $matches)) {
+                        $resolved = $matches[1];
+                        $method = $matches[2];
+                    }
+
+                    if ($this->container && $this->container->has($resolved)) {
+                        $instance = $this->container->get($resolved);
+                        if ($instance instanceof MiddlewareInterface) {
+                            return $instance->process($request, $this->next);
+                        }
+                    } elseif (!function_exists($resolved)) {
+                        if (!class_exists($resolved)) {
+                            throw new RuntimeException(sprintf('Middleware %s does not exist', $resolved));
+                        }
+                        $instance = new $resolved($this->container);
+                    }
+
+                    if ($instance && $instance instanceof MiddlewareInterface) {
+                        return $instance->process($request, $this->next);
+                    }
+
+                    $callable = $instance ?? $resolved;
+                    if ($instance && $method) {
+                        $callable = [$instance, $method];
+                    }
+
+                    if ($this->container && $callable instanceof Closure) {
+                        $callable = $callable->bindTo($this->container);
+                    }
+                }
+
+                if (!is_callable($callable)) {
+                    throw new RuntimeException(
+                        sprintf(
+                            'Middleware %s is not resolvable',
+                            $this->middleware
+                        )
+                    );
+                }
+
+                return $callable($request, $this->next);
+            }
+        };
+
+        return $this;
+    }
+
+    /**
+     * Add a (non-standard) callable middleware to the stack
+     *
+     * Middleware are organized as a stack. That means middleware
+     * that have been added before will be executed after the newly
+     * added one (last in, first out).
+     */
+    public function addCallable(callable $middleware): self
+    {
+        $next = $this->tip;
+
+        if ($this->container && $middleware instanceof Closure) {
+            /** @var Closure $middleware */
+            $middleware = $middleware->bindTo($this->container);
+        }
+
+        $this->tip = new class ($middleware, $next) implements RequestHandlerInterface {
+            /**
+             * @var callable
+             */
+            private $middleware;
+
+            /**
+             * @var RequestHandlerInterface
+             */
+            private $next;
+
+            public function __construct(callable $middleware, RequestHandlerInterface $next)
+            {
+                $this->middleware = $middleware;
+                $this->next = $next;
+            }
+
+            public function handle(ServerRequestInterface $request): ResponseInterface
+            {
+                return ($this->middleware)($request, $this->next);
+            }
+        };
+
+        return $this;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/ResponseEmitter.php b/advancedcontentfilter/vendor/slim/slim/Slim/ResponseEmitter.php
new file mode 100644
index 00000000..fac36e9e
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/ResponseEmitter.php
@@ -0,0 +1,136 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim;
+
+use Psr\Http\Message\ResponseInterface;
+
+use function connection_status;
+use function header;
+use function headers_sent;
+use function in_array;
+use function min;
+use function sprintf;
+use function strlen;
+use function strtolower;
+
+use const CONNECTION_NORMAL;
+
+class ResponseEmitter
+{
+    private int $responseChunkSize;
+
+    public function __construct(int $responseChunkSize = 4096)
+    {
+        $this->responseChunkSize = $responseChunkSize;
+    }
+
+    /**
+     * Send the response the client
+     */
+    public function emit(ResponseInterface $response): void
+    {
+        $isEmpty = $this->isResponseEmpty($response);
+        if (headers_sent() === false) {
+            $this->emitHeaders($response);
+
+            // Set the status _after_ the headers, because of PHP's "helpful" behavior with location headers.
+            // See https://github.com/slimphp/Slim/issues/1730
+
+            $this->emitStatusLine($response);
+        }
+
+        if (!$isEmpty) {
+            $this->emitBody($response);
+        }
+    }
+
+    /**
+     * Emit Response Headers
+     */
+    private function emitHeaders(ResponseInterface $response): void
+    {
+        foreach ($response->getHeaders() as $name => $values) {
+            $first = strtolower($name) !== 'set-cookie';
+            foreach ($values as $value) {
+                $header = sprintf('%s: %s', $name, $value);
+                header($header, $first);
+                $first = false;
+            }
+        }
+    }
+
+    /**
+     * Emit Status Line
+     */
+    private function emitStatusLine(ResponseInterface $response): void
+    {
+        $statusLine = sprintf(
+            'HTTP/%s %s %s',
+            $response->getProtocolVersion(),
+            $response->getStatusCode(),
+            $response->getReasonPhrase()
+        );
+        header($statusLine, true, $response->getStatusCode());
+    }
+
+    /**
+     * Emit Body
+     */
+    private function emitBody(ResponseInterface $response): void
+    {
+        $body = $response->getBody();
+        if ($body->isSeekable()) {
+            $body->rewind();
+        }
+
+        $amountToRead = (int) $response->getHeaderLine('Content-Length');
+        if (!$amountToRead) {
+            $amountToRead = $body->getSize();
+        }
+
+        if ($amountToRead) {
+            while ($amountToRead > 0 && !$body->eof()) {
+                $length = min($this->responseChunkSize, $amountToRead);
+                $data = $body->read($length);
+                echo $data;
+
+                $amountToRead -= strlen($data);
+
+                if (connection_status() !== CONNECTION_NORMAL) {
+                    break;
+                }
+            }
+        } else {
+            while (!$body->eof()) {
+                echo $body->read($this->responseChunkSize);
+                if (connection_status() !== CONNECTION_NORMAL) {
+                    break;
+                }
+            }
+        }
+    }
+
+    /**
+     * Asserts response body is empty or status code is 204, 205 or 304
+     */
+    public function isResponseEmpty(ResponseInterface $response): bool
+    {
+        if (in_array($response->getStatusCode(), [204, 205, 304], true)) {
+            return true;
+        }
+        $stream = $response->getBody();
+        $seekable = $stream->isSeekable();
+        if ($seekable) {
+            $stream->rewind();
+        }
+        return $seekable ? $stream->read(1) === '' : $stream->eof();
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Routable.php b/advancedcontentfilter/vendor/slim/slim/Slim/Routable.php
deleted file mode 100644
index c912db43..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Routable.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim;
-
-use Psr\Container\ContainerInterface;
-
-/**
- * A routable, middleware-aware object
- *
- * @package Slim
- * @since   3.0.0
- */
-abstract class Routable
-{
-    use CallableResolverAwareTrait;
-
-    /**
-     * Route callable
-     *
-     * @var callable
-     */
-    protected $callable;
-
-    /**
-     * Container
-     *
-     * @var ContainerInterface
-     */
-    protected $container;
-
-    /**
-     * Route middleware
-     *
-     * @var callable[]
-     */
-    protected $middleware = [];
-
-    /**
-     * Route pattern
-     *
-     * @var string
-     */
-    protected $pattern;
-
-    /**
-     * Get the middleware registered for the group
-     *
-     * @return callable[]
-     */
-    public function getMiddleware()
-    {
-        return $this->middleware;
-    }
-
-    /**
-     * Get the route pattern
-     *
-     * @return string
-     */
-    public function getPattern()
-    {
-        return $this->pattern;
-    }
-
-    /**
-     * Set container for use with resolveCallable
-     *
-     * @param ContainerInterface $container
-     *
-     * @return self
-     */
-    public function setContainer(ContainerInterface $container)
-    {
-        $this->container = $container;
-        return $this;
-    }
-
-    /**
-     * Prepend middleware to the middleware collection
-     *
-     * @param callable|string $callable The callback routine
-     *
-     * @return static
-     */
-    public function add($callable)
-    {
-        $this->middleware[] = new DeferredCallable($callable, $this->container);
-        return $this;
-    }
-
-    /**
-     * Set the route pattern
-     *
-     * @param string $newPattern
-     */
-    public function setPattern($newPattern)
-    {
-        $this->pattern = $newPattern;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Route.php b/advancedcontentfilter/vendor/slim/slim/Slim/Route.php
deleted file mode 100644
index fa8be4e4..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Route.php
+++ /dev/null
@@ -1,349 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim;
-
-use InvalidArgumentException;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Slim\Handlers\Strategies\RequestResponse;
-use Slim\Interfaces\InvocationStrategyInterface;
-use Slim\Interfaces\RouteInterface;
-
-/**
- * Route
- */
-class Route extends Routable implements RouteInterface
-{
-    use MiddlewareAwareTrait;
-
-    /**
-     * HTTP methods supported by this route
-     *
-     * @var string[]
-     */
-    protected $methods = [];
-
-    /**
-     * Route identifier
-     *
-     * @var string
-     */
-    protected $identifier;
-
-    /**
-     * Route name
-     *
-     * @var null|string
-     */
-    protected $name;
-
-    /**
-     * Parent route groups
-     *
-     * @var RouteGroup[]
-     */
-    protected $groups;
-
-    private $finalized = false;
-
-    /**
-     * Output buffering mode
-     *
-     * One of: false, 'prepend' or 'append'
-     *
-     * @var boolean|string
-     */
-    protected $outputBuffering = 'append';
-
-    /**
-     * Route parameters
-     *
-     * @var array
-     */
-    protected $arguments = [];
-
-    /**
-     * The callable payload
-     *
-     * @var callable
-     */
-    protected $callable;
-
-    /**
-     * Create new route
-     *
-     * @param string|string[]   $methods The route HTTP methods
-     * @param string            $pattern The route pattern
-     * @param callable          $callable The route callable
-     * @param RouteGroup[]      $groups The parent route groups
-     * @param int               $identifier The route identifier
-     */
-    public function __construct($methods, $pattern, $callable, $groups = [], $identifier = 0)
-    {
-        $this->methods  = is_string($methods) ? [$methods] : $methods;
-        $this->pattern  = $pattern;
-        $this->callable = $callable;
-        $this->groups   = $groups;
-        $this->identifier = 'route' . $identifier;
-    }
-
-    /**
-     * Finalize the route in preparation for dispatching
-     */
-    public function finalize()
-    {
-        if ($this->finalized) {
-            return;
-        }
-
-        $groupMiddleware = [];
-        foreach ($this->getGroups() as $group) {
-            $groupMiddleware = array_merge($group->getMiddleware(), $groupMiddleware);
-        }
-
-        $this->middleware = array_merge($this->middleware, $groupMiddleware);
-
-        foreach ($this->getMiddleware() as $middleware) {
-            $this->addMiddleware($middleware);
-        }
-
-        $this->finalized = true;
-    }
-
-    /**
-     * Get route callable
-     *
-     * @return callable
-     */
-    public function getCallable()
-    {
-        return $this->callable;
-    }
-
-    /**
-     * This method enables you to override the Route's callable
-     *
-     * @param string|\Closure $callable
-     */
-    public function setCallable($callable)
-    {
-        $this->callable = $callable;
-    }
-
-    /**
-     * Get route methods
-     *
-     * @return string[]
-     */
-    public function getMethods()
-    {
-        return $this->methods;
-    }
-
-    /**
-     * Get parent route groups
-     *
-     * @return RouteGroup[]
-     */
-    public function getGroups()
-    {
-        return $this->groups;
-    }
-
-    /**
-     * Get route name
-     *
-     * @return null|string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Get route identifier
-     *
-     * @return string
-     */
-    public function getIdentifier()
-    {
-        return $this->identifier;
-    }
-
-    /**
-     * Get output buffering mode
-     *
-     * @return boolean|string
-     */
-    public function getOutputBuffering()
-    {
-        return $this->outputBuffering;
-    }
-
-    /**
-     * Set output buffering mode
-     *
-     * One of: false, 'prepend' or 'append'
-     *
-     * @param boolean|string $mode
-     *
-     * @throws InvalidArgumentException If an unknown buffering mode is specified
-     */
-    public function setOutputBuffering($mode)
-    {
-        if (!in_array($mode, [false, 'prepend', 'append'], true)) {
-            throw new InvalidArgumentException('Unknown output buffering mode');
-        }
-        $this->outputBuffering = $mode;
-    }
-
-    /**
-     * Set route name
-     *
-     * @param string $name
-     *
-     * @return self
-     *
-     * @throws InvalidArgumentException if the route name is not a string
-     */
-    public function setName($name)
-    {
-        if (!is_string($name)) {
-            throw new InvalidArgumentException('Route name must be a string');
-        }
-        $this->name = $name;
-        return $this;
-    }
-
-    /**
-     * Set a route argument
-     *
-     * @param string $name
-     * @param string $value
-     *
-     * @return self
-     */
-    public function setArgument($name, $value)
-    {
-        $this->arguments[$name] = $value;
-        return $this;
-    }
-
-    /**
-     * Replace route arguments
-     *
-     * @param array $arguments
-     *
-     * @return self
-     */
-    public function setArguments(array $arguments)
-    {
-        $this->arguments = $arguments;
-        return $this;
-    }
-
-    /**
-     * Retrieve route arguments
-     *
-     * @return array
-     */
-    public function getArguments()
-    {
-        return $this->arguments;
-    }
-
-    /**
-     * Retrieve a specific route argument
-     *
-     * @param string $name
-     * @param string|null $default
-     *
-     * @return mixed
-     */
-    public function getArgument($name, $default = null)
-    {
-        if (array_key_exists($name, $this->arguments)) {
-            return $this->arguments[$name];
-        }
-        return $default;
-    }
-
-    /********************************************************************************
-     * Route Runner
-     *******************************************************************************/
-
-    /**
-     * Prepare the route for use
-     *
-     * @param ServerRequestInterface $request
-     * @param array $arguments
-     */
-    public function prepare(ServerRequestInterface $request, array $arguments)
-    {
-        // Add the arguments
-        foreach ($arguments as $k => $v) {
-            $this->setArgument($k, $v);
-        }
-    }
-
-    /**
-     * Run route
-     *
-     * This method traverses the middleware stack, including the route's callable
-     * and captures the resultant HTTP response object. It then sends the response
-     * back to the Application.
-     *
-     * @param ServerRequestInterface $request
-     * @param ResponseInterface      $response
-     *
-     * @return ResponseInterface
-     */
-    public function run(ServerRequestInterface $request, ResponseInterface $response)
-    {
-        // Finalise route now that we are about to run it
-        $this->finalize();
-
-        // Traverse middleware stack and fetch updated response
-        return $this->callMiddlewareStack($request, $response);
-    }
-
-    /**
-     * Dispatch route callable against current Request and Response objects
-     *
-     * This method invokes the route object's callable. If middleware is
-     * registered for the route, each callable middleware is invoked in
-     * the order specified.
-     *
-     * @param ServerRequestInterface $request  The current Request object
-     * @param ResponseInterface      $response The current Response object
-     * @return \Psr\Http\Message\ResponseInterface
-     * @throws \Exception  if the route callable throws an exception
-     */
-    public function __invoke(ServerRequestInterface $request, ResponseInterface $response)
-    {
-        $this->callable = $this->resolveCallable($this->callable);
-
-        /** @var InvocationStrategyInterface $handler */
-        $handler = isset($this->container) ? $this->container->get('foundHandler') : new RequestResponse();
-
-        $newResponse = $handler($this->callable, $request, $response, $this->arguments);
-
-        if ($newResponse instanceof ResponseInterface) {
-            // if route callback returns a ResponseInterface, then use it
-            $response = $newResponse;
-        } elseif (is_string($newResponse)) {
-            // if route callback returns a string, then append it to the response
-            if ($response->getBody()->isWritable()) {
-                $response->getBody()->write($newResponse);
-            }
-        }
-
-        return $response;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/RouteGroup.php b/advancedcontentfilter/vendor/slim/slim/Slim/RouteGroup.php
deleted file mode 100644
index 8260bbd6..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/RouteGroup.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim;
-
-use Closure;
-use Slim\Interfaces\RouteGroupInterface;
-
-/**
- * A collector for Routable objects with a common middleware stack
- *
- * @package Slim
- */
-class RouteGroup extends Routable implements RouteGroupInterface
-{
-    /**
-     * Create a new RouteGroup
-     *
-     * @param string   $pattern  The pattern prefix for the group
-     * @param callable $callable The group callable
-     */
-    public function __construct($pattern, $callable)
-    {
-        $this->pattern = $pattern;
-        $this->callable = $callable;
-    }
-
-    /**
-     * Invoke the group to register any Routable objects within it.
-     *
-     * @param App $app The App instance to bind/pass to the group callable
-     */
-    public function __invoke(App $app = null)
-    {
-        $callable = $this->resolveCallable($this->callable);
-        if ($callable instanceof Closure && $app !== null) {
-            $callable = $callable->bindTo($app);
-        }
-
-        $callable($app);
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Router.php b/advancedcontentfilter/vendor/slim/slim/Slim/Router.php
deleted file mode 100644
index 83116288..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Router.php
+++ /dev/null
@@ -1,455 +0,0 @@
-<?php
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @link      https://github.com/slimphp/Slim
- * @copyright Copyright (c) 2011-2017 Josh Lockhart
- * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
- */
-namespace Slim;
-
-use FastRoute\Dispatcher;
-use Psr\Container\ContainerInterface;
-use InvalidArgumentException;
-use RuntimeException;
-use Psr\Http\Message\ServerRequestInterface;
-use FastRoute\RouteCollector;
-use FastRoute\RouteParser;
-use FastRoute\RouteParser\Std as StdParser;
-use Slim\Interfaces\RouteGroupInterface;
-use Slim\Interfaces\RouterInterface;
-use Slim\Interfaces\RouteInterface;
-
-/**
- * Router
- *
- * This class organizes Slim application route objects. It is responsible
- * for registering route objects, assigning names to route objects,
- * finding routes that match the current HTTP request, and creating
- * URLs for a named route.
- */
-class Router implements RouterInterface
-{
-    /**
-     * Container Interface
-     *
-     * @var ContainerInterface
-     */
-    protected $container;
-
-    /**
-     * Parser
-     *
-     * @var \FastRoute\RouteParser
-     */
-    protected $routeParser;
-
-    /**
-     * Base path used in pathFor()
-     *
-     * @var string
-     */
-    protected $basePath = '';
-
-    /**
-     * Path to fast route cache file. Set to false to disable route caching
-     *
-     * @var string|False
-     */
-    protected $cacheFile = false;
-
-    /**
-     * Routes
-     *
-     * @var Route[]
-     */
-    protected $routes = [];
-
-    /**
-     * Route counter incrementer
-     * @var int
-     */
-    protected $routeCounter = 0;
-
-    /**
-     * Route groups
-     *
-     * @var RouteGroup[]
-     */
-    protected $routeGroups = [];
-
-    /**
-     * @var \FastRoute\Dispatcher
-     */
-    protected $dispatcher;
-
-    /**
-     * Create new router
-     *
-     * @param RouteParser   $parser
-     */
-    public function __construct(RouteParser $parser = null)
-    {
-        $this->routeParser = $parser ?: new StdParser;
-    }
-
-    /**
-     * Set the base path used in pathFor()
-     *
-     * @param string $basePath
-     *
-     * @return self
-     */
-    public function setBasePath($basePath)
-    {
-        if (!is_string($basePath)) {
-            throw new InvalidArgumentException('Router basePath must be a string');
-        }
-
-        $this->basePath = $basePath;
-
-        return $this;
-    }
-
-    /**
-     * Set path to fast route cache file. If this is false then route caching is disabled.
-     *
-     * @param string|false $cacheFile
-     *
-     * @return self
-     */
-    public function setCacheFile($cacheFile)
-    {
-        if (!is_string($cacheFile) && $cacheFile !== false) {
-            throw new InvalidArgumentException('Router cacheFile must be a string or false');
-        }
-
-        $this->cacheFile = $cacheFile;
-
-        if ($cacheFile !== false && !is_writable(dirname($cacheFile))) {
-            throw new RuntimeException('Router cacheFile directory must be writable');
-        }
-
-
-        return $this;
-    }
-
-    /**
-     * @param ContainerInterface $container
-     */
-    public function setContainer(ContainerInterface $container)
-    {
-        $this->container = $container;
-    }
-
-    /**
-     * Add route
-     *
-     * @param  string[] $methods Array of HTTP methods
-     * @param  string   $pattern The route pattern
-     * @param  callable $handler The route callable
-     *
-     * @return RouteInterface
-     *
-     * @throws InvalidArgumentException if the route pattern isn't a string
-     */
-    public function map($methods, $pattern, $handler)
-    {
-        if (!is_string($pattern)) {
-            throw new InvalidArgumentException('Route pattern must be a string');
-        }
-
-        // Prepend parent group pattern(s)
-        if ($this->routeGroups) {
-            $pattern = $this->processGroups() . $pattern;
-        }
-
-        // According to RFC methods are defined in uppercase (See RFC 7231)
-        $methods = array_map("strtoupper", $methods);
-
-        // Add route
-        $route = $this->createRoute($methods, $pattern, $handler);
-        $this->routes[$route->getIdentifier()] = $route;
-        $this->routeCounter++;
-
-        return $route;
-    }
-
-    /**
-     * Dispatch router for HTTP request
-     *
-     * @param  ServerRequestInterface $request The current HTTP request object
-     *
-     * @return array
-     *
-     * @link   https://github.com/nikic/FastRoute/blob/master/src/Dispatcher.php
-     */
-    public function dispatch(ServerRequestInterface $request)
-    {
-        $uri = '/' . ltrim($request->getUri()->getPath(), '/');
-
-        return $this->createDispatcher()->dispatch(
-            $request->getMethod(),
-            $uri
-        );
-    }
-
-    /**
-     * Create a new Route object
-     *
-     * @param  string[] $methods Array of HTTP methods
-     * @param  string   $pattern The route pattern
-     * @param  callable $callable The route callable
-     *
-     * @return \Slim\Interfaces\RouteInterface
-     */
-    protected function createRoute($methods, $pattern, $callable)
-    {
-        $route = new Route($methods, $pattern, $callable, $this->routeGroups, $this->routeCounter);
-        if (!empty($this->container)) {
-            $route->setContainer($this->container);
-        }
-
-        return $route;
-    }
-
-    /**
-     * @return \FastRoute\Dispatcher
-     */
-    protected function createDispatcher()
-    {
-        if ($this->dispatcher) {
-            return $this->dispatcher;
-        }
-
-        $routeDefinitionCallback = function (RouteCollector $r) {
-            foreach ($this->getRoutes() as $route) {
-                $r->addRoute($route->getMethods(), $route->getPattern(), $route->getIdentifier());
-            }
-        };
-
-        if ($this->cacheFile) {
-            $this->dispatcher = \FastRoute\cachedDispatcher($routeDefinitionCallback, [
-                'routeParser' => $this->routeParser,
-                'cacheFile' => $this->cacheFile,
-            ]);
-        } else {
-            $this->dispatcher = \FastRoute\simpleDispatcher($routeDefinitionCallback, [
-                'routeParser' => $this->routeParser,
-            ]);
-        }
-
-        return $this->dispatcher;
-    }
-
-    /**
-     * @param \FastRoute\Dispatcher $dispatcher
-     */
-    public function setDispatcher(Dispatcher $dispatcher)
-    {
-        $this->dispatcher = $dispatcher;
-    }
-
-    /**
-     * Get route objects
-     *
-     * @return Route[]
-     */
-    public function getRoutes()
-    {
-        return $this->routes;
-    }
-
-    /**
-     * Get named route object
-     *
-     * @param string $name        Route name
-     *
-     * @return Route
-     *
-     * @throws RuntimeException   If named route does not exist
-     */
-    public function getNamedRoute($name)
-    {
-        foreach ($this->routes as $route) {
-            if ($name == $route->getName()) {
-                return $route;
-            }
-        }
-        throw new RuntimeException('Named route does not exist for name: ' . $name);
-    }
-
-    /**
-     * Remove named route
-     *
-     * @param string $name        Route name
-     *
-     * @throws RuntimeException   If named route does not exist
-     */
-    public function removeNamedRoute($name)
-    {
-        $route = $this->getNamedRoute($name);
-
-        // no exception, route exists, now remove by id
-        unset($this->routes[$route->getIdentifier()]);
-    }
-
-    /**
-     * Process route groups
-     *
-     * @return string A group pattern to prefix routes with
-     */
-    protected function processGroups()
-    {
-        $pattern = "";
-        foreach ($this->routeGroups as $group) {
-            $pattern .= $group->getPattern();
-        }
-        return $pattern;
-    }
-
-    /**
-     * Add a route group to the array
-     *
-     * @param string   $pattern
-     * @param callable $callable
-     *
-     * @return RouteGroupInterface
-     */
-    public function pushGroup($pattern, $callable)
-    {
-        $group = new RouteGroup($pattern, $callable);
-        array_push($this->routeGroups, $group);
-        return $group;
-    }
-
-    /**
-     * Removes the last route group from the array
-     *
-     * @return RouteGroup|bool The RouteGroup if successful, else False
-     */
-    public function popGroup()
-    {
-        $group = array_pop($this->routeGroups);
-        return $group instanceof RouteGroup ? $group : false;
-    }
-
-    /**
-     * @param $identifier
-     * @return \Slim\Interfaces\RouteInterface
-     */
-    public function lookupRoute($identifier)
-    {
-        if (!isset($this->routes[$identifier])) {
-            throw new RuntimeException('Route not found, looks like your route cache is stale.');
-        }
-        return $this->routes[$identifier];
-    }
-
-    /**
-     * Build the path for a named route excluding the base path
-     *
-     * @param string $name        Route name
-     * @param array  $data        Named argument replacement data
-     * @param array  $queryParams Optional query string parameters
-     *
-     * @return string
-     *
-     * @throws RuntimeException         If named route does not exist
-     * @throws InvalidArgumentException If required data not provided
-     */
-    public function relativePathFor($name, array $data = [], array $queryParams = [])
-    {
-        $route = $this->getNamedRoute($name);
-        $pattern = $route->getPattern();
-
-        $routeDatas = $this->routeParser->parse($pattern);
-        // $routeDatas is an array of all possible routes that can be made. There is
-        // one routedata for each optional parameter plus one for no optional parameters.
-        //
-        // The most specific is last, so we look for that first.
-        $routeDatas = array_reverse($routeDatas);
-
-        $segments = [];
-        foreach ($routeDatas as $routeData) {
-            foreach ($routeData as $item) {
-                if (is_string($item)) {
-                    // this segment is a static string
-                    $segments[] = $item;
-                    continue;
-                }
-
-                // This segment has a parameter: first element is the name
-                if (!array_key_exists($item[0], $data)) {
-                    // we don't have a data element for this segment: cancel
-                    // testing this routeData item, so that we can try a less
-                    // specific routeData item.
-                    $segments = [];
-                    $segmentName = $item[0];
-                    break;
-                }
-                $segments[] = $data[$item[0]];
-            }
-            if (!empty($segments)) {
-                // we found all the parameters for this route data, no need to check
-                // less specific ones
-                break;
-            }
-        }
-
-        if (empty($segments)) {
-            throw new InvalidArgumentException('Missing data for URL segment: ' . $segmentName);
-        }
-        $url = implode('', $segments);
-
-        if ($queryParams) {
-            $url .= '?' . http_build_query($queryParams);
-        }
-
-        return $url;
-    }
-
-
-    /**
-     * Build the path for a named route including the base path
-     *
-     * @param string $name        Route name
-     * @param array  $data        Named argument replacement data
-     * @param array  $queryParams Optional query string parameters
-     *
-     * @return string
-     *
-     * @throws RuntimeException         If named route does not exist
-     * @throws InvalidArgumentException If required data not provided
-     */
-    public function pathFor($name, array $data = [], array $queryParams = [])
-    {
-        $url = $this->relativePathFor($name, $data, $queryParams);
-
-        if ($this->basePath) {
-            $url = $this->basePath . $url;
-        }
-
-        return $url;
-    }
-
-    /**
-     * Build the path for a named route.
-     *
-     * This method is deprecated. Use pathFor() from now on.
-     *
-     * @param string $name        Route name
-     * @param array  $data        Named argument replacement data
-     * @param array  $queryParams Optional query string parameters
-     *
-     * @return string
-     *
-     * @throws RuntimeException         If named route does not exist
-     * @throws InvalidArgumentException If required data not provided
-     */
-    public function urlFor($name, array $data = [], array $queryParams = [])
-    {
-        trigger_error('urlFor() is deprecated. Use pathFor() instead.', E_USER_DEPRECATED);
-        return $this->pathFor($name, $data, $queryParams);
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/Dispatcher.php b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/Dispatcher.php
new file mode 100644
index 00000000..e33eac39
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/Dispatcher.php
@@ -0,0 +1,78 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Slim\Routing;
+
+use FastRoute\DataGenerator\GroupCountBased;
+use FastRoute\RouteCollector as FastRouteCollector;
+use FastRoute\RouteParser\Std;
+use Slim\Interfaces\DispatcherInterface;
+use Slim\Interfaces\RouteCollectorInterface;
+
+class Dispatcher implements DispatcherInterface
+{
+    private RouteCollectorInterface $routeCollector;
+
+    private ?FastRouteDispatcher $dispatcher = null;
+
+    public function __construct(RouteCollectorInterface $routeCollector)
+    {
+        $this->routeCollector = $routeCollector;
+    }
+
+    protected function createDispatcher(): FastRouteDispatcher
+    {
+        if ($this->dispatcher) {
+            return $this->dispatcher;
+        }
+
+        $routeDefinitionCallback = function (FastRouteCollector $r): void {
+            $basePath = $this->routeCollector->getBasePath();
+
+            foreach ($this->routeCollector->getRoutes() as $route) {
+                $r->addRoute($route->getMethods(), $basePath . $route->getPattern(), $route->getIdentifier());
+            }
+        };
+
+        $cacheFile = $this->routeCollector->getCacheFile();
+        if ($cacheFile) {
+            /** @var FastRouteDispatcher $dispatcher */
+            $dispatcher = \FastRoute\cachedDispatcher($routeDefinitionCallback, [
+                'dataGenerator' => GroupCountBased::class,
+                'dispatcher' => FastRouteDispatcher::class,
+                'routeParser' => new Std(),
+                'cacheFile' => $cacheFile,
+            ]);
+        } else {
+            /** @var FastRouteDispatcher $dispatcher */
+            $dispatcher = \FastRoute\simpleDispatcher($routeDefinitionCallback, [
+                'dataGenerator' => GroupCountBased::class,
+                'dispatcher' => FastRouteDispatcher::class,
+                'routeParser' => new Std(),
+            ]);
+        }
+
+        $this->dispatcher = $dispatcher;
+        return $this->dispatcher;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function dispatch(string $method, string $uri): RoutingResults
+    {
+        $dispatcher = $this->createDispatcher();
+        $results = $dispatcher->dispatch($method, $uri);
+        return new RoutingResults($this, $method, $uri, $results[0], $results[1], $results[2]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAllowedMethods(string $uri): array
+    {
+        $dispatcher = $this->createDispatcher();
+        return $dispatcher->getAllowedMethods($uri);
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/FastRouteDispatcher.php b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/FastRouteDispatcher.php
new file mode 100644
index 00000000..797746bb
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/FastRouteDispatcher.php
@@ -0,0 +1,109 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Routing;
+
+use FastRoute\Dispatcher\GroupCountBased;
+
+class FastRouteDispatcher extends GroupCountBased
+{
+    /**
+     * @var string[][]
+     */
+    private array $allowedMethods = [];
+
+    /**
+     * @param string $httpMethod
+     * @param string $uri
+     *
+     * @return array{int, string|null, array<string, string>}
+     */
+    public function dispatch($httpMethod, $uri): array
+    {
+        $routingResults = $this->routingResults($httpMethod, $uri);
+        if ($routingResults[0] === self::FOUND) {
+            return $routingResults;
+        }
+
+        // For HEAD requests, attempt fallback to GET
+        if ($httpMethod === 'HEAD') {
+            $routingResults = $this->routingResults('GET', $uri);
+            if ($routingResults[0] === self::FOUND) {
+                return $routingResults;
+            }
+        }
+
+        // If nothing else matches, try fallback routes
+        $routingResults = $this->routingResults('*', $uri);
+        if ($routingResults[0] === self::FOUND) {
+            return $routingResults;
+        }
+
+        if (!empty($this->getAllowedMethods($uri))) {
+            return [self::METHOD_NOT_ALLOWED, null, []];
+        }
+
+        return [self::NOT_FOUND, null, []];
+    }
+
+    /**
+     * @param string $httpMethod
+     * @param string $uri
+     *
+     * @return array{int, string|null, array<string, string>}
+     */
+    private function routingResults(string $httpMethod, string $uri): array
+    {
+        if (isset($this->staticRouteMap[$httpMethod][$uri])) {
+            /** @var string $routeIdentifier */
+            $routeIdentifier = $this->staticRouteMap[$httpMethod][$uri];
+            return [self::FOUND, $routeIdentifier, []];
+        }
+
+        if (isset($this->variableRouteData[$httpMethod])) {
+            /** @var array{0: int, 1?: string, 2?: array<string, string>} $result */
+            $result = $this->dispatchVariableRoute($this->variableRouteData[$httpMethod], $uri);
+            if ($result[0] === self::FOUND) {
+                /** @var array{int, string, array<string, string>} $result */
+                return [self::FOUND, $result[1], $result[2]];
+            }
+        }
+
+        return [self::NOT_FOUND, null, []];
+    }
+
+    /**
+     * @param string $uri
+     *
+     * @return string[]
+     */
+    public function getAllowedMethods(string $uri): array
+    {
+        if (isset($this->allowedMethods[$uri])) {
+            return $this->allowedMethods[$uri];
+        }
+
+        $allowedMethods = [];
+        foreach ($this->staticRouteMap as $method => $uriMap) {
+            if (isset($uriMap[$uri])) {
+                $allowedMethods[$method] = true;
+            }
+        }
+
+        foreach ($this->variableRouteData as $method => $routeData) {
+            $result = $this->dispatchVariableRoute($routeData, $uri);
+            if ($result[0] === self::FOUND) {
+                $allowedMethods[$method] = true;
+            }
+        }
+
+        return $this->allowedMethods[$uri] = array_keys($allowedMethods);
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/Route.php b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/Route.php
new file mode 100644
index 00000000..2cd9fa56
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/Route.php
@@ -0,0 +1,360 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Routing;
+
+use Psr\Container\ContainerInterface;
+use Psr\Http\Message\ResponseFactoryInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use Slim\Handlers\Strategies\RequestHandler;
+use Slim\Handlers\Strategies\RequestResponse;
+use Slim\Interfaces\AdvancedCallableResolverInterface;
+use Slim\Interfaces\CallableResolverInterface;
+use Slim\Interfaces\InvocationStrategyInterface;
+use Slim\Interfaces\RequestHandlerInvocationStrategyInterface;
+use Slim\Interfaces\RouteGroupInterface;
+use Slim\Interfaces\RouteInterface;
+use Slim\MiddlewareDispatcher;
+
+use function array_key_exists;
+use function array_replace;
+use function array_reverse;
+use function class_implements;
+use function in_array;
+use function is_array;
+
+class Route implements RouteInterface, RequestHandlerInterface
+{
+    /**
+     * HTTP methods supported by this route
+     *
+     * @var string[]
+     */
+    protected array $methods = [];
+
+    /**
+     * Route identifier
+     */
+    protected string $identifier;
+
+    /**
+     * Route name
+     */
+    protected ?string $name = null;
+
+    /**
+     * Parent route groups
+     *
+     * @var RouteGroupInterface[]
+     */
+    protected array $groups;
+
+    protected InvocationStrategyInterface $invocationStrategy;
+
+    /**
+     * Route parameters
+     *
+     * @var array<string, string>
+     */
+    protected array $arguments = [];
+
+    /**
+     * Route arguments parameters
+     *
+     * @var string[]
+     */
+    protected array $savedArguments = [];
+
+    /**
+     * Container
+     */
+    protected ?ContainerInterface $container = null;
+
+    protected MiddlewareDispatcher $middlewareDispatcher;
+
+    /**
+     * Route callable
+     *
+     * @var callable|string
+     */
+    protected $callable;
+
+    protected CallableResolverInterface $callableResolver;
+
+    protected ResponseFactoryInterface $responseFactory;
+
+    /**
+     * Route pattern
+     */
+    protected string $pattern;
+
+    protected bool $groupMiddlewareAppended = false;
+
+    /**
+     * @param string[]                         $methods    The route HTTP methods
+     * @param string                           $pattern    The route pattern
+     * @param callable|string                  $callable   The route callable
+     * @param ResponseFactoryInterface         $responseFactory
+     * @param CallableResolverInterface        $callableResolver
+     * @param ContainerInterface|null          $container
+     * @param InvocationStrategyInterface|null $invocationStrategy
+     * @param RouteGroupInterface[]            $groups     The parent route groups
+     * @param int                              $identifier The route identifier
+     */
+    public function __construct(
+        array $methods,
+        string $pattern,
+        $callable,
+        ResponseFactoryInterface $responseFactory,
+        CallableResolverInterface $callableResolver,
+        ?ContainerInterface $container = null,
+        ?InvocationStrategyInterface $invocationStrategy = null,
+        array $groups = [],
+        int $identifier = 0
+    ) {
+        $this->methods = $methods;
+        $this->pattern = $pattern;
+        $this->callable = $callable;
+        $this->responseFactory = $responseFactory;
+        $this->callableResolver = $callableResolver;
+        $this->container = $container;
+        $this->invocationStrategy = $invocationStrategy ?? new RequestResponse();
+        $this->groups = $groups;
+        $this->identifier = 'route' . $identifier;
+        $this->middlewareDispatcher = new MiddlewareDispatcher($this, $callableResolver, $container);
+    }
+
+    public function getCallableResolver(): CallableResolverInterface
+    {
+        return $this->callableResolver;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getInvocationStrategy(): InvocationStrategyInterface
+    {
+        return $this->invocationStrategy;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setInvocationStrategy(InvocationStrategyInterface $invocationStrategy): RouteInterface
+    {
+        $this->invocationStrategy = $invocationStrategy;
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMethods(): array
+    {
+        return $this->methods;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getPattern(): string
+    {
+        return $this->pattern;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setPattern(string $pattern): RouteInterface
+    {
+        $this->pattern = $pattern;
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getCallable()
+    {
+        return $this->callable;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setCallable($callable): RouteInterface
+    {
+        $this->callable = $callable;
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName(): ?string
+    {
+        return $this->name;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setName(string $name): RouteInterface
+    {
+        $this->name = $name;
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getIdentifier(): string
+    {
+        return $this->identifier;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getArgument(string $name, ?string $default = null): ?string
+    {
+        if (array_key_exists($name, $this->arguments)) {
+            return $this->arguments[$name];
+        }
+        return $default;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getArguments(): array
+    {
+        return $this->arguments;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments, bool $includeInSavedArguments = true): RouteInterface
+    {
+        if ($includeInSavedArguments) {
+            $this->savedArguments = $arguments;
+        }
+
+        $this->arguments = $arguments;
+        return $this;
+    }
+
+    /**
+     * @return RouteGroupInterface[]
+     */
+    public function getGroups(): array
+    {
+        return $this->groups;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function add($middleware): RouteInterface
+    {
+        $this->middlewareDispatcher->add($middleware);
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addMiddleware(MiddlewareInterface $middleware): RouteInterface
+    {
+        $this->middlewareDispatcher->addMiddleware($middleware);
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function prepare(array $arguments): RouteInterface
+    {
+        $this->arguments = array_replace($this->savedArguments, $arguments);
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArgument(string $name, string $value, bool $includeInSavedArguments = true): RouteInterface
+    {
+        if ($includeInSavedArguments) {
+            $this->savedArguments[$name] = $value;
+        }
+
+        $this->arguments[$name] = $value;
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function run(ServerRequestInterface $request): ResponseInterface
+    {
+        if (!$this->groupMiddlewareAppended) {
+            $this->appendGroupMiddlewareToRoute();
+        }
+
+        return $this->middlewareDispatcher->handle($request);
+    }
+
+    /**
+     * @return void
+     */
+    protected function appendGroupMiddlewareToRoute(): void
+    {
+        $inner = $this->middlewareDispatcher;
+        $this->middlewareDispatcher = new MiddlewareDispatcher($inner, $this->callableResolver, $this->container);
+
+        /** @var RouteGroupInterface $group */
+        foreach (array_reverse($this->groups) as $group) {
+            $group->appendMiddlewareToDispatcher($this->middlewareDispatcher);
+        }
+
+        $this->groupMiddlewareAppended = true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function handle(ServerRequestInterface $request): ResponseInterface
+    {
+        if ($this->callableResolver instanceof AdvancedCallableResolverInterface) {
+            $callable = $this->callableResolver->resolveRoute($this->callable);
+        } else {
+            $callable = $this->callableResolver->resolve($this->callable);
+        }
+        $strategy = $this->invocationStrategy;
+
+        /** @var string[] $strategyImplements */
+        $strategyImplements = class_implements($strategy);
+
+        if (
+            is_array($callable)
+            && $callable[0] instanceof RequestHandlerInterface
+            && !in_array(RequestHandlerInvocationStrategyInterface::class, $strategyImplements)
+        ) {
+            $strategy = new RequestHandler();
+        }
+
+        $response = $this->responseFactory->createResponse();
+        return $strategy($callable, $request, $response, $this->arguments);
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteCollector.php b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteCollector.php
new file mode 100644
index 00000000..61b45030
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteCollector.php
@@ -0,0 +1,293 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Routing;
+
+use Psr\Container\ContainerInterface;
+use Psr\Http\Message\ResponseFactoryInterface;
+use RuntimeException;
+use Slim\Handlers\Strategies\RequestResponse;
+use Slim\Interfaces\CallableResolverInterface;
+use Slim\Interfaces\InvocationStrategyInterface;
+use Slim\Interfaces\RouteCollectorInterface;
+use Slim\Interfaces\RouteCollectorProxyInterface;
+use Slim\Interfaces\RouteGroupInterface;
+use Slim\Interfaces\RouteInterface;
+use Slim\Interfaces\RouteParserInterface;
+
+use function array_pop;
+use function dirname;
+use function file_exists;
+use function sprintf;
+use function is_readable;
+use function is_writable;
+
+/**
+ * RouteCollector is used to collect routes and route groups
+ * as well as generate paths and URLs relative to its environment
+ */
+class RouteCollector implements RouteCollectorInterface
+{
+    protected RouteParserInterface $routeParser;
+
+    protected CallableResolverInterface $callableResolver;
+
+    protected ?ContainerInterface $container = null;
+
+    protected InvocationStrategyInterface $defaultInvocationStrategy;
+
+    /**
+     * Base path used in pathFor()
+     */
+    protected string $basePath = '';
+
+    /**
+     * Path to fast route cache file. Set to null to disable route caching
+     */
+    protected ?string $cacheFile = null;
+
+    /**
+     * Routes
+     *
+     * @var RouteInterface[]
+     */
+    protected array $routes = [];
+
+    /**
+     * Routes indexed by name
+     *
+     * @var RouteInterface[]
+     */
+    protected array $routesByName = [];
+
+    /**
+     * Route groups
+     *
+     * @var RouteGroupInterface[]
+     */
+    protected array $routeGroups = [];
+
+    /**
+     * Route counter incrementer
+     */
+    protected int $routeCounter = 0;
+
+    protected ResponseFactoryInterface $responseFactory;
+
+    public function __construct(
+        ResponseFactoryInterface $responseFactory,
+        CallableResolverInterface $callableResolver,
+        ?ContainerInterface $container = null,
+        ?InvocationStrategyInterface $defaultInvocationStrategy = null,
+        ?RouteParserInterface $routeParser = null,
+        ?string $cacheFile = null
+    ) {
+        $this->responseFactory = $responseFactory;
+        $this->callableResolver = $callableResolver;
+        $this->container = $container;
+        $this->defaultInvocationStrategy = $defaultInvocationStrategy ?? new RequestResponse();
+        $this->routeParser = $routeParser ?? new RouteParser($this);
+
+        if ($cacheFile) {
+            $this->setCacheFile($cacheFile);
+        }
+    }
+
+    public function getRouteParser(): RouteParserInterface
+    {
+        return $this->routeParser;
+    }
+
+    /**
+     * Get default route invocation strategy
+     */
+    public function getDefaultInvocationStrategy(): InvocationStrategyInterface
+    {
+        return $this->defaultInvocationStrategy;
+    }
+
+    public function setDefaultInvocationStrategy(InvocationStrategyInterface $strategy): RouteCollectorInterface
+    {
+        $this->defaultInvocationStrategy = $strategy;
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getCacheFile(): ?string
+    {
+        return $this->cacheFile;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setCacheFile(string $cacheFile): RouteCollectorInterface
+    {
+        if (file_exists($cacheFile) && !is_readable($cacheFile)) {
+            throw new RuntimeException(
+                sprintf('Route collector cache file `%s` is not readable', $cacheFile)
+            );
+        }
+
+        if (!file_exists($cacheFile) && !is_writable(dirname($cacheFile))) {
+            throw new RuntimeException(
+                sprintf('Route collector cache file directory `%s` is not writable', dirname($cacheFile))
+            );
+        }
+
+        $this->cacheFile = $cacheFile;
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getBasePath(): string
+    {
+        return $this->basePath;
+    }
+
+    /**
+     * Set the base path used in urlFor()
+     */
+    public function setBasePath(string $basePath): RouteCollectorInterface
+    {
+        $this->basePath = $basePath;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getRoutes(): array
+    {
+        return $this->routes;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function removeNamedRoute(string $name): RouteCollectorInterface
+    {
+        $route = $this->getNamedRoute($name);
+
+        unset($this->routesByName[$route->getName()], $this->routes[$route->getIdentifier()]);
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getNamedRoute(string $name): RouteInterface
+    {
+        if (isset($this->routesByName[$name])) {
+            $route = $this->routesByName[$name];
+            if ($route->getName() === $name) {
+                return $route;
+            }
+
+            unset($this->routesByName[$name]);
+        }
+
+        foreach ($this->routes as $route) {
+            if ($name === $route->getName()) {
+                $this->routesByName[$name] = $route;
+                return $route;
+            }
+        }
+
+        throw new RuntimeException('Named route does not exist for name: ' . $name);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function lookupRoute(string $identifier): RouteInterface
+    {
+        if (!isset($this->routes[$identifier])) {
+            throw new RuntimeException('Route not found, looks like your route cache is stale.');
+        }
+        return $this->routes[$identifier];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function group(string $pattern, $callable): RouteGroupInterface
+    {
+        $routeGroup = $this->createGroup($pattern, $callable);
+        $this->routeGroups[] = $routeGroup;
+
+        $routeGroup->collectRoutes();
+        array_pop($this->routeGroups);
+
+        return $routeGroup;
+    }
+
+    /**
+     * @param string|callable $callable
+     */
+    protected function createGroup(string $pattern, $callable): RouteGroupInterface
+    {
+        $routeCollectorProxy = $this->createProxy($pattern);
+        return new RouteGroup($pattern, $callable, $this->callableResolver, $routeCollectorProxy);
+    }
+
+    protected function createProxy(string $pattern): RouteCollectorProxyInterface
+    {
+        return new RouteCollectorProxy(
+            $this->responseFactory,
+            $this->callableResolver,
+            $this->container,
+            $this,
+            $pattern
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function map(array $methods, string $pattern, $handler): RouteInterface
+    {
+        $route = $this->createRoute($methods, $pattern, $handler);
+        $this->routes[$route->getIdentifier()] = $route;
+
+        $routeName = $route->getName();
+        if ($routeName !== null && !isset($this->routesByName[$routeName])) {
+            $this->routesByName[$routeName] = $route;
+        }
+
+        $this->routeCounter++;
+
+        return $route;
+    }
+
+    /**
+     * @param string[]        $methods
+     * @param callable|string $callable
+     */
+    protected function createRoute(array $methods, string $pattern, $callable): RouteInterface
+    {
+        return new Route(
+            $methods,
+            $pattern,
+            $callable,
+            $this->responseFactory,
+            $this->callableResolver,
+            $this->container,
+            $this->defaultInvocationStrategy,
+            $this->routeGroups,
+            $this->routeCounter
+        );
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteCollectorProxy.php b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteCollectorProxy.php
new file mode 100644
index 00000000..f8bc232b
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteCollectorProxy.php
@@ -0,0 +1,187 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Routing;
+
+use Psr\Container\ContainerInterface;
+use Psr\Http\Message\ResponseFactoryInterface;
+use Slim\Interfaces\CallableResolverInterface;
+use Slim\Interfaces\RouteCollectorInterface;
+use Slim\Interfaces\RouteCollectorProxyInterface;
+use Slim\Interfaces\RouteGroupInterface;
+use Slim\Interfaces\RouteInterface;
+
+class RouteCollectorProxy implements RouteCollectorProxyInterface
+{
+    protected ResponseFactoryInterface $responseFactory;
+
+    protected CallableResolverInterface $callableResolver;
+
+    protected ?ContainerInterface $container = null;
+
+    protected RouteCollectorInterface $routeCollector;
+
+    protected string $groupPattern;
+
+    public function __construct(
+        ResponseFactoryInterface $responseFactory,
+        CallableResolverInterface $callableResolver,
+        ?ContainerInterface $container = null,
+        ?RouteCollectorInterface $routeCollector = null,
+        string $groupPattern = ''
+    ) {
+        $this->responseFactory = $responseFactory;
+        $this->callableResolver = $callableResolver;
+        $this->container = $container;
+        $this->routeCollector = $routeCollector ?? new RouteCollector($responseFactory, $callableResolver, $container);
+        $this->groupPattern = $groupPattern;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getResponseFactory(): ResponseFactoryInterface
+    {
+        return $this->responseFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getCallableResolver(): CallableResolverInterface
+    {
+        return $this->callableResolver;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getContainer(): ?ContainerInterface
+    {
+        return $this->container;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getRouteCollector(): RouteCollectorInterface
+    {
+        return $this->routeCollector;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getBasePath(): string
+    {
+        return $this->routeCollector->getBasePath();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setBasePath(string $basePath): RouteCollectorProxyInterface
+    {
+        $this->routeCollector->setBasePath($basePath);
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get(string $pattern, $callable): RouteInterface
+    {
+        return $this->map(['GET'], $pattern, $callable);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function post(string $pattern, $callable): RouteInterface
+    {
+        return $this->map(['POST'], $pattern, $callable);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function put(string $pattern, $callable): RouteInterface
+    {
+        return $this->map(['PUT'], $pattern, $callable);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function patch(string $pattern, $callable): RouteInterface
+    {
+        return $this->map(['PATCH'], $pattern, $callable);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function delete(string $pattern, $callable): RouteInterface
+    {
+        return $this->map(['DELETE'], $pattern, $callable);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function options(string $pattern, $callable): RouteInterface
+    {
+        return $this->map(['OPTIONS'], $pattern, $callable);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function any(string $pattern, $callable): RouteInterface
+    {
+        return $this->map(['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'], $pattern, $callable);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function map(array $methods, string $pattern, $callable): RouteInterface
+    {
+        $pattern = $this->groupPattern . $pattern;
+
+        return $this->routeCollector->map($methods, $pattern, $callable);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function group(string $pattern, $callable): RouteGroupInterface
+    {
+        $pattern = $this->groupPattern . $pattern;
+
+        return $this->routeCollector->group($pattern, $callable);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function redirect(string $from, $to, int $status = 302): RouteInterface
+    {
+        $responseFactory = $this->responseFactory;
+
+        $handler = function () use ($to, $status, $responseFactory) {
+            $response = $responseFactory->createResponse($status);
+            return $response->withHeader('Location', (string) $to);
+        };
+
+        return $this->get($from, $handler);
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteContext.php b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteContext.php
new file mode 100644
index 00000000..3ba5e23a
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteContext.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Routing;
+
+use Psr\Http\Message\ServerRequestInterface;
+use RuntimeException;
+use Slim\Interfaces\RouteInterface;
+use Slim\Interfaces\RouteParserInterface;
+
+final class RouteContext
+{
+    public const ROUTE = '__route__';
+
+    public const ROUTE_PARSER = '__routeParser__';
+
+    public const ROUTING_RESULTS = '__routingResults__';
+
+    public const BASE_PATH = '__basePath__';
+
+    public static function fromRequest(ServerRequestInterface $serverRequest): self
+    {
+        $route = $serverRequest->getAttribute(self::ROUTE);
+        $routeParser = $serverRequest->getAttribute(self::ROUTE_PARSER);
+        $routingResults = $serverRequest->getAttribute(self::ROUTING_RESULTS);
+        $basePath = $serverRequest->getAttribute(self::BASE_PATH);
+
+        if ($routeParser === null || $routingResults === null) {
+            throw new RuntimeException('Cannot create RouteContext before routing has been completed');
+        }
+
+        /** @var RouteInterface|null $route */
+        /** @var RouteParserInterface $routeParser */
+        /** @var RoutingResults $routingResults */
+        /** @var string|null $basePath */
+        return new self($route, $routeParser, $routingResults, $basePath);
+    }
+
+    private ?RouteInterface $route;
+
+    private RouteParserInterface $routeParser;
+
+    private RoutingResults $routingResults;
+
+    private ?string $basePath;
+
+    private function __construct(
+        ?RouteInterface $route,
+        RouteParserInterface $routeParser,
+        RoutingResults $routingResults,
+        ?string $basePath = null
+    ) {
+        $this->route = $route;
+        $this->routeParser = $routeParser;
+        $this->routingResults = $routingResults;
+        $this->basePath = $basePath;
+    }
+
+    public function getRoute(): ?RouteInterface
+    {
+        return $this->route;
+    }
+
+    public function getRouteParser(): RouteParserInterface
+    {
+        return $this->routeParser;
+    }
+
+    public function getRoutingResults(): RoutingResults
+    {
+        return $this->routingResults;
+    }
+
+    public function getBasePath(): string
+    {
+        if ($this->basePath === null) {
+            throw new RuntimeException('No base path defined.');
+        }
+        return $this->basePath;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteGroup.php b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteGroup.php
new file mode 100644
index 00000000..cd2f4e79
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteGroup.php
@@ -0,0 +1,104 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Routing;
+
+use Psr\Http\Server\MiddlewareInterface;
+use Slim\Interfaces\AdvancedCallableResolverInterface;
+use Slim\Interfaces\CallableResolverInterface;
+use Slim\Interfaces\RouteCollectorProxyInterface;
+use Slim\Interfaces\RouteGroupInterface;
+use Slim\MiddlewareDispatcher;
+
+class RouteGroup implements RouteGroupInterface
+{
+    /**
+     * @var callable|string
+     */
+    protected $callable;
+
+    protected CallableResolverInterface $callableResolver;
+
+    protected RouteCollectorProxyInterface $routeCollectorProxy;
+
+    /**
+     * @var MiddlewareInterface[]|string[]|callable[]
+     */
+    protected array $middleware = [];
+
+    protected string $pattern;
+
+    /**
+     * @param callable|string              $callable
+     */
+    public function __construct(
+        string $pattern,
+        $callable,
+        CallableResolverInterface $callableResolver,
+        RouteCollectorProxyInterface $routeCollectorProxy
+    ) {
+        $this->pattern = $pattern;
+        $this->callable = $callable;
+        $this->callableResolver = $callableResolver;
+        $this->routeCollectorProxy = $routeCollectorProxy;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function collectRoutes(): RouteGroupInterface
+    {
+        if ($this->callableResolver instanceof AdvancedCallableResolverInterface) {
+            $callable = $this->callableResolver->resolveRoute($this->callable);
+        } else {
+            $callable = $this->callableResolver->resolve($this->callable);
+        }
+        $callable($this->routeCollectorProxy);
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function add($middleware): RouteGroupInterface
+    {
+        $this->middleware[] = $middleware;
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addMiddleware(MiddlewareInterface $middleware): RouteGroupInterface
+    {
+        $this->middleware[] = $middleware;
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function appendMiddlewareToDispatcher(MiddlewareDispatcher $dispatcher): RouteGroupInterface
+    {
+        foreach ($this->middleware as $middleware) {
+            $dispatcher->add($middleware);
+        }
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getPattern(): string
+    {
+        return $this->pattern;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteParser.php b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteParser.php
new file mode 100644
index 00000000..afb533cc
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteParser.php
@@ -0,0 +1,127 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Routing;
+
+use FastRoute\RouteParser\Std;
+use InvalidArgumentException;
+use Psr\Http\Message\UriInterface;
+use Slim\Interfaces\RouteCollectorInterface;
+use Slim\Interfaces\RouteParserInterface;
+
+use function array_key_exists;
+use function array_reverse;
+use function http_build_query;
+use function implode;
+use function is_string;
+
+class RouteParser implements RouteParserInterface
+{
+    private RouteCollectorInterface $routeCollector;
+
+    private Std $routeParser;
+
+    public function __construct(RouteCollectorInterface $routeCollector)
+    {
+        $this->routeCollector = $routeCollector;
+        $this->routeParser = new Std();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function relativeUrlFor(string $routeName, array $data = [], array $queryParams = []): string
+    {
+        $route = $this->routeCollector->getNamedRoute($routeName);
+        $pattern = $route->getPattern();
+
+        $segments = [];
+        $segmentName = '';
+
+        /*
+         * $routes is an associative array of expressions representing a route as multiple segments
+         * There is an expression for each optional parameter plus one without the optional parameters
+         * The most specific is last, hence why we reverse the array before iterating over it
+         */
+        $expressions = array_reverse($this->routeParser->parse($pattern));
+        foreach ($expressions as $expression) {
+            foreach ($expression as $segment) {
+                /*
+                 * Each $segment is either a string or an array of strings
+                 * containing optional parameters of an expression
+                 */
+                if (is_string($segment)) {
+                    $segments[] = $segment;
+                    continue;
+                }
+
+                /** @var string[] $segment */
+                /*
+                 * If we don't have a data element for this segment in the provided $data
+                 * we cancel testing to move onto the next expression with a less specific item
+                 */
+                if (!array_key_exists($segment[0], $data)) {
+                    $segments = [];
+                    $segmentName = $segment[0];
+                    break;
+                }
+
+                $segments[] = $data[$segment[0]];
+            }
+
+            /*
+             * If we get to this logic block we have found all the parameters
+             * for the provided $data which means we don't need to continue testing
+             * less specific expressions
+             */
+            if (!empty($segments)) {
+                break;
+            }
+        }
+
+        if (empty($segments)) {
+            throw new InvalidArgumentException('Missing data for URL segment: ' . $segmentName);
+        }
+
+        $url = implode('', $segments);
+        if ($queryParams) {
+            $url .= '?' . http_build_query($queryParams);
+        }
+
+        return $url;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function urlFor(string $routeName, array $data = [], array $queryParams = []): string
+    {
+        $basePath = $this->routeCollector->getBasePath();
+        $url = $this->relativeUrlFor($routeName, $data, $queryParams);
+
+        if ($basePath) {
+            $url = $basePath . $url;
+        }
+
+        return $url;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function fullUrlFor(UriInterface $uri, string $routeName, array $data = [], array $queryParams = []): string
+    {
+        $path = $this->urlFor($routeName, $data, $queryParams);
+        $scheme = $uri->getScheme();
+        $authority = $uri->getAuthority();
+        $protocol = ($scheme ? $scheme . ':' : '') . ($authority ? '//' . $authority : '');
+        return $protocol . $path;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteResolver.php b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteResolver.php
new file mode 100644
index 00000000..d4f4eafa
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteResolver.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Routing;
+
+use RuntimeException;
+use Slim\Interfaces\DispatcherInterface;
+use Slim\Interfaces\RouteCollectorInterface;
+use Slim\Interfaces\RouteInterface;
+use Slim\Interfaces\RouteResolverInterface;
+
+use function rawurldecode;
+
+/**
+ * RouteResolver instantiates the FastRoute dispatcher
+ * and computes the routing results of a given URI and request method
+ */
+class RouteResolver implements RouteResolverInterface
+{
+    protected RouteCollectorInterface $routeCollector;
+
+    private DispatcherInterface $dispatcher;
+
+    public function __construct(RouteCollectorInterface $routeCollector, ?DispatcherInterface $dispatcher = null)
+    {
+        $this->routeCollector = $routeCollector;
+        $this->dispatcher = $dispatcher ?? new Dispatcher($routeCollector);
+    }
+
+    /**
+     * @param string $uri Should be $request->getUri()->getPath()
+     */
+    public function computeRoutingResults(string $uri, string $method): RoutingResults
+    {
+        $uri = rawurldecode($uri);
+        if ($uri === '' || $uri[0] !== '/') {
+            $uri = '/' . $uri;
+        }
+        return $this->dispatcher->dispatch($method, $uri);
+    }
+
+    /**
+     * @throws RuntimeException
+     */
+    public function resolveRoute(string $identifier): RouteInterface
+    {
+        return $this->routeCollector->lookupRoute($identifier);
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteRunner.php b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteRunner.php
new file mode 100644
index 00000000..40946af5
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteRunner.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Routing;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use Slim\Exception\HttpMethodNotAllowedException;
+use Slim\Exception\HttpNotFoundException;
+use Slim\Interfaces\RouteCollectorProxyInterface;
+use Slim\Interfaces\RouteParserInterface;
+use Slim\Interfaces\RouteResolverInterface;
+use Slim\Middleware\RoutingMiddleware;
+
+class RouteRunner implements RequestHandlerInterface
+{
+    private RouteResolverInterface $routeResolver;
+
+    private RouteParserInterface $routeParser;
+
+    private ?RouteCollectorProxyInterface $routeCollectorProxy;
+
+    public function __construct(
+        RouteResolverInterface $routeResolver,
+        RouteParserInterface $routeParser,
+        ?RouteCollectorProxyInterface $routeCollectorProxy = null
+    ) {
+        $this->routeResolver = $routeResolver;
+        $this->routeParser = $routeParser;
+        $this->routeCollectorProxy = $routeCollectorProxy;
+    }
+
+    /**
+     * This request handler is instantiated automatically in App::__construct()
+     * It is at the very tip of the middleware queue meaning it will be executed
+     * last and it detects whether or not routing has been performed in the user
+     * defined middleware stack. In the event that the user did not perform routing
+     * it is done here
+     *
+     * @throws HttpNotFoundException
+     * @throws HttpMethodNotAllowedException
+     */
+    public function handle(ServerRequestInterface $request): ResponseInterface
+    {
+        // If routing hasn't been done, then do it now so we can dispatch
+        if ($request->getAttribute(RouteContext::ROUTING_RESULTS) === null) {
+            $routingMiddleware = new RoutingMiddleware($this->routeResolver, $this->routeParser);
+            $request = $routingMiddleware->performRouting($request);
+        }
+
+        if ($this->routeCollectorProxy !== null) {
+            $request = $request->withAttribute(
+                RouteContext::BASE_PATH,
+                $this->routeCollectorProxy->getBasePath()
+            );
+        }
+
+        /** @var Route $route */
+        $route = $request->getAttribute(RouteContext::ROUTE);
+        return $route->run($request);
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RoutingResults.php b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RoutingResults.php
new file mode 100644
index 00000000..ac2fa64f
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RoutingResults.php
@@ -0,0 +1,112 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Routing;
+
+use Slim\Interfaces\DispatcherInterface;
+
+use function rawurldecode;
+
+class RoutingResults
+{
+    public const NOT_FOUND = 0;
+    public const FOUND = 1;
+    public const METHOD_NOT_ALLOWED = 2;
+
+    protected DispatcherInterface $dispatcher;
+
+    protected string $method;
+
+    protected string $uri;
+
+    /**
+     * The status is one of the constants shown above
+     * NOT_FOUND = 0
+     * FOUND = 1
+     * METHOD_NOT_ALLOWED = 2
+     */
+    protected int $routeStatus;
+
+    protected ?string $routeIdentifier = null;
+
+    /**
+     * @var array<string, string>
+     */
+    protected array $routeArguments;
+
+    /**
+     * @param array<string, string> $routeArguments
+     */
+    public function __construct(
+        DispatcherInterface $dispatcher,
+        string $method,
+        string $uri,
+        int $routeStatus,
+        ?string $routeIdentifier = null,
+        array $routeArguments = []
+    ) {
+        $this->dispatcher = $dispatcher;
+        $this->method = $method;
+        $this->uri = $uri;
+        $this->routeStatus = $routeStatus;
+        $this->routeIdentifier = $routeIdentifier;
+        $this->routeArguments = $routeArguments;
+    }
+
+    public function getDispatcher(): DispatcherInterface
+    {
+        return $this->dispatcher;
+    }
+
+    public function getMethod(): string
+    {
+        return $this->method;
+    }
+
+    public function getUri(): string
+    {
+        return $this->uri;
+    }
+
+    public function getRouteStatus(): int
+    {
+        return $this->routeStatus;
+    }
+
+    public function getRouteIdentifier(): ?string
+    {
+        return $this->routeIdentifier;
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    public function getRouteArguments(bool $urlDecode = true): array
+    {
+        if (!$urlDecode) {
+            return $this->routeArguments;
+        }
+
+        $routeArguments = [];
+        foreach ($this->routeArguments as $key => $value) {
+            $routeArguments[$key] = rawurldecode($value);
+        }
+
+        return $routeArguments;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getAllowedMethods(): array
+    {
+        return $this->dispatcher->getAllowedMethods($this->uri);
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/composer.json b/advancedcontentfilter/vendor/slim/slim/composer.json
index 554a838a..36c0c1d1 100644
--- a/advancedcontentfilter/vendor/slim/slim/composer.json
+++ b/advancedcontentfilter/vendor/slim/slim/composer.json
@@ -3,7 +3,7 @@
     "type": "library",
     "description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs",
     "keywords": ["framework","micro","api","router"],
-    "homepage": "https://slimframework.com",
+    "homepage": "https://www.slimframework.com",
     "license": "MIT",
     "authors": [
         {
@@ -21,38 +21,82 @@
             "email": "rob@akrabat.com",
             "homepage": "http://akrabat.com"
         },
+        {
+            "name": "Pierre Berube",
+            "email": "pierre@lgse.com",
+            "homepage": "http://www.lgse.com"
+        },
         {
             "name": "Gabriel Manricks",
             "email": "gmanricks@me.com",
             "homepage": "http://gabrielmanricks.com"
         }
     ],
+    "support": {
+        "docs": "https://www.slimframework.com/docs/v4/",
+        "forum": "https://discourse.slimframework.com/",
+        "irc": "irc://irc.freenode.net:6667/slimphp",
+        "issues": "https://github.com/slimphp/Slim/issues",
+        "rss": "https://www.slimframework.com/blog/feed.rss",
+        "slack": "https://slimphp.slack.com/",
+        "source": "https://github.com/slimphp/Slim",
+        "wiki": "https://github.com/slimphp/Slim/wiki"
+    },
     "require": {
-        "php": ">=5.5.0",
-        "pimple/pimple": "^3.0",
-        "psr/http-message": "^1.0",
-        "nikic/fast-route": "^1.0",
-        "container-interop/container-interop": "^1.2",
-        "psr/container": "^1.0"
+        "php": "^7.4 || ^8.0",
+        "ext-json": "*",
+        "nikic/fast-route": "^1.3",
+        "psr/container": "^1.0 || ^2.0",
+        "psr/http-factory": "^1.0",
+        "psr/http-message": "^1.1",
+        "psr/http-server-handler": "^1.0",
+        "psr/http-server-middleware": "^1.0",
+        "psr/log": "^1.1 || ^2.0 || ^3.0"
     },
     "require-dev": {
-        "squizlabs/php_codesniffer": "^2.5",
-        "phpunit/phpunit": "^4.0"
-    },
-    "provide": {
-        "psr/http-message-implementation": "1.0"
+        "ext-simplexml": "*",
+        "adriansuter/php-autoload-override": "^1.4",
+        "guzzlehttp/psr7": "^2.5",
+        "httpsoft/http-message": "^1.1",
+        "httpsoft/http-server-request": "^1.1",
+        "laminas/laminas-diactoros": "^2.17",
+        "nyholm/psr7": "^1.8",
+        "nyholm/psr7-server": "^1.0",
+        "phpspec/prophecy": "^1.17",
+        "phpspec/prophecy-phpunit": "^2.0",
+        "phpstan/phpstan": "^1.10",
+        "phpunit/phpunit": "^9.6",
+        "slim/http": "^1.3",
+        "slim/psr7": "^1.6",
+        "squizlabs/php_codesniffer": "^3.7"
     },
     "autoload": {
         "psr-4": {
             "Slim\\": "Slim"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Slim\\Tests\\": "tests"
+        }
+    },
     "scripts": {
         "test": [
             "@phpunit",
-            "@phpcs"
+            "@phpcs",
+            "@phpstan"
         ],
-        "phpunit": "php vendor/bin/phpunit",
-        "phpcs": "php vendor/bin/phpcs"
+        "phpunit": "phpunit",
+        "phpcs": "phpcs",
+        "phpstan": "phpstan --memory-limit=-1"
+    },
+    "suggest": {
+        "ext-simplexml": "Needed to support XML format in BodyParsingMiddleware",
+        "ext-xml": "Needed to support XML format in BodyParsingMiddleware",
+        "slim/psr7": "Slim PSR-7 implementation. See https://www.slimframework.com/docs/v4/start/installation.html for more information.",
+        "php-di/php-di": "PHP-DI is the recommended container library to be used with Slim"
+    },
+    "config": {
+        "sort-packages": true
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/AbstractAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/AbstractAdapter.php
index 727fc84c..ab7dc960 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/AbstractAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/AbstractAdapter.php
@@ -14,7 +14,6 @@ namespace Symfony\Component\Cache\Adapter;
 use Psr\Cache\CacheItemInterface;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
-use Psr\Log\NullLogger;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\ResettableInterface;
@@ -25,6 +24,11 @@ use Symfony\Component\Cache\Traits\AbstractTrait;
  */
 abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface, ResettableInterface
 {
+    /**
+     * @internal
+     */
+    const NS_SEPARATOR = ':';
+
     use AbstractTrait;
 
     private static $apcuSupported;
@@ -39,17 +43,16 @@ abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface
      */
     protected function __construct($namespace = '', $defaultLifetime = 0)
     {
-        $this->namespace = '' === $namespace ? '' : CacheItem::validateKey($namespace).':';
-        if (null !== $this->maxIdLength && strlen($namespace) > $this->maxIdLength - 24) {
-            throw new InvalidArgumentException(sprintf('Namespace must be %d chars max, %d given ("%s")', $this->maxIdLength - 24, strlen($namespace), $namespace));
+        $this->namespace = '' === $namespace ? '' : CacheItem::validateKey($namespace).static::NS_SEPARATOR;
+        if (null !== $this->maxIdLength && \strlen($namespace) > $this->maxIdLength - 24) {
+            throw new InvalidArgumentException(sprintf('Namespace must be %d chars max, %d given ("%s").', $this->maxIdLength - 24, \strlen($namespace), $namespace));
         }
         $this->createCacheItem = \Closure::bind(
-            function ($key, $value, $isHit) use ($defaultLifetime) {
+            static function ($key, $value, $isHit) {
                 $item = new CacheItem();
                 $item->key = $key;
                 $item->value = $value;
                 $item->isHit = $isHit;
-                $item->defaultLifetime = $defaultLifetime;
 
                 return $item;
             },
@@ -58,14 +61,16 @@ abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface
         );
         $getId = function ($key) { return $this->getId((string) $key); };
         $this->mergeByLifetime = \Closure::bind(
-            function ($deferred, $namespace, &$expiredIds) use ($getId) {
-                $byLifetime = array();
+            static function ($deferred, $namespace, &$expiredIds) use ($getId, $defaultLifetime) {
+                $byLifetime = [];
                 $now = time();
-                $expiredIds = array();
+                $expiredIds = [];
 
                 foreach ($deferred as $key => $item) {
                     if (null === $item->expiry) {
-                        $byLifetime[0 < $item->defaultLifetime ? $item->defaultLifetime : 0][$getId($key)] = $item->value;
+                        $byLifetime[0 < $defaultLifetime ? $defaultLifetime : 0][$getId($key)] = $item->value;
+                    } elseif (0 === $item->expiry) {
+                        $byLifetime[0][$getId($key)] = $item->value;
                     } elseif ($item->expiry > $now) {
                         $byLifetime[$item->expiry - $now][$getId($key)] = $item->value;
                     } else {
@@ -81,11 +86,10 @@ abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface
     }
 
     /**
-     * @param string               $namespace
-     * @param int                  $defaultLifetime
-     * @param string               $version
-     * @param string               $directory
-     * @param LoggerInterface|null $logger
+     * @param string $namespace
+     * @param int    $defaultLifetime
+     * @param string $version
+     * @param string $directory
      *
      * @return AdapterInterface
      */
@@ -112,24 +116,22 @@ abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface
         if (null !== $logger) {
             $fs->setLogger($logger);
         }
-        if (!self::$apcuSupported) {
+        if (!self::$apcuSupported || (\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) && !filter_var(ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN))) {
             return $fs;
         }
 
         $apcu = new ApcuAdapter($namespace, (int) $defaultLifetime / 5, $version);
-        if ('cli' === \PHP_SAPI && !ini_get('apc.enable_cli')) {
-            $apcu->setLogger(new NullLogger());
-        } elseif (null !== $logger) {
+        if (null !== $logger) {
             $apcu->setLogger($logger);
         }
 
-        return new ChainAdapter(array($apcu, $fs));
+        return new ChainAdapter([$apcu, $fs]);
     }
 
-    public static function createConnection($dsn, array $options = array())
+    public static function createConnection($dsn, array $options = [])
     {
-        if (!is_string($dsn)) {
-            throw new InvalidArgumentException(sprintf('The %s() method expect argument #1 to be string, %s given.', __METHOD__, gettype($dsn)));
+        if (!\is_string($dsn)) {
+            throw new InvalidArgumentException(sprintf('The "%s()" method expect argument #1 to be string, "%s" given.', __METHOD__, \gettype($dsn)));
         }
         if (0 === strpos($dsn, 'redis://')) {
             return RedisAdapter::createConnection($dsn, $options);
@@ -138,7 +140,7 @@ abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface
             return MemcachedAdapter::createConnection($dsn, $options);
         }
 
-        throw new InvalidArgumentException(sprintf('Unsupported DSN: %s.', $dsn));
+        throw new InvalidArgumentException(sprintf('Unsupported DSN: "%s".', $dsn));
     }
 
     /**
@@ -156,11 +158,11 @@ abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface
         $value = null;
 
         try {
-            foreach ($this->doFetch(array($id)) as $value) {
+            foreach ($this->doFetch([$id]) as $value) {
                 $isHit = true;
             }
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to fetch key "{key}"', array('key' => $key, 'exception' => $e));
+            CacheItem::log($this->logger, 'Failed to fetch key "{key}"', ['key' => $key, 'exception' => $e]);
         }
 
         return $f($key, $value, $isHit);
@@ -169,12 +171,12 @@ abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = array())
+    public function getItems(array $keys = [])
     {
         if ($this->deferred) {
             $this->commit();
         }
-        $ids = array();
+        $ids = [];
 
         foreach ($keys as $key) {
             $ids[] = $this->getId($key);
@@ -182,8 +184,8 @@ abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface
         try {
             $items = $this->doFetch($ids);
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to fetch requested items', array('keys' => $keys, 'exception' => $e));
-            $items = array();
+            CacheItem::log($this->logger, 'Failed to fetch requested items', ['keys' => $keys, 'exception' => $e]);
+            $items = [];
         }
         $ids = array_combine($ids, $keys);
 
@@ -224,7 +226,7 @@ abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface
         $ok = true;
         $byLifetime = $this->mergeByLifetime;
         $byLifetime = $byLifetime($this->deferred, $this->namespace, $expiredIds);
-        $retry = $this->deferred = array();
+        $retry = $this->deferred = [];
 
         if ($expiredIds) {
             $this->doDelete($expiredIds);
@@ -234,15 +236,15 @@ abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface
                 $e = $this->doSave($values, $lifetime);
             } catch (\Exception $e) {
             }
-            if (true === $e || array() === $e) {
+            if (true === $e || [] === $e) {
                 continue;
             }
-            if (is_array($e) || 1 === count($values)) {
-                foreach (is_array($e) ? $e : array_keys($values) as $id) {
+            if (\is_array($e) || 1 === \count($values)) {
+                foreach (\is_array($e) ? $e : array_keys($values) as $id) {
                     $ok = false;
                     $v = $values[$id];
-                    $type = is_object($v) ? get_class($v) : gettype($v);
-                    CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', array('key' => substr($id, strlen($this->namespace)), 'type' => $type, 'exception' => $e instanceof \Exception ? $e : null));
+                    $type = \is_object($v) ? \get_class($v) : \gettype($v);
+                    CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', ['key' => substr($id, \strlen($this->namespace)), 'type' => $type, 'exception' => $e instanceof \Exception ? $e : null]);
                 }
             } else {
                 foreach ($values as $id => $v) {
@@ -256,21 +258,31 @@ abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface
             foreach ($ids as $id) {
                 try {
                     $v = $byLifetime[$lifetime][$id];
-                    $e = $this->doSave(array($id => $v), $lifetime);
+                    $e = $this->doSave([$id => $v], $lifetime);
                 } catch (\Exception $e) {
                 }
-                if (true === $e || array() === $e) {
+                if (true === $e || [] === $e) {
                     continue;
                 }
                 $ok = false;
-                $type = is_object($v) ? get_class($v) : gettype($v);
-                CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', array('key' => substr($id, strlen($this->namespace)), 'type' => $type, 'exception' => $e instanceof \Exception ? $e : null));
+                $type = \is_object($v) ? \get_class($v) : \gettype($v);
+                CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', ['key' => substr($id, \strlen($this->namespace)), 'type' => $type, 'exception' => $e instanceof \Exception ? $e : null]);
             }
         }
 
         return $ok;
     }
 
+    public function __sleep()
+    {
+        throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
+    }
+
+    public function __wakeup()
+    {
+        throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
+    }
+
     public function __destruct()
     {
         if ($this->deferred) {
@@ -292,7 +304,7 @@ abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface
                 yield $key => $f($key, $value, true);
             }
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to fetch requested items', array('keys' => array_values($keys), 'exception' => $e));
+            CacheItem::log($this->logger, 'Failed to fetch requested items', ['keys' => array_values($keys), 'exception' => $e]);
         }
 
         foreach ($keys as $key) {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/AdapterInterface.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/AdapterInterface.php
index 41222c1a..85fe0768 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/AdapterInterface.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/AdapterInterface.php
@@ -33,5 +33,5 @@ interface AdapterInterface extends CacheItemPoolInterface
      *
      * @return \Traversable|CacheItem[]
      */
-    public function getItems(array $keys = array());
+    public function getItems(array $keys = []);
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/ArrayAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/ArrayAdapter.php
index 2118e9c6..33f55a86 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/ArrayAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/ArrayAdapter.php
@@ -25,6 +25,7 @@ class ArrayAdapter implements AdapterInterface, LoggerAwareInterface, Resettable
     use ArrayTrait;
 
     private $createCacheItem;
+    private $defaultLifetime;
 
     /**
      * @param int  $defaultLifetime
@@ -32,14 +33,14 @@ class ArrayAdapter implements AdapterInterface, LoggerAwareInterface, Resettable
      */
     public function __construct($defaultLifetime = 0, $storeSerialized = true)
     {
+        $this->defaultLifetime = $defaultLifetime;
         $this->storeSerialized = $storeSerialized;
         $this->createCacheItem = \Closure::bind(
-            function ($key, $value, $isHit) use ($defaultLifetime) {
+            static function ($key, $value, $isHit) {
                 $item = new CacheItem();
                 $item->key = $key;
                 $item->value = $value;
                 $item->isHit = $isHit;
-                $item->defaultLifetime = $defaultLifetime;
 
                 return $item;
             },
@@ -66,7 +67,7 @@ class ArrayAdapter implements AdapterInterface, LoggerAwareInterface, Resettable
                 $isHit = false;
             }
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to unserialize key "{key}"', array('key' => $key, 'exception' => $e));
+            CacheItem::log($this->logger, 'Failed to unserialize key "{key}"', ['key' => $key, 'exception' => $e]);
             $this->values[$key] = $value = null;
             $isHit = false;
         }
@@ -78,7 +79,7 @@ class ArrayAdapter implements AdapterInterface, LoggerAwareInterface, Resettable
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = array())
+    public function getItems(array $keys = [])
     {
         foreach ($keys as $key) {
             CacheItem::validateKey($key);
@@ -112,6 +113,10 @@ class ArrayAdapter implements AdapterInterface, LoggerAwareInterface, Resettable
         $value = $item["\0*\0value"];
         $expiry = $item["\0*\0expiry"];
 
+        if (0 === $expiry) {
+            $expiry = \PHP_INT_MAX;
+        }
+
         if (null !== $expiry && $expiry <= time()) {
             $this->deleteItem($key);
 
@@ -121,18 +126,18 @@ class ArrayAdapter implements AdapterInterface, LoggerAwareInterface, Resettable
             try {
                 $value = serialize($value);
             } catch (\Exception $e) {
-                $type = is_object($value) ? get_class($value) : gettype($value);
-                CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', array('key' => $key, 'type' => $type, 'exception' => $e));
+                $type = \is_object($value) ? \get_class($value) : \gettype($value);
+                CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', ['key' => $key, 'type' => $type, 'exception' => $e]);
 
                 return false;
             }
         }
-        if (null === $expiry && 0 < $item["\0*\0defaultLifetime"]) {
-            $expiry = time() + $item["\0*\0defaultLifetime"];
+        if (null === $expiry && 0 < $this->defaultLifetime) {
+            $expiry = time() + $this->defaultLifetime;
         }
 
         $this->values[$key] = $value;
-        $this->expiries[$key] = null !== $expiry ? $expiry : PHP_INT_MAX;
+        $this->expiries[$key] = null !== $expiry ? $expiry : \PHP_INT_MAX;
 
         return true;
     }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/ChainAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/ChainAdapter.php
index 6bdf6b2d..fdb28846 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/ChainAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/ChainAdapter.php
@@ -28,15 +28,15 @@ use Symfony\Component\Cache\ResettableInterface;
  */
 class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableInterface
 {
-    private $adapters = array();
+    private $adapters = [];
     private $adapterCount;
-    private $saveUp;
+    private $syncItem;
 
     /**
-     * @param CacheItemPoolInterface[] $adapters    The ordered list of adapters used to fetch cached items
-     * @param int                      $maxLifetime The max lifetime of items propagated from lower adapters to upper ones
+     * @param CacheItemPoolInterface[] $adapters        The ordered list of adapters used to fetch cached items
+     * @param int                      $defaultLifetime The default lifetime of items propagated from lower adapters to upper ones
      */
-    public function __construct(array $adapters, $maxLifetime = 0)
+    public function __construct(array $adapters, $defaultLifetime = 0)
     {
         if (!$adapters) {
             throw new InvalidArgumentException('At least one adapter must be specified.');
@@ -44,7 +44,10 @@ class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableIn
 
         foreach ($adapters as $adapter) {
             if (!$adapter instanceof CacheItemPoolInterface) {
-                throw new InvalidArgumentException(sprintf('The class "%s" does not implement the "%s" interface.', get_class($adapter), CacheItemPoolInterface::class));
+                throw new InvalidArgumentException(sprintf('The class "%s" does not implement the "%s" interface.', \get_class($adapter), CacheItemPoolInterface::class));
+            }
+            if (\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) && $adapter instanceof ApcuAdapter && !filter_var(ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN)) {
+                continue; // skip putting APCu in the chain when the backend is disabled
             }
 
             if ($adapter instanceof AdapterInterface) {
@@ -53,18 +56,18 @@ class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableIn
                 $this->adapters[] = new ProxyAdapter($adapter);
             }
         }
-        $this->adapterCount = count($this->adapters);
+        $this->adapterCount = \count($this->adapters);
 
-        $this->saveUp = \Closure::bind(
-            function ($adapter, $item) use ($maxLifetime) {
-                $origDefaultLifetime = $item->defaultLifetime;
+        $this->syncItem = \Closure::bind(
+            static function ($sourceItem, $item) use ($defaultLifetime) {
+                $item->value = $sourceItem->value;
+                $item->isHit = $sourceItem->isHit;
 
-                if (0 < $maxLifetime && ($origDefaultLifetime <= 0 || $maxLifetime < $origDefaultLifetime)) {
-                    $item->defaultLifetime = $maxLifetime;
+                if (0 < $defaultLifetime) {
+                    $item->expiresAfter($defaultLifetime);
                 }
 
-                $adapter->save($item);
-                $item->defaultLifetime = $origDefaultLifetime;
+                return $item;
             },
             null,
             CacheItem::class
@@ -76,18 +79,21 @@ class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableIn
      */
     public function getItem($key)
     {
-        $saveUp = $this->saveUp;
+        $syncItem = $this->syncItem;
+        $misses = [];
 
         foreach ($this->adapters as $i => $adapter) {
             $item = $adapter->getItem($key);
 
             if ($item->isHit()) {
                 while (0 <= --$i) {
-                    $saveUp($this->adapters[$i], $item);
+                    $this->adapters[$i]->save($syncItem($item, $misses[$i]));
                 }
 
                 return $item;
             }
+
+            $misses[$i] = $item;
         }
 
         return $item;
@@ -96,14 +102,15 @@ class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableIn
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = array())
+    public function getItems(array $keys = [])
     {
         return $this->generateItems($this->adapters[0]->getItems($keys), 0);
     }
 
     private function generateItems($items, $adapterIndex)
     {
-        $missing = array();
+        $missing = [];
+        $misses = [];
         $nextAdapterIndex = $adapterIndex + 1;
         $nextAdapter = isset($this->adapters[$nextAdapterIndex]) ? $this->adapters[$nextAdapterIndex] : null;
 
@@ -112,17 +119,18 @@ class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableIn
                 yield $k => $item;
             } else {
                 $missing[] = $k;
+                $misses[$k] = $item;
             }
         }
 
         if ($missing) {
-            $saveUp = $this->saveUp;
+            $syncItem = $this->syncItem;
             $adapter = $this->adapters[$adapterIndex];
             $items = $this->generateItems($nextAdapter->getItems($missing), $nextAdapterIndex);
 
             foreach ($items as $k => $item) {
                 if ($item->isHit()) {
-                    $saveUp($adapter, $item);
+                    $adapter->save($syncItem($item, $misses[$k]));
                 }
 
                 yield $k => $item;
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/DoctrineAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/DoctrineAdapter.php
index 972d2b41..8081d7dc 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/DoctrineAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/DoctrineAdapter.php
@@ -19,9 +19,8 @@ class DoctrineAdapter extends AbstractAdapter
     use DoctrineTrait;
 
     /**
-     * @param CacheProvider $provider
-     * @param string        $namespace
-     * @param int           $defaultLifetime
+     * @param string $namespace
+     * @param int    $defaultLifetime
      */
     public function __construct(CacheProvider $provider, $namespace = '', $defaultLifetime = 0)
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/NullAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/NullAdapter.php
index f58f81e5..c81a1cd6 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/NullAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/NullAdapter.php
@@ -49,7 +49,7 @@ class NullAdapter implements AdapterInterface
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = array())
+    public function getItems(array $keys = [])
     {
         return $this->generateItems($keys);
     }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/PdoAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/PdoAdapter.php
index c3fc45b6..59038679 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/PdoAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/PdoAdapter.php
@@ -35,7 +35,7 @@ class PdoAdapter extends AbstractAdapter implements PruneableInterface
      *  * db_time_col: The column where to store the timestamp [default: item_time]
      *  * db_username: The username when lazy-connect [default: '']
      *  * db_password: The password when lazy-connect [default: '']
-     *  * db_connection_options: An array of driver-specific connection options [default: array()]
+     *  * db_connection_options: An array of driver-specific connection options [default: []]
      *
      * @param \PDO|Connection|string $connOrDsn       A \PDO or Connection instance or DSN string or null
      * @param string                 $namespace
@@ -46,7 +46,7 @@ class PdoAdapter extends AbstractAdapter implements PruneableInterface
      * @throws InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION
      * @throws InvalidArgumentException When namespace contains invalid characters
      */
-    public function __construct($connOrDsn, $namespace = '', $defaultLifetime = 0, array $options = array())
+    public function __construct($connOrDsn, $namespace = '', $defaultLifetime = 0, array $options = [])
     {
         $this->init($connOrDsn, $namespace, $defaultLifetime, $options);
     }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/PhpArrayAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/PhpArrayAdapter.php
index d3b9d77d..47a259c1 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/PhpArrayAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/PhpArrayAdapter.php
@@ -40,9 +40,9 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
     {
         $this->file = $file;
         $this->pool = $fallbackPool;
-        $this->zendDetectUnicode = ini_get('zend.detect_unicode');
+        $this->zendDetectUnicode = filter_var(ini_get('zend.detect_unicode'), \FILTER_VALIDATE_BOOLEAN);
         $this->createCacheItem = \Closure::bind(
-            function ($key, $value, $isHit) {
+            static function ($key, $value, $isHit) {
                 $item = new CacheItem();
                 $item->key = $key;
                 $item->value = $value;
@@ -61,14 +61,13 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
      * fallback pool with this adapter only if the current PHP version is supported.
      *
      * @param string                 $file         The PHP file were values are cached
-     * @param CacheItemPoolInterface $fallbackPool Fallback for old PHP versions or opcache disabled
+     * @param CacheItemPoolInterface $fallbackPool A pool to fallback on when an item is not hit
      *
      * @return CacheItemPoolInterface
      */
     public static function create($file, CacheItemPoolInterface $fallbackPool)
     {
-        // Shared memory is available in PHP 7.0+ with OPCache enabled and in HHVM
-        if ((\PHP_VERSION_ID >= 70000 && ini_get('opcache.enable')) || defined('HHVM_VERSION')) {
+        if (\PHP_VERSION_ID >= 70000) {
             if (!$fallbackPool instanceof AdapterInterface) {
                 $fallbackPool = new ProxyAdapter($fallbackPool);
             }
@@ -84,8 +83,8 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
      */
     public function getItem($key)
     {
-        if (!is_string($key)) {
-            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
+        if (!\is_string($key)) {
+            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
         }
         if (null === $this->values) {
             $this->initialize();
@@ -99,7 +98,7 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
 
         if ('N;' === $value) {
             $value = null;
-        } elseif (is_string($value) && isset($value[2]) && ':' === $value[1]) {
+        } elseif (\is_string($value) && isset($value[2]) && ':' === $value[1]) {
             try {
                 $e = null;
                 $value = unserialize($value);
@@ -120,11 +119,11 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = array())
+    public function getItems(array $keys = [])
     {
         foreach ($keys as $key) {
-            if (!is_string($key)) {
-                throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
+            if (!\is_string($key)) {
+                throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
             }
         }
         if (null === $this->values) {
@@ -139,8 +138,8 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
      */
     public function hasItem($key)
     {
-        if (!is_string($key)) {
-            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
+        if (!\is_string($key)) {
+            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
         }
         if (null === $this->values) {
             $this->initialize();
@@ -154,8 +153,8 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
      */
     public function deleteItem($key)
     {
-        if (!is_string($key)) {
-            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
+        if (!\is_string($key)) {
+            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
         }
         if (null === $this->values) {
             $this->initialize();
@@ -170,11 +169,11 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
     public function deleteItems(array $keys)
     {
         $deleted = true;
-        $fallbackKeys = array();
+        $fallbackKeys = [];
 
         foreach ($keys as $key) {
-            if (!is_string($key)) {
-                throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
+            if (!\is_string($key)) {
+                throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
             }
 
             if (isset($this->values[$key])) {
@@ -232,7 +231,7 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
     private function generateItems(array $keys)
     {
         $f = $this->createCacheItem;
-        $fallbackKeys = array();
+        $fallbackKeys = [];
 
         foreach ($keys as $key) {
             if (isset($this->values[$key])) {
@@ -240,7 +239,7 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
 
                 if ('N;' === $value) {
                     yield $key => $f($key, null, true);
-                } elseif (is_string($value) && isset($value[2]) && ':' === $value[1]) {
+                } elseif (\is_string($value) && isset($value[2]) && ':' === $value[1]) {
                     try {
                         yield $key => $f($key, unserialize($value), true);
                     } catch (\Error $e) {
@@ -266,20 +265,27 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
     /**
      * @throws \ReflectionException When $class is not found and is required
      *
-     * @internal
+     * @internal to be removed in Symfony 5.0
      */
     public static function throwOnRequiredClass($class)
     {
         $e = new \ReflectionException("Class $class does not exist");
-        $trace = $e->getTrace();
-        $autoloadFrame = array(
+        $trace = debug_backtrace();
+        $autoloadFrame = [
             'function' => 'spl_autoload_call',
-            'args' => array($class),
-        );
-        $i = 1 + array_search($autoloadFrame, $trace, true);
+            'args' => [$class],
+        ];
 
-        if (isset($trace[$i]['function']) && !isset($trace[$i]['class'])) {
-            switch ($trace[$i]['function']) {
+        if (\PHP_VERSION_ID >= 80000 && isset($trace[1])) {
+            $callerFrame = $trace[1];
+        } elseif (false !== $i = array_search($autoloadFrame, $trace, true)) {
+            $callerFrame = $trace[++$i];
+        } else {
+            throw $e;
+        }
+
+        if (isset($callerFrame['function']) && !isset($callerFrame['class'])) {
+            switch ($callerFrame['function']) {
                 case 'get_class_methods':
                 case 'get_class_vars':
                 case 'get_parent_class':
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/PhpFilesAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/PhpFilesAdapter.php
index 528d9c01..b56143c2 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/PhpFilesAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/PhpFilesAdapter.php
@@ -29,13 +29,13 @@ class PhpFilesAdapter extends AbstractAdapter implements PruneableInterface
     public function __construct($namespace = '', $defaultLifetime = 0, $directory = null)
     {
         if (!static::isSupported()) {
-            throw new CacheException('OPcache is not enabled');
+            throw new CacheException('OPcache is not enabled.');
         }
         parent::__construct('', $defaultLifetime);
         $this->init($namespace, $directory);
 
         $e = new \Exception();
         $this->includeHandler = function () use ($e) { throw $e; };
-        $this->zendDetectUnicode = ini_get('zend.detect_unicode');
+        $this->zendDetectUnicode = filter_var(ini_get('zend.detect_unicode'), \FILTER_VALIDATE_BOOLEAN);
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/ProxyAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/ProxyAdapter.php
index 82c95c5b..c89a760e 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/ProxyAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/ProxyAdapter.php
@@ -29,28 +29,31 @@ class ProxyAdapter implements AdapterInterface, PruneableInterface, ResettableIn
     private $namespaceLen;
     private $createCacheItem;
     private $poolHash;
+    private $defaultLifetime;
 
     /**
-     * @param CacheItemPoolInterface $pool
-     * @param string                 $namespace
-     * @param int                    $defaultLifetime
+     * @param string $namespace
+     * @param int    $defaultLifetime
      */
     public function __construct(CacheItemPoolInterface $pool, $namespace = '', $defaultLifetime = 0)
     {
         $this->pool = $pool;
         $this->poolHash = $poolHash = spl_object_hash($pool);
         $this->namespace = '' === $namespace ? '' : CacheItem::validateKey($namespace);
-        $this->namespaceLen = strlen($namespace);
+        $this->namespaceLen = \strlen($namespace);
+        $this->defaultLifetime = $defaultLifetime;
         $this->createCacheItem = \Closure::bind(
-            function ($key, $innerItem) use ($defaultLifetime, $poolHash) {
+            static function ($key, $innerItem) use ($poolHash) {
                 $item = new CacheItem();
                 $item->key = $key;
-                $item->value = $innerItem->get();
-                $item->isHit = $innerItem->isHit();
-                $item->defaultLifetime = $defaultLifetime;
-                $item->innerItem = $innerItem;
                 $item->poolHash = $poolHash;
-                $innerItem->set(null);
+
+                if (null !== $innerItem) {
+                    $item->value = $innerItem->get();
+                    $item->isHit = $innerItem->isHit();
+                    $item->innerItem = $innerItem;
+                    $innerItem->set(null);
+                }
 
                 return $item;
             },
@@ -73,7 +76,7 @@ class ProxyAdapter implements AdapterInterface, PruneableInterface, ResettableIn
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = array())
+    public function getItems(array $keys = [])
     {
         if ($this->namespaceLen) {
             foreach ($keys as $i => $key) {
@@ -153,10 +156,21 @@ class ProxyAdapter implements AdapterInterface, PruneableInterface, ResettableIn
         }
         $item = (array) $item;
         $expiry = $item["\0*\0expiry"];
-        if (null === $expiry && 0 < $item["\0*\0defaultLifetime"]) {
-            $expiry = time() + $item["\0*\0defaultLifetime"];
+        if (null === $expiry && 0 < $this->defaultLifetime) {
+            $expiry = time() + $this->defaultLifetime;
         }
-        $innerItem = $item["\0*\0poolHash"] === $this->poolHash ? $item["\0*\0innerItem"] : $this->pool->getItem($this->namespace.$item["\0*\0key"]);
+
+        if ($item["\0*\0poolHash"] === $this->poolHash && $item["\0*\0innerItem"]) {
+            $innerItem = $item["\0*\0innerItem"];
+        } elseif ($this->pool instanceof AdapterInterface) {
+            // this is an optimization specific for AdapterInterface implementations
+            // so we can save a round-trip to the backend by just creating a new item
+            $f = $this->createCacheItem;
+            $innerItem = $f($this->namespace.$item["\0*\0key"], null);
+        } else {
+            $innerItem = $this->pool->getItem($this->namespace.$item["\0*\0key"]);
+        }
+
         $innerItem->set($item["\0*\0value"]);
         $innerItem->expiresAt(null !== $expiry ? \DateTime::createFromFormat('U', $expiry) : null);
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/SimpleCacheAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/SimpleCacheAdapter.php
index 24db5d50..d3d0ede6 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/SimpleCacheAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/SimpleCacheAdapter.php
@@ -13,14 +13,18 @@ namespace Symfony\Component\Cache\Adapter;
 
 use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Cache\PruneableInterface;
-use Symfony\Component\Cache\ResettableInterface;
 use Symfony\Component\Cache\Traits\ProxyTrait;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
-class SimpleCacheAdapter extends AbstractAdapter implements PruneableInterface, ResettableInterface
+class SimpleCacheAdapter extends AbstractAdapter implements PruneableInterface
 {
+    /**
+     * @internal
+     */
+    const NS_SEPARATOR = '_';
+
     use ProxyTrait;
 
     private $miss;
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/TagAwareAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/TagAwareAdapter.php
index 72bbc143..febe5090 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/TagAwareAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/TagAwareAdapter.php
@@ -27,25 +27,26 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
 
     use ProxyTrait;
 
-    private $deferred = array();
+    private $deferred = [];
     private $createCacheItem;
     private $setCacheItemTags;
     private $getTagsByKey;
     private $invalidateTags;
     private $tags;
+    private $knownTagVersions = [];
+    private $knownTagVersionsTtl;
 
-    public function __construct(AdapterInterface $itemsPool, AdapterInterface $tagsPool = null)
+    public function __construct(AdapterInterface $itemsPool, AdapterInterface $tagsPool = null, $knownTagVersionsTtl = 0.15)
     {
         $this->pool = $itemsPool;
         $this->tags = $tagsPool ?: $itemsPool;
+        $this->knownTagVersionsTtl = $knownTagVersionsTtl;
         $this->createCacheItem = \Closure::bind(
-            function ($key, $value, CacheItem $protoItem) {
+            static function ($key, $value, CacheItem $protoItem) {
                 $item = new CacheItem();
                 $item->key = $key;
                 $item->value = $value;
-                $item->defaultLifetime = $protoItem->defaultLifetime;
                 $item->expiry = $protoItem->expiry;
-                $item->innerItem = $protoItem->innerItem;
                 $item->poolHash = $protoItem->poolHash;
 
                 return $item;
@@ -54,7 +55,7 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
             CacheItem::class
         );
         $this->setCacheItemTags = \Closure::bind(
-            function (CacheItem $item, $key, array &$itemTags) {
+            static function (CacheItem $item, $key, array &$itemTags) {
                 if (!$item->isHit) {
                     return $item;
                 }
@@ -74,8 +75,8 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
             CacheItem::class
         );
         $this->getTagsByKey = \Closure::bind(
-            function ($deferred) {
-                $tagsByKey = array();
+            static function ($deferred) {
+                $tagsByKey = [];
                 foreach ($deferred as $key => $item) {
                     $tagsByKey[$key] = $item->tags;
                 }
@@ -86,11 +87,9 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
             CacheItem::class
         );
         $this->invalidateTags = \Closure::bind(
-            function (AdapterInterface $tagsAdapter, array $tags) {
-                foreach ($tagsAdapter->getItems($tags) as $v) {
-                    $v->set(1 + (int) $v->get());
-                    $v->defaultLifetime = 0;
-                    $v->expiry = null;
+            static function (AdapterInterface $tagsAdapter, array $tags) {
+                foreach ($tags as $v) {
+                    $v->expiry = 0;
                     $tagsAdapter->saveDeferred($v);
                 }
 
@@ -106,14 +105,42 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
      */
     public function invalidateTags(array $tags)
     {
-        foreach ($tags as $k => $tag) {
-            if ('' !== $tag && is_string($tag)) {
-                $tags[$k] = $tag.static::TAGS_PREFIX;
-            }
+        $ok = true;
+        $tagsByKey = [];
+        $invalidatedTags = [];
+        foreach ($tags as $tag) {
+            CacheItem::validateKey($tag);
+            $invalidatedTags[$tag] = 0;
         }
-        $f = $this->invalidateTags;
 
-        return $f($this->tags, $tags);
+        if ($this->deferred) {
+            $items = $this->deferred;
+            foreach ($items as $key => $item) {
+                if (!$this->pool->saveDeferred($item)) {
+                    unset($this->deferred[$key]);
+                    $ok = false;
+                }
+            }
+
+            $f = $this->getTagsByKey;
+            $tagsByKey = $f($items);
+            $this->deferred = [];
+        }
+
+        $tagVersions = $this->getTagVersions($tagsByKey, $invalidatedTags);
+        $f = $this->createCacheItem;
+
+        foreach ($tagsByKey as $key => $tags) {
+            $this->pool->saveDeferred($f(static::TAGS_PREFIX.$key, array_intersect_key($tagVersions, $tags), $items[$key]));
+        }
+        $ok = $this->pool->commit() && $ok;
+
+        if ($invalidatedTags) {
+            $f = $this->invalidateTags;
+            $ok = $f($this->tags, $invalidatedTags) && $ok;
+        }
+
+        return $ok;
     }
 
     /**
@@ -127,12 +154,19 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
         if (!$this->pool->hasItem($key)) {
             return false;
         }
-        if (!$itemTags = $this->pool->getItem(static::TAGS_PREFIX.$key)->get()) {
+
+        $itemTags = $this->pool->getItem(static::TAGS_PREFIX.$key);
+
+        if (!$itemTags->isHit()) {
+            return false;
+        }
+
+        if (!$itemTags = $itemTags->get()) {
             return true;
         }
 
-        foreach ($this->getTagVersions(array($itemTags)) as $tag => $version) {
-            if ($itemTags[$tag] !== $version) {
+        foreach ($this->getTagVersions([$itemTags]) as $tag => $version) {
+            if ($itemTags[$tag] !== $version && 1 !== $itemTags[$tag] - $version) {
                 return false;
             }
         }
@@ -145,23 +179,25 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
      */
     public function getItem($key)
     {
-        foreach ($this->getItems(array($key)) as $item) {
+        foreach ($this->getItems([$key]) as $item) {
             return $item;
         }
+
+        return null;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = array())
+    public function getItems(array $keys = [])
     {
         if ($this->deferred) {
             $this->commit();
         }
-        $tagKeys = array();
+        $tagKeys = [];
 
         foreach ($keys as $key) {
-            if ('' !== $key && is_string($key)) {
+            if ('' !== $key && \is_string($key)) {
                 $key = static::TAGS_PREFIX.$key;
                 $tagKeys[$key] = $key;
             }
@@ -183,7 +219,7 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
      */
     public function clear()
     {
-        $this->deferred = array();
+        $this->deferred = [];
 
         return $this->pool->clear();
     }
@@ -193,7 +229,7 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
      */
     public function deleteItem($key)
     {
-        return $this->deleteItems(array($key));
+        return $this->deleteItems([$key]);
     }
 
     /**
@@ -202,7 +238,7 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
     public function deleteItems(array $keys)
     {
         foreach ($keys as $key) {
-            if ('' !== $key && is_string($key)) {
+            if ('' !== $key && \is_string($key)) {
                 $keys[] = static::TAGS_PREFIX.$key;
             }
         }
@@ -241,29 +277,17 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
      */
     public function commit()
     {
-        $ok = true;
+        return $this->invalidateTags([]);
+    }
 
-        if ($this->deferred) {
-            $items = $this->deferred;
-            foreach ($items as $key => $item) {
-                if (!$this->pool->saveDeferred($item)) {
-                    unset($this->deferred[$key]);
-                    $ok = false;
-                }
-            }
+    public function __sleep()
+    {
+        throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
+    }
 
-            $f = $this->getTagsByKey;
-            $tagsByKey = $f($items);
-            $this->deferred = array();
-            $tagVersions = $this->getTagVersions($tagsByKey);
-            $f = $this->createCacheItem;
-
-            foreach ($tagsByKey as $key => $tags) {
-                $this->pool->saveDeferred($f(static::TAGS_PREFIX.$key, array_intersect_key($tagVersions, $tags), $items[$key]));
-            }
-        }
-
-        return $this->pool->commit() && $ok;
+    public function __wakeup()
+    {
+        throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
     }
 
     public function __destruct()
@@ -273,7 +297,7 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
 
     private function generateItems($items, array $tagKeys)
     {
-        $bufferedItems = $itemTags = array();
+        $bufferedItems = $itemTags = [];
         $f = $this->setCacheItemTags;
 
         foreach ($items as $key => $item) {
@@ -287,14 +311,17 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
             }
 
             unset($tagKeys[$key]);
-            $itemTags[$key] = $item->get() ?: array();
+
+            if ($item->isHit()) {
+                $itemTags[$key] = $item->get() ?: [];
+            }
 
             if (!$tagKeys) {
                 $tagVersions = $this->getTagVersions($itemTags);
 
                 foreach ($itemTags as $key => $tags) {
                     foreach ($tags as $tag => $version) {
-                        if ($tagVersions[$tag] !== $version) {
+                        if ($tagVersions[$tag] !== $version && 1 !== $version - $tagVersions[$tag]) {
                             unset($itemTags[$key]);
                             continue 2;
                         }
@@ -310,23 +337,55 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
         }
     }
 
-    private function getTagVersions(array $tagsByKey)
+    private function getTagVersions(array $tagsByKey, array &$invalidatedTags = [])
     {
-        $tagVersions = array();
+        $tagVersions = $invalidatedTags;
 
         foreach ($tagsByKey as $tags) {
             $tagVersions += $tags;
         }
 
-        if ($tagVersions) {
-            $tags = array();
-            foreach ($tagVersions as $tag => $version) {
-                $tagVersions[$tag] = $tag.static::TAGS_PREFIX;
-                $tags[$tag.static::TAGS_PREFIX] = $tag;
+        if (!$tagVersions) {
+            return [];
+        }
+
+        if (!$fetchTagVersions = 1 !== \func_num_args()) {
+            foreach ($tagsByKey as $tags) {
+                foreach ($tags as $tag => $version) {
+                    if ($tagVersions[$tag] > $version) {
+                        $tagVersions[$tag] = $version;
+                    }
+                }
             }
-            foreach ($this->tags->getItems($tagVersions) as $tag => $version) {
-                $tagVersions[$tags[$tag]] = $version->get() ?: 0;
+        }
+
+        $now = microtime(true);
+        $tags = [];
+        foreach ($tagVersions as $tag => $version) {
+            $tags[$tag.static::TAGS_PREFIX] = $tag;
+            if ($fetchTagVersions || !isset($this->knownTagVersions[$tag])) {
+                $fetchTagVersions = true;
+                continue;
             }
+            $version -= $this->knownTagVersions[$tag][1];
+            if ((0 !== $version && 1 !== $version) || $now - $this->knownTagVersions[$tag][0] >= $this->knownTagVersionsTtl) {
+                // reuse previously fetched tag versions up to the ttl, unless we are storing items or a potential miss arises
+                $fetchTagVersions = true;
+            } else {
+                $this->knownTagVersions[$tag][1] += $version;
+            }
+        }
+
+        if (!$fetchTagVersions) {
+            return $tagVersions;
+        }
+
+        foreach ($this->tags->getItems(array_keys($tags)) as $tag => $version) {
+            $tagVersions[$tag = $tags[$tag]] = $version->get() ?: 0;
+            if (isset($invalidatedTags[$tag])) {
+                $invalidatedTags[$tag] = $version->set(++$tagVersions[$tag]);
+            }
+            $this->knownTagVersions[$tag] = [$now, $tagVersions[$tag]];
         }
 
         return $tagVersions;
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/TraceableAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/TraceableAdapter.php
index 98d0e526..cc855c13 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/TraceableAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/TraceableAdapter.php
@@ -25,7 +25,7 @@ use Symfony\Component\Cache\ResettableInterface;
 class TraceableAdapter implements AdapterInterface, PruneableInterface, ResettableInterface
 {
     protected $pool;
-    private $calls = array();
+    private $calls = [];
 
     public function __construct(AdapterInterface $pool)
     {
@@ -107,7 +107,7 @@ class TraceableAdapter implements AdapterInterface, PruneableInterface, Resettab
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = array())
+    public function getItems(array $keys = [])
     {
         $event = $this->start(__FUNCTION__);
         try {
@@ -116,7 +116,7 @@ class TraceableAdapter implements AdapterInterface, PruneableInterface, Resettab
             $event->end = microtime(true);
         }
         $f = function () use ($result, $event) {
-            $event->result = array();
+            $event->result = [];
             foreach ($result as $key => $item) {
                 if ($event->result[$key] = $item->isHit()) {
                     ++$event->hits;
@@ -191,15 +191,11 @@ class TraceableAdapter implements AdapterInterface, PruneableInterface, Resettab
      */
     public function reset()
     {
-        if (!$this->pool instanceof ResettableInterface) {
-            return;
-        }
-        $event = $this->start(__FUNCTION__);
-        try {
+        if ($this->pool instanceof ResettableInterface) {
             $this->pool->reset();
-        } finally {
-            $event->end = microtime(true);
         }
+
+        $this->clearCalls();
     }
 
     public function getCalls()
@@ -209,7 +205,7 @@ class TraceableAdapter implements AdapterInterface, PruneableInterface, Resettab
 
     public function clearCalls()
     {
-        $this->calls = array();
+        $this->calls = [];
     }
 
     protected function start($name)
diff --git a/advancedcontentfilter/vendor/symfony/cache/CacheItem.php b/advancedcontentfilter/vendor/symfony/cache/CacheItem.php
index 93ffea49..7ae6568c 100644
--- a/advancedcontentfilter/vendor/symfony/cache/CacheItem.php
+++ b/advancedcontentfilter/vendor/symfony/cache/CacheItem.php
@@ -24,9 +24,8 @@ final class CacheItem implements CacheItemInterface
     protected $value;
     protected $isHit = false;
     protected $expiry;
-    protected $defaultLifetime;
-    protected $tags = array();
-    protected $prevTags = array();
+    protected $tags = [];
+    protected $prevTags = [];
     protected $innerItem;
     protected $poolHash;
 
@@ -56,6 +55,8 @@ final class CacheItem implements CacheItemInterface
 
     /**
      * {@inheritdoc}
+     *
+     * @return $this
      */
     public function set($value)
     {
@@ -66,15 +67,17 @@ final class CacheItem implements CacheItemInterface
 
     /**
      * {@inheritdoc}
+     *
+     * @return $this
      */
     public function expiresAt($expiration)
     {
         if (null === $expiration) {
-            $this->expiry = $this->defaultLifetime > 0 ? time() + $this->defaultLifetime : null;
+            $this->expiry = null;
         } elseif ($expiration instanceof \DateTimeInterface) {
             $this->expiry = (int) $expiration->format('U');
         } else {
-            throw new InvalidArgumentException(sprintf('Expiration date must implement DateTimeInterface or be null, "%s" given', is_object($expiration) ? get_class($expiration) : gettype($expiration)));
+            throw new InvalidArgumentException(sprintf('Expiration date must implement DateTimeInterface or be null, "%s" given.', \is_object($expiration) ? \get_class($expiration) : \gettype($expiration)));
         }
 
         return $this;
@@ -82,17 +85,19 @@ final class CacheItem implements CacheItemInterface
 
     /**
      * {@inheritdoc}
+     *
+     * @return $this
      */
     public function expiresAfter($time)
     {
         if (null === $time) {
-            $this->expiry = $this->defaultLifetime > 0 ? time() + $this->defaultLifetime : null;
+            $this->expiry = null;
         } elseif ($time instanceof \DateInterval) {
             $this->expiry = (int) \DateTime::createFromFormat('U', time())->add($time)->format('U');
-        } elseif (is_int($time)) {
+        } elseif (\is_int($time)) {
             $this->expiry = $time + time();
         } else {
-            throw new InvalidArgumentException(sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given', is_object($time) ? get_class($time) : gettype($time)));
+            throw new InvalidArgumentException(sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given.', \is_object($time) ? \get_class($time) : \gettype($time)));
         }
 
         return $this;
@@ -103,27 +108,27 @@ final class CacheItem implements CacheItemInterface
      *
      * @param string|string[] $tags A tag or array of tags
      *
-     * @return static
+     * @return $this
      *
      * @throws InvalidArgumentException When $tag is not valid
      */
     public function tag($tags)
     {
-        if (!is_array($tags)) {
-            $tags = array($tags);
+        if (!\is_array($tags)) {
+            $tags = [$tags];
         }
         foreach ($tags as $tag) {
-            if (!is_string($tag)) {
-                throw new InvalidArgumentException(sprintf('Cache tag must be string, "%s" given', is_object($tag) ? get_class($tag) : gettype($tag)));
+            if (!\is_string($tag)) {
+                throw new InvalidArgumentException(sprintf('Cache tag must be string, "%s" given.', \is_object($tag) ? \get_class($tag) : \gettype($tag)));
             }
             if (isset($this->tags[$tag])) {
                 continue;
             }
-            if (!isset($tag[0])) {
-                throw new InvalidArgumentException('Cache tag length must be greater than zero');
+            if ('' === $tag) {
+                throw new InvalidArgumentException('Cache tag length must be greater than zero.');
             }
             if (false !== strpbrk($tag, '{}()/\@:')) {
-                throw new InvalidArgumentException(sprintf('Cache tag "%s" contains reserved characters {}()/\@:', $tag));
+                throw new InvalidArgumentException(sprintf('Cache tag "%s" contains reserved characters {}()/\@:.', $tag));
             }
             $this->tags[$tag] = $tag;
         }
@@ -152,14 +157,14 @@ final class CacheItem implements CacheItemInterface
      */
     public static function validateKey($key)
     {
-        if (!is_string($key)) {
-            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given', is_object($key) ? get_class($key) : gettype($key)));
+        if (!\is_string($key)) {
+            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
         }
-        if (!isset($key[0])) {
-            throw new InvalidArgumentException('Cache key length must be greater than zero');
+        if ('' === $key) {
+            throw new InvalidArgumentException('Cache key length must be greater than zero.');
         }
         if (false !== strpbrk($key, '{}()/\@:')) {
-            throw new InvalidArgumentException(sprintf('Cache key "%s" contains reserved characters {}()/\@:', $key));
+            throw new InvalidArgumentException(sprintf('Cache key "%s" contains reserved characters {}()/\@:.', $key));
         }
 
         return $key;
@@ -170,18 +175,18 @@ final class CacheItem implements CacheItemInterface
      *
      * @internal
      */
-    public static function log(LoggerInterface $logger = null, $message, $context = array())
+    public static function log(LoggerInterface $logger = null, $message, $context = [])
     {
         if ($logger) {
             $logger->warning($message, $context);
         } else {
-            $replace = array();
+            $replace = [];
             foreach ($context as $k => $v) {
                 if (is_scalar($v)) {
                     $replace['{'.$k.'}'] = $v;
                 }
             }
-            @trigger_error(strtr($message, $replace), E_USER_WARNING);
+            @trigger_error(strtr($message, $replace), \E_USER_WARNING);
         }
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/DataCollector/CacheDataCollector.php b/advancedcontentfilter/vendor/symfony/cache/DataCollector/CacheDataCollector.php
index ceef45aa..c9e87d5c 100644
--- a/advancedcontentfilter/vendor/symfony/cache/DataCollector/CacheDataCollector.php
+++ b/advancedcontentfilter/vendor/symfony/cache/DataCollector/CacheDataCollector.php
@@ -27,11 +27,10 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
     /**
      * @var TraceableAdapter[]
      */
-    private $instances = array();
+    private $instances = [];
 
     /**
-     * @param string           $name
-     * @param TraceableAdapter $instance
+     * @param string $name
      */
     public function addInstance($name, TraceableAdapter $instance)
     {
@@ -43,8 +42,8 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
      */
     public function collect(Request $request, Response $response, \Exception $exception = null)
     {
-        $empty = array('calls' => array(), 'config' => array(), 'options' => array(), 'statistics' => array());
-        $this->data = array('instances' => $empty, 'total' => $empty);
+        $empty = ['calls' => [], 'config' => [], 'options' => [], 'statistics' => []];
+        $this->data = ['instances' => $empty, 'total' => $empty];
         foreach ($this->instances as $name => $instance) {
             $this->data['instances']['calls'][$name] = $instance->getCalls();
         }
@@ -55,7 +54,7 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
 
     public function reset()
     {
-        $this->data = array();
+        $this->data = [];
         foreach ($this->instances as $instance) {
             $instance->clearCalls();
         }
@@ -109,9 +108,9 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
      */
     private function calculateStatistics()
     {
-        $statistics = array();
+        $statistics = [];
         foreach ($this->data['instances']['calls'] as $name => $calls) {
-            $statistics[$name] = array(
+            $statistics[$name] = [
                 'calls' => 0,
                 'time' => 0,
                 'reads' => 0,
@@ -119,34 +118,33 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
                 'deletes' => 0,
                 'hits' => 0,
                 'misses' => 0,
-            );
+            ];
             /** @var TraceableAdapterEvent $call */
             foreach ($calls as $call) {
-                $statistics[$name]['calls'] += 1;
+                ++$statistics[$name]['calls'];
                 $statistics[$name]['time'] += $call->end - $call->start;
                 if ('getItem' === $call->name) {
-                    $statistics[$name]['reads'] += 1;
+                    ++$statistics[$name]['reads'];
                     if ($call->hits) {
-                        $statistics[$name]['hits'] += 1;
+                        ++$statistics[$name]['hits'];
                     } else {
-                        $statistics[$name]['misses'] += 1;
+                        ++$statistics[$name]['misses'];
                     }
                 } elseif ('getItems' === $call->name) {
-                    $count = $call->hits + $call->misses;
-                    $statistics[$name]['reads'] += $count;
+                    $statistics[$name]['reads'] += $call->hits + $call->misses;
                     $statistics[$name]['hits'] += $call->hits;
-                    $statistics[$name]['misses'] += $count - $call->misses;
+                    $statistics[$name]['misses'] += $call->misses;
                 } elseif ('hasItem' === $call->name) {
-                    $statistics[$name]['reads'] += 1;
+                    ++$statistics[$name]['reads'];
                     if (false === $call->result) {
-                        $statistics[$name]['misses'] += 1;
+                        ++$statistics[$name]['misses'];
                     } else {
-                        $statistics[$name]['hits'] += 1;
+                        ++$statistics[$name]['hits'];
                     }
                 } elseif ('save' === $call->name) {
-                    $statistics[$name]['writes'] += 1;
+                    ++$statistics[$name]['writes'];
                 } elseif ('deleteItem' === $call->name) {
-                    $statistics[$name]['deletes'] += 1;
+                    ++$statistics[$name]['deletes'];
                 }
             }
             if ($statistics[$name]['reads']) {
@@ -165,7 +163,7 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
     private function calculateTotalStatistics()
     {
         $statistics = $this->getStatistics();
-        $totals = array(
+        $totals = [
             'calls' => 0,
             'time' => 0,
             'reads' => 0,
@@ -173,7 +171,7 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
             'deletes' => 0,
             'hits' => 0,
             'misses' => 0,
-        );
+        ];
         foreach ($statistics as $name => $values) {
             foreach ($totals as $key => $value) {
                 $totals[$key] += $statistics[$name][$key];
diff --git a/advancedcontentfilter/vendor/symfony/cache/DoctrineProvider.php b/advancedcontentfilter/vendor/symfony/cache/DoctrineProvider.php
index cebe95fb..4c5cd0cb 100644
--- a/advancedcontentfilter/vendor/symfony/cache/DoctrineProvider.php
+++ b/advancedcontentfilter/vendor/symfony/cache/DoctrineProvider.php
@@ -90,7 +90,7 @@ class DoctrineProvider extends CacheProvider implements PruneableInterface, Rese
      */
     protected function doFlush()
     {
-        $this->pool->clear();
+        return $this->pool->clear();
     }
 
     /**
@@ -98,5 +98,6 @@ class DoctrineProvider extends CacheProvider implements PruneableInterface, Rese
      */
     protected function doGetStats()
     {
+        return null;
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/LICENSE b/advancedcontentfilter/vendor/symfony/cache/LICENSE
index fcd3fa76..a7ec7080 100644
--- a/advancedcontentfilter/vendor/symfony/cache/LICENSE
+++ b/advancedcontentfilter/vendor/symfony/cache/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2016-2018 Fabien Potencier
+Copyright (c) 2016-2020 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/AbstractCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/AbstractCache.php
index e666effa..baedb737 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/AbstractCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/AbstractCache.php
@@ -15,14 +15,19 @@ use Psr\Log\LoggerAwareInterface;
 use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
-use Symfony\Component\Cache\Traits\AbstractTrait;
 use Symfony\Component\Cache\ResettableInterface;
+use Symfony\Component\Cache\Traits\AbstractTrait;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
 abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, ResettableInterface
 {
+    /**
+     * @internal
+     */
+    const NS_SEPARATOR = ':';
+
     use AbstractTrait {
         deleteItems as private;
         AbstractTrait::deleteItem as delete;
@@ -39,8 +44,8 @@ abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, Re
     {
         $this->defaultLifetime = max(0, (int) $defaultLifetime);
         $this->namespace = '' === $namespace ? '' : CacheItem::validateKey($namespace).':';
-        if (null !== $this->maxIdLength && strlen($namespace) > $this->maxIdLength - 24) {
-            throw new InvalidArgumentException(sprintf('Namespace must be %d chars max, %d given ("%s")', $this->maxIdLength - 24, strlen($namespace), $namespace));
+        if (null !== $this->maxIdLength && \strlen($namespace) > $this->maxIdLength - 24) {
+            throw new InvalidArgumentException(sprintf('Namespace must be %d chars max, %d given ("%s").', $this->maxIdLength - 24, \strlen($namespace), $namespace));
         }
     }
 
@@ -52,11 +57,11 @@ abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, Re
         $id = $this->getId($key);
 
         try {
-            foreach ($this->doFetch(array($id)) as $value) {
+            foreach ($this->doFetch([$id]) as $value) {
                 return $value;
             }
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to fetch key "{key}"', array('key' => $key, 'exception' => $e));
+            CacheItem::log($this->logger, 'Failed to fetch key "{key}"', ['key' => $key, 'exception' => $e]);
         }
 
         return $default;
@@ -69,7 +74,7 @@ abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, Re
     {
         CacheItem::validateKey($key);
 
-        return $this->setMultiple(array($key => $value), $ttl);
+        return $this->setMultiple([$key => $value], $ttl);
     }
 
     /**
@@ -79,10 +84,10 @@ abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, Re
     {
         if ($keys instanceof \Traversable) {
             $keys = iterator_to_array($keys, false);
-        } elseif (!is_array($keys)) {
-            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', is_object($keys) ? get_class($keys) : gettype($keys)));
+        } elseif (!\is_array($keys)) {
+            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys)));
         }
-        $ids = array();
+        $ids = [];
 
         foreach ($keys as $key) {
             $ids[] = $this->getId($key);
@@ -90,8 +95,8 @@ abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, Re
         try {
             $values = $this->doFetch($ids);
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to fetch requested values', array('keys' => $keys, 'exception' => $e));
-            $values = array();
+            CacheItem::log($this->logger, 'Failed to fetch requested values', ['keys' => $keys, 'exception' => $e]);
+            $values = [];
         }
         $ids = array_combine($ids, $keys);
 
@@ -103,13 +108,13 @@ abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, Re
      */
     public function setMultiple($values, $ttl = null)
     {
-        if (!is_array($values) && !$values instanceof \Traversable) {
-            throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given', is_object($values) ? get_class($values) : gettype($values)));
+        if (!\is_array($values) && !$values instanceof \Traversable) {
+            throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given.', \is_object($values) ? \get_class($values) : \gettype($values)));
         }
-        $valuesById = array();
+        $valuesById = [];
 
         foreach ($values as $key => $value) {
-            if (is_int($key)) {
+            if (\is_int($key)) {
                 $key = (string) $key;
             }
             $valuesById[$this->getId($key)] = $value;
@@ -122,14 +127,14 @@ abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, Re
             $e = $this->doSave($valuesById, $ttl);
         } catch (\Exception $e) {
         }
-        if (true === $e || array() === $e) {
+        if (true === $e || [] === $e) {
             return true;
         }
-        $keys = array();
-        foreach (is_array($e) ? $e : array_keys($valuesById) as $id) {
-            $keys[] = substr($id, strlen($this->namespace));
+        $keys = [];
+        foreach (\is_array($e) ? $e : array_keys($valuesById) as $id) {
+            $keys[] = substr($id, \strlen($this->namespace));
         }
-        CacheItem::log($this->logger, 'Failed to save values', array('keys' => $keys, 'exception' => $e instanceof \Exception ? $e : null));
+        CacheItem::log($this->logger, 'Failed to save values', ['keys' => $keys, 'exception' => $e instanceof \Exception ? $e : null]);
 
         return false;
     }
@@ -141,8 +146,8 @@ abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, Re
     {
         if ($keys instanceof \Traversable) {
             $keys = iterator_to_array($keys, false);
-        } elseif (!is_array($keys)) {
-            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', is_object($keys) ? get_class($keys) : gettype($keys)));
+        } elseif (!\is_array($keys)) {
+            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys)));
         }
 
         return $this->deleteItems($keys);
@@ -156,11 +161,11 @@ abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, Re
         if ($ttl instanceof \DateInterval) {
             $ttl = (int) \DateTime::createFromFormat('U', 0)->add($ttl)->format('U');
         }
-        if (is_int($ttl)) {
+        if (\is_int($ttl)) {
             return 0 < $ttl ? $ttl : false;
         }
 
-        throw new InvalidArgumentException(sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given', is_object($ttl) ? get_class($ttl) : gettype($ttl)));
+        throw new InvalidArgumentException(sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given.', \is_object($ttl) ? \get_class($ttl) : \gettype($ttl)));
     }
 
     private function generateValues($values, &$keys, $default)
@@ -175,7 +180,7 @@ abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, Re
                 yield $key => $value;
             }
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to fetch requested values', array('keys' => array_values($keys), 'exception' => $e));
+            CacheItem::log($this->logger, 'Failed to fetch requested values', ['keys' => array_values($keys), 'exception' => $e]);
         }
 
         foreach ($keys as $key) {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/ArrayCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/ArrayCache.php
index 8d027cd2..6013f0ad 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/ArrayCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/ArrayCache.php
@@ -45,7 +45,7 @@ class ArrayCache implements CacheInterface, LoggerAwareInterface, ResettableInte
      */
     public function get($key, $default = null)
     {
-        foreach ($this->getMultiple(array($key), $default) as $v) {
+        foreach ($this->getMultiple([$key], $default) as $v) {
             return $v;
         }
     }
@@ -57,8 +57,8 @@ class ArrayCache implements CacheInterface, LoggerAwareInterface, ResettableInte
     {
         if ($keys instanceof \Traversable) {
             $keys = iterator_to_array($keys, false);
-        } elseif (!is_array($keys)) {
-            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', is_object($keys) ? get_class($keys) : gettype($keys)));
+        } elseif (!\is_array($keys)) {
+            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys)));
         }
         foreach ($keys as $key) {
             CacheItem::validateKey($key);
@@ -72,8 +72,8 @@ class ArrayCache implements CacheInterface, LoggerAwareInterface, ResettableInte
      */
     public function deleteMultiple($keys)
     {
-        if (!is_array($keys) && !$keys instanceof \Traversable) {
-            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', is_object($keys) ? get_class($keys) : gettype($keys)));
+        if (!\is_array($keys) && !$keys instanceof \Traversable) {
+            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys)));
         }
         foreach ($keys as $key) {
             $this->delete($key);
@@ -89,7 +89,7 @@ class ArrayCache implements CacheInterface, LoggerAwareInterface, ResettableInte
     {
         CacheItem::validateKey($key);
 
-        return $this->setMultiple(array($key => $value), $ttl);
+        return $this->setMultiple([$key => $value], $ttl);
     }
 
     /**
@@ -97,13 +97,13 @@ class ArrayCache implements CacheInterface, LoggerAwareInterface, ResettableInte
      */
     public function setMultiple($values, $ttl = null)
     {
-        if (!is_array($values) && !$values instanceof \Traversable) {
-            throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given', is_object($values) ? get_class($values) : gettype($values)));
+        if (!\is_array($values) && !$values instanceof \Traversable) {
+            throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given.', \is_object($values) ? \get_class($values) : \gettype($values)));
         }
-        $valuesArray = array();
+        $valuesArray = [];
 
         foreach ($values as $key => $value) {
-            is_int($key) || CacheItem::validateKey($key);
+            \is_int($key) || CacheItem::validateKey($key);
             $valuesArray[$key] = $value;
         }
         if (false === $ttl = $this->normalizeTtl($ttl)) {
@@ -114,14 +114,14 @@ class ArrayCache implements CacheInterface, LoggerAwareInterface, ResettableInte
                 try {
                     $valuesArray[$key] = serialize($value);
                 } catch (\Exception $e) {
-                    $type = is_object($value) ? get_class($value) : gettype($value);
-                    CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', array('key' => $key, 'type' => $type, 'exception' => $e));
+                    $type = \is_object($value) ? \get_class($value) : \gettype($value);
+                    CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', ['key' => $key, 'type' => $type, 'exception' => $e]);
 
                     return false;
                 }
             }
         }
-        $expiry = 0 < $ttl ? time() + $ttl : PHP_INT_MAX;
+        $expiry = 0 < $ttl ? time() + $ttl : \PHP_INT_MAX;
 
         foreach ($valuesArray as $key => $value) {
             $this->values[$key] = $value;
@@ -139,10 +139,10 @@ class ArrayCache implements CacheInterface, LoggerAwareInterface, ResettableInte
         if ($ttl instanceof \DateInterval) {
             $ttl = (int) \DateTime::createFromFormat('U', 0)->add($ttl)->format('U');
         }
-        if (is_int($ttl)) {
+        if (\is_int($ttl)) {
             return 0 < $ttl ? $ttl : false;
         }
 
-        throw new InvalidArgumentException(sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given', is_object($ttl) ? get_class($ttl) : gettype($ttl)));
+        throw new InvalidArgumentException(sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given.', \is_object($ttl) ? \get_class($ttl) : \gettype($ttl)));
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/ChainCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/ChainCache.php
index 9d0c7587..2e6c7277 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/ChainCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/ChainCache.php
@@ -27,7 +27,7 @@ use Symfony\Component\Cache\ResettableInterface;
 class ChainCache implements CacheInterface, PruneableInterface, ResettableInterface
 {
     private $miss;
-    private $caches = array();
+    private $caches = [];
     private $defaultLifetime;
     private $cacheCount;
 
@@ -43,13 +43,13 @@ class ChainCache implements CacheInterface, PruneableInterface, ResettableInterf
 
         foreach ($caches as $cache) {
             if (!$cache instanceof CacheInterface) {
-                throw new InvalidArgumentException(sprintf('The class "%s" does not implement the "%s" interface.', get_class($cache), CacheInterface::class));
+                throw new InvalidArgumentException(sprintf('The class "%s" does not implement the "%s" interface.', \get_class($cache), CacheInterface::class));
             }
         }
 
         $this->miss = new \stdClass();
         $this->caches = array_values($caches);
-        $this->cacheCount = count($this->caches);
+        $this->cacheCount = \count($this->caches);
         $this->defaultLifetime = 0 < $defaultLifetime ? (int) $defaultLifetime : null;
     }
 
@@ -58,7 +58,7 @@ class ChainCache implements CacheInterface, PruneableInterface, ResettableInterf
      */
     public function get($key, $default = null)
     {
-        $miss = null !== $default && is_object($default) ? $default : $this->miss;
+        $miss = null !== $default && \is_object($default) ? $default : $this->miss;
 
         foreach ($this->caches as $i => $cache) {
             $value = $cache->get($key, $miss);
@@ -80,14 +80,14 @@ class ChainCache implements CacheInterface, PruneableInterface, ResettableInterf
      */
     public function getMultiple($keys, $default = null)
     {
-        $miss = null !== $default && is_object($default) ? $default : $this->miss;
+        $miss = null !== $default && \is_object($default) ? $default : $this->miss;
 
         return $this->generateItems($this->caches[0]->getMultiple($keys, $miss), 0, $miss, $default);
     }
 
     private function generateItems($values, $cacheIndex, $miss, $default)
     {
-        $missing = array();
+        $missing = [];
         $nextCacheIndex = $cacheIndex + 1;
         $nextCache = isset($this->caches[$nextCacheIndex]) ? $this->caches[$nextCacheIndex] : null;
 
@@ -201,7 +201,7 @@ class ChainCache implements CacheInterface, PruneableInterface, ResettableInterf
         if ($values instanceof \Traversable) {
             $valuesIterator = $values;
             $values = function () use ($valuesIterator, &$values) {
-                $generatedValues = array();
+                $generatedValues = [];
 
                 foreach ($valuesIterator as $key => $value) {
                     yield $key => $value;
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/DoctrineCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/DoctrineCache.php
index 00f0b9c6..ea1a4eda 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/DoctrineCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/DoctrineCache.php
@@ -19,9 +19,8 @@ class DoctrineCache extends AbstractCache
     use DoctrineTrait;
 
     /**
-     * @param CacheProvider $provider
-     * @param string        $namespace
-     * @param int           $defaultLifetime
+     * @param string $namespace
+     * @param int    $defaultLifetime
      */
     public function __construct(CacheProvider $provider, $namespace = '', $defaultLifetime = 0)
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/MemcachedCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/MemcachedCache.php
index 77177406..94a9f297 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/MemcachedCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/MemcachedCache.php
@@ -20,9 +20,8 @@ class MemcachedCache extends AbstractCache
     protected $maxIdLength = 250;
 
     /**
-     * @param \Memcached $client
-     * @param string     $namespace
-     * @param int        $defaultLifetime
+     * @param string $namespace
+     * @param int    $defaultLifetime
      */
     public function __construct(\Memcached $client, $namespace = '', $defaultLifetime = 0)
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/PdoCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/PdoCache.php
index 931a3b1f..c92e049a 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/PdoCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/PdoCache.php
@@ -33,7 +33,7 @@ class PdoCache extends AbstractCache implements PruneableInterface
      *  * db_time_col: The column where to store the timestamp [default: item_time]
      *  * db_username: The username when lazy-connect [default: '']
      *  * db_password: The password when lazy-connect [default: '']
-     *  * db_connection_options: An array of driver-specific connection options [default: array()]
+     *  * db_connection_options: An array of driver-specific connection options [default: []]
      *
      * @param \PDO|Connection|string $connOrDsn       A \PDO or Connection instance or DSN string or null
      * @param string                 $namespace
@@ -44,7 +44,7 @@ class PdoCache extends AbstractCache implements PruneableInterface
      * @throws InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION
      * @throws InvalidArgumentException When namespace contains invalid characters
      */
-    public function __construct($connOrDsn, $namespace = '', $defaultLifetime = 0, array $options = array())
+    public function __construct($connOrDsn, $namespace = '', $defaultLifetime = 0, array $options = [])
     {
         $this->init($connOrDsn, $namespace, $defaultLifetime, $options);
     }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/PhpArrayCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/PhpArrayCache.php
index 3db8a2ac..7bb25ff8 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/PhpArrayCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/PhpArrayCache.php
@@ -13,9 +13,9 @@ namespace Symfony\Component\Cache\Simple;
 
 use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
-use Symfony\Component\Cache\Traits\PhpArrayTrait;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\ResettableInterface;
+use Symfony\Component\Cache\Traits\PhpArrayTrait;
 
 /**
  * Caches items at warm up time using a PHP array that is stored in shared memory by OPCache since PHP 7.0.
@@ -36,7 +36,7 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
     {
         $this->file = $file;
         $this->pool = $fallbackPool;
-        $this->zendDetectUnicode = ini_get('zend.detect_unicode');
+        $this->zendDetectUnicode = filter_var(ini_get('zend.detect_unicode'), \FILTER_VALIDATE_BOOLEAN);
     }
 
     /**
@@ -44,14 +44,14 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
      * stores arrays in its latest versions. This factory method decorates the given
      * fallback pool with this adapter only if the current PHP version is supported.
      *
-     * @param string $file The PHP file were values are cached
+     * @param string         $file         The PHP file were values are cached
+     * @param CacheInterface $fallbackPool A pool to fallback on when an item is not hit
      *
      * @return CacheInterface
      */
     public static function create($file, CacheInterface $fallbackPool)
     {
-        // Shared memory is available in PHP 7.0+ with OPCache enabled and in HHVM
-        if ((\PHP_VERSION_ID >= 70000 && ini_get('opcache.enable')) || defined('HHVM_VERSION')) {
+        if (\PHP_VERSION_ID >= 70000) {
             return new static($file, $fallbackPool);
         }
 
@@ -63,8 +63,8 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
      */
     public function get($key, $default = null)
     {
-        if (!is_string($key)) {
-            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
+        if (!\is_string($key)) {
+            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
         }
         if (null === $this->values) {
             $this->initialize();
@@ -77,7 +77,7 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
 
         if ('N;' === $value) {
             $value = null;
-        } elseif (is_string($value) && isset($value[2]) && ':' === $value[1]) {
+        } elseif (\is_string($value) && isset($value[2]) && ':' === $value[1]) {
             try {
                 $e = null;
                 $value = unserialize($value);
@@ -99,12 +99,12 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
     {
         if ($keys instanceof \Traversable) {
             $keys = iterator_to_array($keys, false);
-        } elseif (!is_array($keys)) {
-            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', is_object($keys) ? get_class($keys) : gettype($keys)));
+        } elseif (!\is_array($keys)) {
+            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys)));
         }
         foreach ($keys as $key) {
-            if (!is_string($key)) {
-                throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
+            if (!\is_string($key)) {
+                throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
             }
         }
         if (null === $this->values) {
@@ -119,8 +119,8 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
      */
     public function has($key)
     {
-        if (!is_string($key)) {
-            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
+        if (!\is_string($key)) {
+            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
         }
         if (null === $this->values) {
             $this->initialize();
@@ -134,8 +134,8 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
      */
     public function delete($key)
     {
-        if (!is_string($key)) {
-            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
+        if (!\is_string($key)) {
+            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
         }
         if (null === $this->values) {
             $this->initialize();
@@ -149,16 +149,16 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
      */
     public function deleteMultiple($keys)
     {
-        if (!is_array($keys) && !$keys instanceof \Traversable) {
-            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', is_object($keys) ? get_class($keys) : gettype($keys)));
+        if (!\is_array($keys) && !$keys instanceof \Traversable) {
+            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys)));
         }
 
         $deleted = true;
-        $fallbackKeys = array();
+        $fallbackKeys = [];
 
         foreach ($keys as $key) {
-            if (!is_string($key)) {
-                throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
+            if (!\is_string($key)) {
+                throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
             }
 
             if (isset($this->values[$key])) {
@@ -183,8 +183,8 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
      */
     public function set($key, $value, $ttl = null)
     {
-        if (!is_string($key)) {
-            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
+        if (!\is_string($key)) {
+            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
         }
         if (null === $this->values) {
             $this->initialize();
@@ -198,16 +198,16 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
      */
     public function setMultiple($values, $ttl = null)
     {
-        if (!is_array($values) && !$values instanceof \Traversable) {
-            throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given', is_object($values) ? get_class($values) : gettype($values)));
+        if (!\is_array($values) && !$values instanceof \Traversable) {
+            throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given.', \is_object($values) ? \get_class($values) : \gettype($values)));
         }
 
         $saved = true;
-        $fallbackValues = array();
+        $fallbackValues = [];
 
         foreach ($values as $key => $value) {
-            if (!is_string($key) && !is_int($key)) {
-                throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
+            if (!\is_string($key) && !\is_int($key)) {
+                throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
             }
 
             if (isset($this->values[$key])) {
@@ -226,7 +226,7 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
 
     private function generateItems(array $keys, $default)
     {
-        $fallbackKeys = array();
+        $fallbackKeys = [];
 
         foreach ($keys as $key) {
             if (isset($this->values[$key])) {
@@ -234,7 +234,7 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
 
                 if ('N;' === $value) {
                     yield $key => null;
-                } elseif (is_string($value) && isset($value[2]) && ':' === $value[1]) {
+                } elseif (\is_string($value) && isset($value[2]) && ':' === $value[1]) {
                     try {
                         yield $key => unserialize($value);
                     } catch (\Error $e) {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/PhpFilesCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/PhpFilesCache.php
index 9231c8cd..50c19034 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/PhpFilesCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/PhpFilesCache.php
@@ -29,13 +29,13 @@ class PhpFilesCache extends AbstractCache implements PruneableInterface
     public function __construct($namespace = '', $defaultLifetime = 0, $directory = null)
     {
         if (!static::isSupported()) {
-            throw new CacheException('OPcache is not enabled');
+            throw new CacheException('OPcache is not enabled.');
         }
         parent::__construct('', $defaultLifetime);
         $this->init($namespace, $directory);
 
         $e = new \Exception();
         $this->includeHandler = function () use ($e) { throw $e; };
-        $this->zendDetectUnicode = ini_get('zend.detect_unicode');
+        $this->zendDetectUnicode = filter_var(ini_get('zend.detect_unicode'), \FILTER_VALIDATE_BOOLEAN);
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/Psr6Cache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/Psr6Cache.php
index 81f14d4a..6b3de205 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/Psr6Cache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/Psr6Cache.php
@@ -11,11 +11,11 @@
 
 namespace Symfony\Component\Cache\Simple;
 
-use Psr\Cache\CacheItemPoolInterface;
 use Psr\Cache\CacheException as Psr6CacheException;
-use Psr\SimpleCache\CacheInterface;
+use Psr\Cache\CacheItemPoolInterface;
 use Psr\SimpleCache\CacheException as SimpleCacheException;
-use Symfony\Component\Cache\Adapter\AbstractAdapter;
+use Psr\SimpleCache\CacheInterface;
+use Symfony\Component\Cache\Adapter\AdapterInterface;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\PruneableInterface;
@@ -30,27 +30,36 @@ class Psr6Cache implements CacheInterface, PruneableInterface, ResettableInterfa
     use ProxyTrait;
 
     private $createCacheItem;
+    private $cacheItemPrototype;
 
     public function __construct(CacheItemPoolInterface $pool)
     {
         $this->pool = $pool;
 
-        if ($pool instanceof AbstractAdapter) {
-            $this->createCacheItem = \Closure::bind(
-                function ($key, $value, $allowInt = false) {
-                    if ($allowInt && is_int($key)) {
-                        $key = (string) $key;
-                    } else {
-                        CacheItem::validateKey($key);
-                    }
-                    $f = $this->createCacheItem;
-
-                    return $f($key, $value, false);
-                },
-                $pool,
-                AbstractAdapter::class
-            );
+        if (!$pool instanceof AdapterInterface) {
+            return;
         }
+        $cacheItemPrototype = &$this->cacheItemPrototype;
+        $createCacheItem = \Closure::bind(
+            static function ($key, $value, $allowInt = false) use (&$cacheItemPrototype) {
+                $item = clone $cacheItemPrototype;
+                $item->key = $allowInt && \is_int($key) ? (string) $key : CacheItem::validateKey($key);
+                $item->value = $value;
+                $item->isHit = false;
+
+                return $item;
+            },
+            null,
+            CacheItem::class
+        );
+        $this->createCacheItem = function ($key, $value, $allowInt = false) use ($createCacheItem) {
+            if (null === $this->cacheItemPrototype) {
+                $this->get($allowInt && \is_int($key) ? (string) $key : $key);
+            }
+            $this->createCacheItem = $createCacheItem;
+
+            return $createCacheItem($key, $value, $allowInt);
+        };
     }
 
     /**
@@ -65,6 +74,10 @@ class Psr6Cache implements CacheInterface, PruneableInterface, ResettableInterfa
         } catch (Psr6CacheException $e) {
             throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
         }
+        if (null === $this->cacheItemPrototype) {
+            $this->cacheItemPrototype = clone $item;
+            $this->cacheItemPrototype->set(null);
+        }
 
         return $item->isHit() ? $item->get() : $default;
     }
@@ -121,8 +134,8 @@ class Psr6Cache implements CacheInterface, PruneableInterface, ResettableInterfa
     {
         if ($keys instanceof \Traversable) {
             $keys = iterator_to_array($keys, false);
-        } elseif (!is_array($keys)) {
-            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', is_object($keys) ? get_class($keys) : gettype($keys)));
+        } elseif (!\is_array($keys)) {
+            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys)));
         }
 
         try {
@@ -132,7 +145,7 @@ class Psr6Cache implements CacheInterface, PruneableInterface, ResettableInterfa
         } catch (Psr6CacheException $e) {
             throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
         }
-        $values = array();
+        $values = [];
 
         foreach ($items as $key => $item) {
             $values[$key] = $item->isHit() ? $item->get() : $default;
@@ -146,11 +159,11 @@ class Psr6Cache implements CacheInterface, PruneableInterface, ResettableInterfa
      */
     public function setMultiple($values, $ttl = null)
     {
-        $valuesIsArray = is_array($values);
+        $valuesIsArray = \is_array($values);
         if (!$valuesIsArray && !$values instanceof \Traversable) {
-            throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given', is_object($values) ? get_class($values) : gettype($values)));
+            throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given.', \is_object($values) ? \get_class($values) : \gettype($values)));
         }
-        $items = array();
+        $items = [];
 
         try {
             if (null !== $f = $this->createCacheItem) {
@@ -159,14 +172,14 @@ class Psr6Cache implements CacheInterface, PruneableInterface, ResettableInterfa
                     $items[$key] = $f($key, $value, true);
                 }
             } elseif ($valuesIsArray) {
-                $items = array();
+                $items = [];
                 foreach ($values as $key => $value) {
                     $items[] = (string) $key;
                 }
                 $items = $this->pool->getItems($items);
             } else {
                 foreach ($values as $key => $value) {
-                    if (is_int($key)) {
+                    if (\is_int($key)) {
                         $key = (string) $key;
                     }
                     $items[$key] = $this->pool->getItem($key)->set($value);
@@ -199,8 +212,8 @@ class Psr6Cache implements CacheInterface, PruneableInterface, ResettableInterfa
     {
         if ($keys instanceof \Traversable) {
             $keys = iterator_to_array($keys, false);
-        } elseif (!is_array($keys)) {
-            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', is_object($keys) ? get_class($keys) : gettype($keys)));
+        } elseif (!\is_array($keys)) {
+            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys)));
         }
 
         try {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/TraceableCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/TraceableCache.php
index 756403bf..61b22963 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/TraceableCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/TraceableCache.php
@@ -24,7 +24,7 @@ class TraceableCache implements CacheInterface, PruneableInterface, ResettableIn
 {
     private $pool;
     private $miss;
-    private $calls = array();
+    private $calls = [];
 
     public function __construct(CacheInterface $pool)
     {
@@ -37,7 +37,7 @@ class TraceableCache implements CacheInterface, PruneableInterface, ResettableIn
      */
     public function get($key, $default = null)
     {
-        $miss = null !== $default && is_object($default) ? $default : $this->miss;
+        $miss = null !== $default && \is_object($default) ? $default : $this->miss;
         $event = $this->start(__FUNCTION__);
         try {
             $value = $this->pool->get($key, $miss);
@@ -99,7 +99,7 @@ class TraceableCache implements CacheInterface, PruneableInterface, ResettableIn
     public function setMultiple($values, $ttl = null)
     {
         $event = $this->start(__FUNCTION__);
-        $event->result['keys'] = array();
+        $event->result['keys'] = [];
 
         if ($values instanceof \Traversable) {
             $values = function () use ($values, $event) {
@@ -109,7 +109,7 @@ class TraceableCache implements CacheInterface, PruneableInterface, ResettableIn
                 }
             };
             $values = $values();
-        } elseif (is_array($values)) {
+        } elseif (\is_array($values)) {
             $event->result['keys'] = array_keys($values);
         }
 
@@ -125,7 +125,7 @@ class TraceableCache implements CacheInterface, PruneableInterface, ResettableIn
      */
     public function getMultiple($keys, $default = null)
     {
-        $miss = null !== $default && is_object($default) ? $default : $this->miss;
+        $miss = null !== $default && \is_object($default) ? $default : $this->miss;
         $event = $this->start(__FUNCTION__);
         try {
             $result = $this->pool->getMultiple($keys, $miss);
@@ -133,7 +133,7 @@ class TraceableCache implements CacheInterface, PruneableInterface, ResettableIn
             $event->end = microtime(true);
         }
         $f = function () use ($result, $event, $miss, $default) {
-            $event->result = array();
+            $event->result = [];
             foreach ($result as $key => $value) {
                 if ($event->result[$key] = $miss !== $value) {
                     ++$event->hits;
@@ -216,7 +216,7 @@ class TraceableCache implements CacheInterface, PruneableInterface, ResettableIn
         try {
             return $this->calls;
         } finally {
-            $this->calls = array();
+            $this->calls = [];
         }
     }
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/AbstractRedisAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/AbstractRedisAdapterTest.php
index d9353821..0e8ed001 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/AbstractRedisAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/AbstractRedisAdapterTest.php
@@ -15,11 +15,11 @@ use Symfony\Component\Cache\Adapter\RedisAdapter;
 
 abstract class AbstractRedisAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testExpiration' => 'Testing expiration slows down the test suite',
         'testHasItemReturnsFalseWhenDeferredItemIsExpired' => 'Testing expiration slows down the test suite',
         'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
-    );
+    ];
 
     protected static $redis;
 
@@ -28,14 +28,15 @@ abstract class AbstractRedisAdapterTest extends AdapterTestCase
         return new RedisAdapter(self::$redis, str_replace('\\', '.', __CLASS__), $defaultLifetime);
     }
 
-    public static function setupBeforeClass()
+    public static function setUpBeforeClass()
     {
-        if (!extension_loaded('redis')) {
+        if (!\extension_loaded('redis')) {
             self::markTestSkipped('Extension redis required.');
         }
-        if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
-            $e = error_get_last();
-            self::markTestSkipped($e['message']);
+        try {
+            (new \Redis())->connect(getenv('REDIS_HOST'));
+        } catch (\Exception $e) {
+            self::markTestSkipped($e->getMessage());
         }
     }
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/AdapterTestCase.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/AdapterTestCase.php
index a0b74b47..5758a286 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/AdapterTestCase.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/AdapterTestCase.php
@@ -21,11 +21,11 @@ abstract class AdapterTestCase extends CachePoolTest
     {
         parent::setUp();
 
-        if (!array_key_exists('testDeferredSaveWithoutCommit', $this->skippedTests) && defined('HHVM_VERSION')) {
+        if (!\array_key_exists('testDeferredSaveWithoutCommit', $this->skippedTests) && \defined('HHVM_VERSION')) {
             $this->skippedTests['testDeferredSaveWithoutCommit'] = 'Destructors are called late on HHVM.';
         }
 
-        if (!array_key_exists('testPrune', $this->skippedTests) && !$this->createCachePool() instanceof PruneableInterface) {
+        if (!\array_key_exists('testPrune', $this->skippedTests) && !$this->createCachePool() instanceof PruneableInterface) {
             $this->skippedTests['testPrune'] = 'Not a pruneable cache pool.';
         }
     }
@@ -85,11 +85,11 @@ abstract class AdapterTestCase extends CachePoolTest
         $item = $cache->getItem('foo');
         $this->assertFalse($item->isHit());
 
-        foreach ($cache->getItems(array('foo')) as $item) {
+        foreach ($cache->getItems(['foo']) as $item) {
         }
         $cache->save($item->set(new NotUnserializable()));
 
-        foreach ($cache->getItems(array('foo')) as $item) {
+        foreach ($cache->getItems(['foo']) as $item) {
         }
         $this->assertFalse($item->isHit());
     }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ApcuAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ApcuAdapterTest.php
index 72df12e4..f55a1b9b 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ApcuAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ApcuAdapterTest.php
@@ -16,23 +16,23 @@ use Symfony\Component\Cache\Adapter\ApcuAdapter;
 
 class ApcuAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testExpiration' => 'Testing expiration slows down the test suite',
         'testHasItemReturnsFalseWhenDeferredItemIsExpired' => 'Testing expiration slows down the test suite',
         'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
-    );
+    ];
 
     public function createCachePool($defaultLifetime = 0)
     {
-        if (!function_exists('apcu_fetch') || !ini_get('apc.enabled')) {
+        if (!\function_exists('apcu_fetch') || !filter_var(ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN)) {
             $this->markTestSkipped('APCu extension is required.');
         }
-        if ('cli' === PHP_SAPI && !ini_get('apc.enable_cli')) {
+        if ('cli' === \PHP_SAPI && !filter_var(ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN)) {
             if ('testWithCliSapi' !== $this->getName()) {
                 $this->markTestSkipped('apc.enable_cli=1 is required.');
             }
         }
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('Fails transiently on Windows.');
         }
 
@@ -54,7 +54,7 @@ class ApcuAdapterTest extends AdapterTestCase
 
     public function testVersion()
     {
-        $namespace = str_replace('\\', '.', get_class($this));
+        $namespace = str_replace('\\', '.', static::class);
 
         $pool1 = new ApcuAdapter($namespace, 0, 'p1');
 
@@ -79,7 +79,7 @@ class ApcuAdapterTest extends AdapterTestCase
 
     public function testNamespace()
     {
-        $namespace = str_replace('\\', '.', get_class($this));
+        $namespace = str_replace('\\', '.', static::class);
 
         $pool1 = new ApcuAdapter($namespace.'_1', 0, 'p1');
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ArrayAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ArrayAdapterTest.php
index 725d7901..e6adc9d0 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ArrayAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ArrayAdapterTest.php
@@ -18,10 +18,10 @@ use Symfony\Component\Cache\Adapter\ArrayAdapter;
  */
 class ArrayAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayAdapter is not.',
         'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayAdapter is not.',
-    );
+    ];
 
     public function createCachePool($defaultLifetime = 0)
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ChainAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ChainAdapterTest.php
index 293a90cc..be811d6f 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ChainAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ChainAdapterTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Cache\Tests\Adapter;
 
+use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Component\Cache\Adapter\AdapterInterface;
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Cache\Adapter\ChainAdapter;
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\Tests\Fixtures\ExternalAdapter;
 
@@ -26,25 +27,21 @@ class ChainAdapterTest extends AdapterTestCase
 {
     public function createCachePool($defaultLifetime = 0)
     {
-        return new ChainAdapter(array(new ArrayAdapter($defaultLifetime), new ExternalAdapter(), new FilesystemAdapter('', $defaultLifetime)), $defaultLifetime);
+        return new ChainAdapter([new ArrayAdapter($defaultLifetime), new ExternalAdapter($defaultLifetime), new FilesystemAdapter('', $defaultLifetime)], $defaultLifetime);
     }
 
-    /**
-     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
-     * @expectedExceptionMessage At least one adapter must be specified.
-     */
     public function testEmptyAdaptersException()
     {
-        new ChainAdapter(array());
+        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('At least one adapter must be specified.');
+        new ChainAdapter([]);
     }
 
-    /**
-     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
-     * @expectedExceptionMessage The class "stdClass" does not implement
-     */
     public function testInvalidAdapterException()
     {
-        new ChainAdapter(array(new \stdClass()));
+        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('The class "stdClass" does not implement');
+        new ChainAdapter([new \stdClass()]);
     }
 
     public function testPrune()
@@ -53,23 +50,141 @@ class ChainAdapterTest extends AdapterTestCase
             $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
         }
 
-        $cache = new ChainAdapter(array(
+        $cache = new ChainAdapter([
             $this->getPruneableMock(),
             $this->getNonPruneableMock(),
             $this->getPruneableMock(),
-        ));
+        ]);
         $this->assertTrue($cache->prune());
 
-        $cache = new ChainAdapter(array(
+        $cache = new ChainAdapter([
             $this->getPruneableMock(),
             $this->getFailingPruneableMock(),
             $this->getPruneableMock(),
-        ));
+        ]);
         $this->assertFalse($cache->prune());
     }
 
+    public function testMultipleCachesExpirationWhenCommonTtlIsNotSet()
+    {
+        if (isset($this->skippedTests[__FUNCTION__])) {
+            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
+        }
+
+        $adapter1 = new ArrayAdapter(4);
+        $adapter2 = new ArrayAdapter(2);
+
+        $cache = new ChainAdapter([$adapter1, $adapter2]);
+
+        $cache->save($cache->getItem('key')->set('value'));
+
+        $item = $adapter1->getItem('key');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value', $item->get());
+
+        $item = $adapter2->getItem('key');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value', $item->get());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value', $item->get());
+
+        $item = $adapter2->getItem('key');
+        $this->assertFalse($item->isHit());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key');
+        $this->assertFalse($item->isHit());
+
+        $adapter2->save($adapter2->getItem('key1')->set('value1'));
+
+        $item = $cache->getItem('key1');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value1', $item->get());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key1');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value1', $item->get());
+
+        $item = $adapter2->getItem('key1');
+        $this->assertFalse($item->isHit());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key1');
+        $this->assertFalse($item->isHit());
+    }
+
+    public function testMultipleCachesExpirationWhenCommonTtlIsSet()
+    {
+        if (isset($this->skippedTests[__FUNCTION__])) {
+            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
+        }
+
+        $adapter1 = new ArrayAdapter(4);
+        $adapter2 = new ArrayAdapter(2);
+
+        $cache = new ChainAdapter([$adapter1, $adapter2], 6);
+
+        $cache->save($cache->getItem('key')->set('value'));
+
+        $item = $adapter1->getItem('key');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value', $item->get());
+
+        $item = $adapter2->getItem('key');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value', $item->get());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value', $item->get());
+
+        $item = $adapter2->getItem('key');
+        $this->assertFalse($item->isHit());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key');
+        $this->assertFalse($item->isHit());
+
+        $adapter2->save($adapter2->getItem('key1')->set('value1'));
+
+        $item = $cache->getItem('key1');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value1', $item->get());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key1');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value1', $item->get());
+
+        $item = $adapter2->getItem('key1');
+        $this->assertFalse($item->isHit());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key1');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value1', $item->get());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key1');
+        $this->assertFalse($item->isHit());
+    }
+
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface
+     * @return MockObject|PruneableCacheInterface
      */
     private function getPruneableMock()
     {
@@ -80,13 +195,13 @@ class ChainAdapterTest extends AdapterTestCase
         $pruneable
             ->expects($this->atLeastOnce())
             ->method('prune')
-            ->will($this->returnValue(true));
+            ->willReturn(true);
 
         return $pruneable;
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface
+     * @return MockObject|PruneableCacheInterface
      */
     private function getFailingPruneableMock()
     {
@@ -97,13 +212,13 @@ class ChainAdapterTest extends AdapterTestCase
         $pruneable
             ->expects($this->atLeastOnce())
             ->method('prune')
-            ->will($this->returnValue(false));
+            ->willReturn(false);
 
         return $pruneable;
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|AdapterInterface
+     * @return MockObject|AdapterInterface
      */
     private function getNonPruneableMock()
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/DoctrineAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/DoctrineAdapterTest.php
index 8d4dfe28..8f520cb5 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/DoctrineAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/DoctrineAdapterTest.php
@@ -19,11 +19,11 @@ use Symfony\Component\Cache\Tests\Fixtures\ArrayCache;
  */
 class DoctrineAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayCache is not.',
         'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayCache is not.',
         'testNotUnserializable' => 'ArrayCache does not use serialize/unserialize',
-    );
+    ];
 
     public function createCachePool($defaultLifetime = 0)
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/FilesystemAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/FilesystemAdapterTest.php
index b6757514..fa830682 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/FilesystemAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/FilesystemAdapterTest.php
@@ -34,7 +34,7 @@ class FilesystemAdapterTest extends AdapterTestCase
         if (!file_exists($dir)) {
             return;
         }
-        if (!$dir || 0 !== strpos(dirname($dir), sys_get_temp_dir())) {
+        if (!$dir || 0 !== strpos(\dirname($dir), sys_get_temp_dir())) {
             throw new \Exception(__METHOD__."() operates only on subdirs of system's temp dir");
         }
         $children = new \RecursiveIteratorIterator(
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/MaxIdLengthAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/MaxIdLengthAdapterTest.php
index cf2384c5..536e2c2d 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/MaxIdLengthAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/MaxIdLengthAdapterTest.php
@@ -19,29 +19,59 @@ class MaxIdLengthAdapterTest extends TestCase
     public function testLongKey()
     {
         $cache = $this->getMockBuilder(MaxIdLengthAdapter::class)
-            ->setConstructorArgs(array(str_repeat('-', 10)))
-            ->setMethods(array('doHave', 'doFetch', 'doDelete', 'doSave', 'doClear'))
+            ->setConstructorArgs([str_repeat('-', 10)])
+            ->setMethods(['doHave', 'doFetch', 'doDelete', 'doSave', 'doClear'])
             ->getMock();
 
         $cache->expects($this->exactly(2))
             ->method('doHave')
             ->withConsecutive(
-                array($this->equalTo('----------:0GTYWa9n4ed8vqNlOT2iEr:')),
-                array($this->equalTo('----------:---------------------------------------'))
+                [$this->equalTo('----------:0GTYWa9n4ed8vqNlOT2iEr:')],
+                [$this->equalTo('----------:---------------------------------------')]
             );
 
         $cache->hasItem(str_repeat('-', 40));
         $cache->hasItem(str_repeat('-', 39));
     }
 
-    /**
-     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Namespace must be 26 chars max, 40 given ("----------------------------------------")
-     */
-    public function testTooLongNamespace()
+    public function testLongKeyVersioning()
     {
         $cache = $this->getMockBuilder(MaxIdLengthAdapter::class)
-            ->setConstructorArgs(array(str_repeat('-', 40)))
+            ->setConstructorArgs([str_repeat('-', 26)])
+            ->getMock();
+
+        $cache
+            ->method('doFetch')
+            ->willReturn(['2:']);
+
+        $reflectionClass = new \ReflectionClass(AbstractAdapter::class);
+
+        $reflectionMethod = $reflectionClass->getMethod('getId');
+        $reflectionMethod->setAccessible(true);
+
+        // No versioning enabled
+        $this->assertEquals('--------------------------:------------', $reflectionMethod->invokeArgs($cache, [str_repeat('-', 12)]));
+        $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 12)])));
+        $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 23)])));
+        $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 40)])));
+
+        $reflectionProperty = $reflectionClass->getProperty('versioningIsEnabled');
+        $reflectionProperty->setAccessible(true);
+        $reflectionProperty->setValue($cache, true);
+
+        // Versioning enabled
+        $this->assertEquals('--------------------------:2:------------', $reflectionMethod->invokeArgs($cache, [str_repeat('-', 12)]));
+        $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 12)])));
+        $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 23)])));
+        $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 40)])));
+    }
+
+    public function testTooLongNamespace()
+    {
+        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Namespace must be 26 chars max, 40 given ("----------------------------------------")');
+        $this->getMockBuilder(MaxIdLengthAdapter::class)
+            ->setConstructorArgs([str_repeat('-', 40)])
             ->getMock();
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/MemcachedAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/MemcachedAdapterTest.php
index 76e06080..a9a397dd 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/MemcachedAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/MemcachedAdapterTest.php
@@ -16,19 +16,19 @@ use Symfony\Component\Cache\Adapter\MemcachedAdapter;
 
 class MemcachedAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testHasItemReturnsFalseWhenDeferredItemIsExpired' => 'Testing expiration slows down the test suite',
         'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
-    );
+    ];
 
     protected static $client;
 
-    public static function setupBeforeClass()
+    public static function setUpBeforeClass()
     {
         if (!MemcachedAdapter::isSupported()) {
             self::markTestSkipped('Extension memcached >=2.2.0 required.');
         }
-        self::$client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), array('binary_protocol' => false));
+        self::$client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['binary_protocol' => false]);
         self::$client->get('foo');
         $code = self::$client->getResultCode();
 
@@ -46,13 +46,13 @@ class MemcachedAdapterTest extends AdapterTestCase
 
     public function testOptions()
     {
-        $client = MemcachedAdapter::createConnection(array(), array(
+        $client = MemcachedAdapter::createConnection([], [
             'libketama_compatible' => false,
             'distribution' => 'modula',
             'compression' => true,
             'serializer' => 'php',
             'hash' => 'md5',
-        ));
+        ]);
 
         $this->assertSame(\Memcached::SERIALIZER_PHP, $client->getOption(\Memcached::OPT_SERIALIZER));
         $this->assertSame(\Memcached::HASH_MD5, $client->getOption(\Memcached::OPT_HASH));
@@ -63,46 +63,51 @@ class MemcachedAdapterTest extends AdapterTestCase
 
     /**
      * @dataProvider provideBadOptions
-     * @expectedException \ErrorException
-     * @expectedExceptionMessage constant(): Couldn't find constant Memcached::
      */
     public function testBadOptions($name, $value)
     {
-        MemcachedAdapter::createConnection(array(), array($name => $value));
+        if (\PHP_VERSION_ID < 80000) {
+            $this->expectException('ErrorException');
+            $this->expectExceptionMessage('constant(): Couldn\'t find constant Memcached::');
+        } else {
+            $this->expectException('Error');
+            $this->expectExceptionMessage('Undefined constant Memcached::');
+        }
+
+        MemcachedAdapter::createConnection([], [$name => $value]);
     }
 
     public function provideBadOptions()
     {
-        return array(
-            array('foo', 'bar'),
-            array('hash', 'zyx'),
-            array('serializer', 'zyx'),
-            array('distribution', 'zyx'),
-        );
+        return [
+            ['foo', 'bar'],
+            ['hash', 'zyx'],
+            ['serializer', 'zyx'],
+            ['distribution', 'zyx'],
+        ];
     }
 
     public function testDefaultOptions()
     {
         $this->assertTrue(MemcachedAdapter::isSupported());
 
-        $client = MemcachedAdapter::createConnection(array());
+        $client = MemcachedAdapter::createConnection([]);
 
         $this->assertTrue($client->getOption(\Memcached::OPT_COMPRESSION));
         $this->assertSame(1, $client->getOption(\Memcached::OPT_BINARY_PROTOCOL));
+        $this->assertSame(1, $client->getOption(\Memcached::OPT_TCP_NODELAY));
         $this->assertSame(1, $client->getOption(\Memcached::OPT_LIBKETAMA_COMPATIBLE));
     }
 
-    /**
-     * @expectedException \Symfony\Component\Cache\Exception\CacheException
-     * @expectedExceptionMessage MemcachedAdapter: "serializer" option must be "php" or "igbinary".
-     */
     public function testOptionSerializer()
     {
+        $this->expectException('Symfony\Component\Cache\Exception\CacheException');
+        $this->expectExceptionMessage('MemcachedAdapter: "serializer" option must be "php" or "igbinary".');
         if (!\Memcached::HAVE_JSON) {
             $this->markTestSkipped('Memcached::HAVE_JSON required');
         }
 
-        new MemcachedAdapter(MemcachedAdapter::createConnection(array(), array('serializer' => 'json')));
+        new MemcachedAdapter(MemcachedAdapter::createConnection([], ['serializer' => 'json']));
     }
 
     /**
@@ -111,54 +116,54 @@ class MemcachedAdapterTest extends AdapterTestCase
     public function testServersSetting($dsn, $host, $port)
     {
         $client1 = MemcachedAdapter::createConnection($dsn);
-        $client2 = MemcachedAdapter::createConnection(array($dsn));
-        $client3 = MemcachedAdapter::createConnection(array(array($host, $port)));
-        $expect = array(
+        $client2 = MemcachedAdapter::createConnection([$dsn]);
+        $client3 = MemcachedAdapter::createConnection([[$host, $port]]);
+        $expect = [
             'host' => $host,
             'port' => $port,
-        );
+        ];
 
-        $f = function ($s) { return array('host' => $s['host'], 'port' => $s['port']); };
-        $this->assertSame(array($expect), array_map($f, $client1->getServerList()));
-        $this->assertSame(array($expect), array_map($f, $client2->getServerList()));
-        $this->assertSame(array($expect), array_map($f, $client3->getServerList()));
+        $f = function ($s) { return ['host' => $s['host'], 'port' => $s['port']]; };
+        $this->assertSame([$expect], array_map($f, $client1->getServerList()));
+        $this->assertSame([$expect], array_map($f, $client2->getServerList()));
+        $this->assertSame([$expect], array_map($f, $client3->getServerList()));
     }
 
     public function provideServersSetting()
     {
-        yield array(
+        yield [
             'memcached://127.0.0.1/50',
             '127.0.0.1',
             11211,
-        );
-        yield array(
+        ];
+        yield [
             'memcached://localhost:11222?weight=25',
             'localhost',
             11222,
-        );
-        if (ini_get('memcached.use_sasl')) {
-            yield array(
+        ];
+        if (filter_var(ini_get('memcached.use_sasl'), \FILTER_VALIDATE_BOOLEAN)) {
+            yield [
                 'memcached://user:password@127.0.0.1?weight=50',
                 '127.0.0.1',
                 11211,
-            );
+            ];
         }
-        yield array(
+        yield [
             'memcached:///var/run/memcached.sock?weight=25',
             '/var/run/memcached.sock',
             0,
-        );
-        yield array(
+        ];
+        yield [
             'memcached:///var/local/run/memcached.socket?weight=25',
             '/var/local/run/memcached.socket',
             0,
-        );
-        if (ini_get('memcached.use_sasl')) {
-            yield array(
+        ];
+        if (filter_var(ini_get('memcached.use_sasl'), \FILTER_VALIDATE_BOOLEAN)) {
+            yield [
                 'memcached://user:password@/var/local/run/memcached.socket?weight=25',
                 '/var/local/run/memcached.socket',
                 0,
-            );
+            ];
         }
     }
 
@@ -180,15 +185,20 @@ class MemcachedAdapterTest extends AdapterTestCase
             self::markTestSkipped('Extension memcached required.');
         }
 
-        yield array(
+        yield [
             'memcached://localhost:11222?retry_timeout=10',
-            array(\Memcached::OPT_RETRY_TIMEOUT => 8),
-            array(\Memcached::OPT_RETRY_TIMEOUT => 10),
-        );
-        yield array(
+            [\Memcached::OPT_RETRY_TIMEOUT => 8],
+            [\Memcached::OPT_RETRY_TIMEOUT => 10],
+        ];
+        yield [
             'memcached://localhost:11222?socket_recv_size=1&socket_send_size=2',
-            array(\Memcached::OPT_RETRY_TIMEOUT => 8),
-            array(\Memcached::OPT_SOCKET_RECV_SIZE => 1, \Memcached::OPT_SOCKET_SEND_SIZE => 2, \Memcached::OPT_RETRY_TIMEOUT => 8),
-        );
+            [\Memcached::OPT_RETRY_TIMEOUT => 8],
+            [\Memcached::OPT_SOCKET_RECV_SIZE => 1, \Memcached::OPT_SOCKET_SEND_SIZE => 2, \Memcached::OPT_RETRY_TIMEOUT => 8],
+        ];
+    }
+
+    public function testClear()
+    {
+        $this->assertTrue($this->createCachePool()->clear());
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/NullAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/NullAdapterTest.php
index 73e5cad5..b771fa0e 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/NullAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/NullAdapterTest.php
@@ -43,7 +43,7 @@ class NullAdapterTest extends TestCase
     {
         $adapter = $this->createCachePool();
 
-        $keys = array('foo', 'bar', 'baz', 'biz');
+        $keys = ['foo', 'bar', 'baz', 'biz'];
 
         /** @var CacheItemInterface[] $items */
         $items = $adapter->getItems($keys);
@@ -89,7 +89,7 @@ class NullAdapterTest extends TestCase
 
     public function testDeleteItems()
     {
-        $this->assertTrue($this->createCachePool()->deleteItems(array('key', 'foo', 'bar')));
+        $this->assertTrue($this->createCachePool()->deleteItems(['key', 'foo', 'bar']));
     }
 
     public function testSave()
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PdoAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PdoAdapterTest.php
index 24e3f9bb..dd2a9118 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PdoAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PdoAdapterTest.php
@@ -23,9 +23,9 @@ class PdoAdapterTest extends AdapterTestCase
 
     protected static $dbFile;
 
-    public static function setupBeforeClass()
+    public static function setUpBeforeClass()
     {
-        if (!extension_loaded('pdo_sqlite')) {
+        if (!\extension_loaded('pdo_sqlite')) {
             self::markTestSkipped('Extension pdo_sqlite required.');
         }
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PdoDbalAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PdoDbalAdapterTest.php
index 1e8c6155..aa53958c 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PdoDbalAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PdoDbalAdapterTest.php
@@ -24,15 +24,15 @@ class PdoDbalAdapterTest extends AdapterTestCase
 
     protected static $dbFile;
 
-    public static function setupBeforeClass()
+    public static function setUpBeforeClass()
     {
-        if (!extension_loaded('pdo_sqlite')) {
+        if (!\extension_loaded('pdo_sqlite')) {
             self::markTestSkipped('Extension pdo_sqlite required.');
         }
 
         self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
 
-        $pool = new PdoAdapter(DriverManager::getConnection(array('driver' => 'pdo_sqlite', 'path' => self::$dbFile)));
+        $pool = new PdoAdapter(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]));
         $pool->createTable();
     }
 
@@ -43,6 +43,6 @@ class PdoDbalAdapterTest extends AdapterTestCase
 
     public function createCachePool($defaultLifetime = 0)
     {
-        return new PdoAdapter(DriverManager::getConnection(array('driver' => 'pdo_sqlite', 'path' => self::$dbFile)), '', $defaultLifetime);
+        return new PdoAdapter(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]), '', $defaultLifetime);
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterTest.php
index 14b61263..f88a7187 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterTest.php
@@ -20,7 +20,7 @@ use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
  */
 class PhpArrayAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testBasicUsage' => 'PhpArrayAdapter is read-only.',
         'testBasicUsageWithLongKey' => 'PhpArrayAdapter is read-only.',
         'testClear' => 'PhpArrayAdapter is read-only.',
@@ -51,17 +51,19 @@ class PhpArrayAdapterTest extends AdapterTestCase
 
         'testDefaultLifeTime' => 'PhpArrayAdapter does not allow configuring a default lifetime.',
         'testPrune' => 'PhpArrayAdapter just proxies',
-    );
+    ];
 
     protected static $file;
 
-    public static function setupBeforeClass()
+    public static function setUpBeforeClass()
     {
         self::$file = sys_get_temp_dir().'/symfony-cache/php-array-adapter-test.php';
     }
 
     protected function tearDown()
     {
+        $this->createCachePool()->clear();
+
         if (file_exists(sys_get_temp_dir().'/symfony-cache')) {
             FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
         }
@@ -74,22 +76,22 @@ class PhpArrayAdapterTest extends AdapterTestCase
 
     public function testStore()
     {
-        $arrayWithRefs = array();
+        $arrayWithRefs = [];
         $arrayWithRefs[0] = 123;
         $arrayWithRefs[1] = &$arrayWithRefs[0];
 
-        $object = (object) array(
+        $object = (object) [
             'foo' => 'bar',
             'foo2' => 'bar2',
-        );
+        ];
 
-        $expected = array(
+        $expected = [
             'null' => null,
             'serializedString' => serialize($object),
             'arrayWithRefs' => $arrayWithRefs,
             'object' => $object,
-            'arrayWithObject' => array('bar' => $object),
-        );
+            'arrayWithObject' => ['bar' => $object],
+        ];
 
         $adapter = $this->createCachePool();
         $adapter->warmUp($expected);
@@ -101,13 +103,13 @@ class PhpArrayAdapterTest extends AdapterTestCase
 
     public function testStoredFile()
     {
-        $expected = array(
+        $expected = [
             'integer' => 42,
             'float' => 42.42,
             'boolean' => true,
-            'array_simple' => array('foo', 'bar'),
-            'array_associative' => array('foo' => 'bar', 'foo2' => 'bar2'),
-        );
+            'array_simple' => ['foo', 'bar'],
+            'array_associative' => ['foo' => 'bar', 'foo2' => 'bar2'],
+        ];
 
         $adapter = $this->createCachePool();
         $adapter->warmUp($expected);
@@ -122,7 +124,7 @@ class PhpArrayAdapterWrapper extends PhpArrayAdapter
 {
     public function save(CacheItemInterface $item)
     {
-        call_user_func(\Closure::bind(function () use ($item) {
+        \call_user_func(\Closure::bind(function () use ($item) {
             $this->values[$item->getKey()] = $item->get();
             $this->warmUp($this->values);
             $this->values = eval(substr(file_get_contents($this->file), 6));
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php
index 1a23198c..0bfd5c39 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php
@@ -19,24 +19,26 @@ use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
  */
 class PhpArrayAdapterWithFallbackTest extends AdapterTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testGetItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
         'testGetItemsInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
         'testHasItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
         'testDeleteItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
         'testDeleteItemsInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
         'testPrune' => 'PhpArrayAdapter just proxies',
-    );
+    ];
 
     protected static $file;
 
-    public static function setupBeforeClass()
+    public static function setUpBeforeClass()
     {
         self::$file = sys_get_temp_dir().'/symfony-cache/php-array-adapter-test.php';
     }
 
     protected function tearDown()
     {
+        $this->createCachePool()->clear();
+
         if (file_exists(sys_get_temp_dir().'/symfony-cache')) {
             FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
         }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpFilesAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpFilesAdapterTest.php
index 8e93c937..247160d5 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpFilesAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpFilesAdapterTest.php
@@ -19,9 +19,9 @@ use Symfony\Component\Cache\Adapter\PhpFilesAdapter;
  */
 class PhpFilesAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testDefaultLifeTime' => 'PhpFilesAdapter does not allow configuring a default lifetime.',
-    );
+    ];
 
     public function createCachePool()
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisAdapterTest.php
index c005d64a..6aadbf26 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisAdapterTest.php
@@ -16,23 +16,23 @@ use Symfony\Component\Cache\Adapter\RedisAdapter;
 
 class PredisAdapterTest extends AbstractRedisAdapterTest
 {
-    public static function setupBeforeClass()
+    public static function setUpBeforeClass()
     {
-        parent::setupBeforeClass();
-        self::$redis = new \Predis\Client(array('host' => getenv('REDIS_HOST')));
+        parent::setUpBeforeClass();
+        self::$redis = new \Predis\Client(['host' => getenv('REDIS_HOST')]);
     }
 
     public function testCreateConnection()
     {
         $redisHost = getenv('REDIS_HOST');
 
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost.'/1', array('class' => \Predis\Client::class, 'timeout' => 3));
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost.'/1', ['class' => \Predis\Client::class, 'timeout' => 3]);
         $this->assertInstanceOf(\Predis\Client::class, $redis);
 
         $connection = $redis->getConnection();
         $this->assertInstanceOf(StreamConnection::class, $connection);
 
-        $params = array(
+        $params = [
             'scheme' => 'tcp',
             'host' => $redisHost,
             'path' => '',
@@ -47,7 +47,7 @@ class PredisAdapterTest extends AbstractRedisAdapterTest
             'lazy' => false,
             'database' => '1',
             'password' => null,
-        );
+        ];
         $this->assertSame($params, $connection->getParameters()->toArray());
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisClusterAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisClusterAdapterTest.php
index 38915397..1afabaf1 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisClusterAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisClusterAdapterTest.php
@@ -13,10 +13,10 @@ namespace Symfony\Component\Cache\Tests\Adapter;
 
 class PredisClusterAdapterTest extends AbstractRedisAdapterTest
 {
-    public static function setupBeforeClass()
+    public static function setUpBeforeClass()
     {
-        parent::setupBeforeClass();
-        self::$redis = new \Predis\Client(array(array('host' => getenv('REDIS_HOST'))));
+        parent::setUpBeforeClass();
+        self::$redis = new \Predis\Client([['host' => getenv('REDIS_HOST')]]);
     }
 
     public static function tearDownAfterClass()
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisRedisClusterAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisRedisClusterAdapterTest.php
new file mode 100644
index 00000000..5b09919e
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisRedisClusterAdapterTest.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+class PredisRedisClusterAdapterTest extends AbstractRedisAdapterTest
+{
+    public static function setUpBeforeClass()
+    {
+        if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) {
+            self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
+        }
+        self::$redis = new \Predis\Client(explode(' ', $hosts), ['cluster' => 'redis']);
+    }
+
+    public static function tearDownAfterClass()
+    {
+        self::$redis = null;
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ProxyAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ProxyAdapterTest.php
index ff4b9d34..810cb31a 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ProxyAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ProxyAdapterTest.php
@@ -21,23 +21,21 @@ use Symfony\Component\Cache\CacheItem;
  */
 class ProxyAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayAdapter is not.',
         'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayAdapter is not.',
         'testPrune' => 'ProxyAdapter just proxies',
-    );
+    ];
 
     public function createCachePool($defaultLifetime = 0)
     {
         return new ProxyAdapter(new ArrayAdapter(), '', $defaultLifetime);
     }
 
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage OK bar
-     */
     public function testProxyfiedItem()
     {
+        $this->expectException('Exception');
+        $this->expectExceptionMessage('OK bar');
         $item = new CacheItem();
         $pool = new ProxyAdapter(new TestingArrayAdapter($item));
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisAdapterTest.php
index 28c310fb..6ec6321a 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisAdapterTest.php
@@ -17,10 +17,10 @@ use Symfony\Component\Cache\Traits\RedisProxy;
 
 class RedisAdapterTest extends AbstractRedisAdapterTest
 {
-    public static function setupBeforeClass()
+    public static function setUpBeforeClass()
     {
-        parent::setupBeforeClass();
-        self::$redis = AbstractAdapter::createConnection('redis://'.getenv('REDIS_HOST'), array('lazy' => true));
+        parent::setUpBeforeClass();
+        self::$redis = AbstractAdapter::createConnection('redis://'.getenv('REDIS_HOST'), ['lazy' => true]);
     }
 
     public function createCachePool($defaultLifetime = 0)
@@ -43,50 +43,50 @@ class RedisAdapterTest extends AbstractRedisAdapterTest
         $redis = RedisAdapter::createConnection('redis://'.$redisHost.'/2');
         $this->assertSame(2, $redis->getDbNum());
 
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost, array('timeout' => 3));
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost, ['timeout' => 3]);
         $this->assertEquals(3, $redis->getTimeout());
 
         $redis = RedisAdapter::createConnection('redis://'.$redisHost.'?timeout=4');
         $this->assertEquals(4, $redis->getTimeout());
 
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost, array('read_timeout' => 5));
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost, ['read_timeout' => 5]);
         $this->assertEquals(5, $redis->getReadTimeout());
     }
 
     /**
      * @dataProvider provideFailedCreateConnection
-     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Redis connection failed
      */
     public function testFailedCreateConnection($dsn)
     {
+        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Redis connection ');
         RedisAdapter::createConnection($dsn);
     }
 
     public function provideFailedCreateConnection()
     {
-        return array(
-            array('redis://localhost:1234'),
-            array('redis://foo@localhost'),
-            array('redis://localhost/123'),
-        );
+        return [
+            ['redis://localhost:1234'],
+            ['redis://foo@localhost'],
+            ['redis://localhost/123'],
+        ];
     }
 
     /**
      * @dataProvider provideInvalidCreateConnection
-     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Invalid Redis DSN
      */
     public function testInvalidCreateConnection($dsn)
     {
+        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Invalid Redis DSN');
         RedisAdapter::createConnection($dsn);
     }
 
     public function provideInvalidCreateConnection()
     {
-        return array(
-            array('foo://localhost'),
-            array('redis://'),
-        );
+        return [
+            ['foo://localhost'],
+            ['redis://'],
+        ];
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisArrayAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisArrayAdapterTest.php
index bef3eb88..bd9def32 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisArrayAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisArrayAdapterTest.php
@@ -13,12 +13,12 @@ namespace Symfony\Component\Cache\Tests\Adapter;
 
 class RedisArrayAdapterTest extends AbstractRedisAdapterTest
 {
-    public static function setupBeforeClass()
+    public static function setUpBeforeClass()
     {
         parent::setupBeforeClass();
         if (!class_exists('RedisArray')) {
             self::markTestSkipped('The RedisArray class is required.');
         }
-        self::$redis = new \RedisArray(array(getenv('REDIS_HOST')), array('lazy_connect' => true));
+        self::$redis = new \RedisArray([getenv('REDIS_HOST')], ['lazy_connect' => true]);
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisClusterAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisClusterAdapterTest.php
new file mode 100644
index 00000000..9c339d2d
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisClusterAdapterTest.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+class RedisClusterAdapterTest extends AbstractRedisAdapterTest
+{
+    public static function setUpBeforeClass()
+    {
+        if (!class_exists('RedisCluster')) {
+            self::markTestSkipped('The RedisCluster class is required.');
+        }
+        if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) {
+            self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
+        }
+
+        self::$redis = new \RedisCluster(null, explode(' ', $hosts));
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/SimpleCacheAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/SimpleCacheAdapterTest.php
index d5795d52..d8470a2e 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/SimpleCacheAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/SimpleCacheAdapterTest.php
@@ -11,20 +11,31 @@
 
 namespace Symfony\Component\Cache\Tests\Adapter;
 
-use Symfony\Component\Cache\Simple\FilesystemCache;
 use Symfony\Component\Cache\Adapter\SimpleCacheAdapter;
+use Symfony\Component\Cache\Simple\ArrayCache;
+use Symfony\Component\Cache\Simple\FilesystemCache;
 
 /**
  * @group time-sensitive
  */
 class SimpleCacheAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testPrune' => 'SimpleCache just proxies',
-    );
+    ];
 
     public function createCachePool($defaultLifetime = 0)
     {
         return new SimpleCacheAdapter(new FilesystemCache(), '', $defaultLifetime);
     }
+
+    public function testValidCacheKeyWithNamespace()
+    {
+        $cache = new SimpleCacheAdapter(new ArrayCache(), 'some_namespace', 0);
+        $item = $cache->getItem('my_key');
+        $item->set('someValue');
+        $cache->save($item);
+
+        $this->assertTrue($cache->getItem('my_key')->isHit(), 'Stored item is successfully retrieved.');
+    }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TagAwareAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TagAwareAdapterTest.php
index 0e4e07a1..11907a03 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TagAwareAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TagAwareAdapterTest.php
@@ -11,7 +11,10 @@
 
 namespace Symfony\Component\Cache\Tests\Adapter;
 
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Cache\CacheItemInterface;
 use Symfony\Component\Cache\Adapter\AdapterInterface;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Cache\Adapter\TagAwareAdapter;
 
@@ -30,11 +33,9 @@ class TagAwareAdapterTest extends AdapterTestCase
         FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
     }
 
-    /**
-     * @expectedException \Psr\Cache\InvalidArgumentException
-     */
     public function testInvalidTag()
     {
+        $this->expectException('Psr\Cache\InvalidArgumentException');
         $pool = $this->createCachePool();
         $item = $pool->getItem('foo');
         $item->tag(':');
@@ -56,7 +57,7 @@ class TagAwareAdapterTest extends AdapterTestCase
         $pool->save($i3->tag('foo')->tag('baz'));
         $pool->save($foo);
 
-        $pool->invalidateTags(array('bar'));
+        $pool->invalidateTags(['bar']);
 
         $this->assertFalse($pool->getItem('i0')->isHit());
         $this->assertTrue($pool->getItem('i1')->isHit());
@@ -64,11 +65,33 @@ class TagAwareAdapterTest extends AdapterTestCase
         $this->assertTrue($pool->getItem('i3')->isHit());
         $this->assertTrue($pool->getItem('foo')->isHit());
 
-        $pool->invalidateTags(array('foo'));
+        $pool->invalidateTags(['foo']);
 
         $this->assertFalse($pool->getItem('i1')->isHit());
         $this->assertFalse($pool->getItem('i3')->isHit());
         $this->assertTrue($pool->getItem('foo')->isHit());
+
+        $anotherPoolInstance = $this->createCachePool();
+
+        $this->assertFalse($anotherPoolInstance->getItem('i1')->isHit());
+        $this->assertFalse($anotherPoolInstance->getItem('i3')->isHit());
+        $this->assertTrue($anotherPoolInstance->getItem('foo')->isHit());
+    }
+
+    public function testInvalidateCommits()
+    {
+        $pool1 = $this->createCachePool();
+
+        $foo = $pool1->getItem('foo');
+        $foo->tag('tag');
+
+        $pool1->saveDeferred($foo->set('foo'));
+        $pool1->invalidateTags(['tag']);
+
+        $pool2 = $this->createCachePool();
+        $foo = $pool2->getItem('foo');
+
+        $this->assertTrue($foo->isHit());
     }
 
     public function testTagsAreCleanedOnSave()
@@ -81,7 +104,7 @@ class TagAwareAdapterTest extends AdapterTestCase
         $i = $pool->getItem('k');
         $pool->save($i->tag('bar'));
 
-        $pool->invalidateTags(array('foo'));
+        $pool->invalidateTags(['foo']);
         $this->assertTrue($pool->getItem('k')->isHit());
     }
 
@@ -94,7 +117,7 @@ class TagAwareAdapterTest extends AdapterTestCase
         $pool->deleteItem('k');
 
         $pool->save($pool->getItem('k'));
-        $pool->invalidateTags(array('foo'));
+        $pool->invalidateTags(['foo']);
 
         $this->assertTrue($pool->getItem('k')->isHit());
     }
@@ -104,11 +127,11 @@ class TagAwareAdapterTest extends AdapterTestCase
         $pool = $this->createCachePool(10);
 
         $item = $pool->getItem('foo');
-        $item->tag(array('baz'));
+        $item->tag(['baz']);
         $item->expiresAfter(100);
 
         $pool->save($item);
-        $pool->invalidateTags(array('baz'));
+        $pool->invalidateTags(['baz']);
         $this->assertFalse($pool->getItem('foo')->isHit());
 
         sleep(20);
@@ -124,7 +147,7 @@ class TagAwareAdapterTest extends AdapterTestCase
         $pool->save($i->tag('foo'));
 
         $i = $pool->getItem('k');
-        $this->assertSame(array('foo' => 'foo'), $i->getPreviousTags());
+        $this->assertSame(['foo' => 'foo'], $i->getPreviousTags());
     }
 
     public function testPrune()
@@ -139,8 +162,138 @@ class TagAwareAdapterTest extends AdapterTestCase
         $this->assertFalse($cache->prune());
     }
 
+    public function testKnownTagVersionsTtl()
+    {
+        $itemsPool = new FilesystemAdapter('', 10);
+        $tagsPool = $this
+            ->getMockBuilder(AdapterInterface::class)
+            ->getMock();
+
+        $pool = new TagAwareAdapter($itemsPool, $tagsPool, 10);
+
+        $item = $pool->getItem('foo');
+        $item->tag(['baz']);
+        $item->expiresAfter(100);
+
+        $tag = $this->getMockBuilder(CacheItemInterface::class)->getMock();
+        $tag->expects(self::exactly(2))->method('get')->willReturn(10);
+
+        $tagsPool->expects(self::exactly(2))->method('getItems')->willReturn([
+            'baz'.TagAwareAdapter::TAGS_PREFIX => $tag,
+        ]);
+
+        $pool->save($item);
+        $this->assertTrue($pool->getItem('foo')->isHit());
+        $this->assertTrue($pool->getItem('foo')->isHit());
+
+        sleep(20);
+
+        $this->assertTrue($pool->getItem('foo')->isHit());
+
+        sleep(5);
+
+        $this->assertTrue($pool->getItem('foo')->isHit());
+    }
+
+    public function testTagEntryIsCreatedForItemWithoutTags()
+    {
+        $pool = $this->createCachePool();
+
+        $itemKey = 'foo';
+        $item = $pool->getItem($itemKey);
+        $pool->save($item);
+
+        $adapter = new FilesystemAdapter();
+        $this->assertTrue($adapter->hasItem(TagAwareAdapter::TAGS_PREFIX.$itemKey));
+    }
+
+    public function testHasItemReturnsFalseWhenPoolDoesNotHaveItemTags()
+    {
+        $pool = $this->createCachePool();
+
+        $itemKey = 'foo';
+        $item = $pool->getItem($itemKey);
+        $pool->save($item);
+
+        $anotherPool = $this->createCachePool();
+
+        $adapter = new FilesystemAdapter();
+        $adapter->deleteItem(TagAwareAdapter::TAGS_PREFIX.$itemKey); //simulate item losing tags pair
+
+        $this->assertFalse($anotherPool->hasItem($itemKey));
+    }
+
+    public function testGetItemReturnsCacheMissWhenPoolDoesNotHaveItemTags()
+    {
+        $pool = $this->createCachePool();
+
+        $itemKey = 'foo';
+        $item = $pool->getItem($itemKey);
+        $pool->save($item);
+
+        $anotherPool = $this->createCachePool();
+
+        $adapter = new FilesystemAdapter();
+        $adapter->deleteItem(TagAwareAdapter::TAGS_PREFIX.$itemKey); //simulate item losing tags pair
+
+        $item = $anotherPool->getItem($itemKey);
+        $this->assertFalse($item->isHit());
+    }
+
+    public function testHasItemReturnsFalseWhenPoolDoesNotHaveItemAndOnlyHasTags()
+    {
+        $pool = $this->createCachePool();
+
+        $itemKey = 'foo';
+        $item = $pool->getItem($itemKey);
+        $pool->save($item);
+
+        $anotherPool = $this->createCachePool();
+
+        $adapter = new FilesystemAdapter();
+        $adapter->deleteItem($itemKey); //simulate losing item but keeping tags
+
+        $this->assertFalse($anotherPool->hasItem($itemKey));
+    }
+
+    public function testInvalidateTagsWithArrayAdapter()
+    {
+        $adapter = new TagAwareAdapter(new ArrayAdapter());
+
+        $item = $adapter->getItem('foo');
+
+        $this->assertFalse($item->isHit());
+
+        $item->tag('bar');
+        $item->expiresAfter(100);
+        $adapter->save($item);
+
+        $this->assertTrue($adapter->getItem('foo')->isHit());
+
+        $adapter->invalidateTags(['bar']);
+
+        $this->assertFalse($adapter->getItem('foo')->isHit());
+    }
+
+    public function testGetItemReturnsCacheMissWhenPoolDoesNotHaveItemAndOnlyHasTags()
+    {
+        $pool = $this->createCachePool();
+
+        $itemKey = 'foo';
+        $item = $pool->getItem($itemKey);
+        $pool->save($item);
+
+        $anotherPool = $this->createCachePool();
+
+        $adapter = new FilesystemAdapter();
+        $adapter->deleteItem($itemKey); //simulate losing item but keeping tags
+
+        $item = $anotherPool->getItem($itemKey);
+        $this->assertFalse($item->isHit());
+    }
+
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface
+     * @return MockObject|PruneableCacheInterface
      */
     private function getPruneableMock()
     {
@@ -151,13 +304,13 @@ class TagAwareAdapterTest extends AdapterTestCase
         $pruneable
             ->expects($this->atLeastOnce())
             ->method('prune')
-            ->will($this->returnValue(true));
+            ->willReturn(true);
 
         return $pruneable;
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface
+     * @return MockObject|PruneableCacheInterface
      */
     private function getFailingPruneableMock()
     {
@@ -168,13 +321,13 @@ class TagAwareAdapterTest extends AdapterTestCase
         $pruneable
             ->expects($this->atLeastOnce())
             ->method('prune')
-            ->will($this->returnValue(false));
+            ->willReturn(false);
 
         return $pruneable;
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|AdapterInterface
+     * @return MockObject|AdapterInterface
      */
     private function getNonPruneableMock()
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TagAwareAndProxyAdapterIntegrationTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TagAwareAndProxyAdapterIntegrationTest.php
new file mode 100644
index 00000000..b11c1f28
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TagAwareAndProxyAdapterIntegrationTest.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Cache\CacheItemPoolInterface;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Cache\Adapter\ProxyAdapter;
+use Symfony\Component\Cache\Adapter\TagAwareAdapter;
+use Symfony\Component\Cache\Tests\Fixtures\ExternalAdapter;
+
+class TagAwareAndProxyAdapterIntegrationTest extends TestCase
+{
+    /**
+     * @dataProvider dataProvider
+     */
+    public function testIntegrationUsingProxiedAdapter(CacheItemPoolInterface $proxiedAdapter)
+    {
+        $cache = new TagAwareAdapter(new ProxyAdapter($proxiedAdapter));
+
+        $item = $cache->getItem('foo');
+        $item->tag(['tag1', 'tag2']);
+        $item->set('bar');
+        $cache->save($item);
+
+        $this->assertSame('bar', $cache->getItem('foo')->get());
+    }
+
+    public function dataProvider()
+    {
+        return [
+            [new ArrayAdapter()],
+            // also testing with a non-AdapterInterface implementation
+            // because the ProxyAdapter behaves slightly different for those
+            [new ExternalAdapter()],
+        ];
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TraceableAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TraceableAdapterTest.php
index 3755e88d..35eba7d7 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TraceableAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TraceableAdapterTest.php
@@ -19,9 +19,9 @@ use Symfony\Component\Cache\Adapter\TraceableAdapter;
  */
 class TraceableAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testPrune' => 'TraceableAdapter just proxies',
-    );
+    ];
 
     public function createCachePool($defaultLifetime = 0)
     {
@@ -37,7 +37,7 @@ class TraceableAdapterTest extends AdapterTestCase
 
         $call = $calls[0];
         $this->assertSame('getItem', $call->name);
-        $this->assertSame(array('k' => false), $call->result);
+        $this->assertSame(['k' => false], $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(1, $call->misses);
         $this->assertNotEmpty($call->start);
@@ -61,7 +61,7 @@ class TraceableAdapterTest extends AdapterTestCase
     public function testGetItemsMissTrace()
     {
         $pool = $this->createCachePool();
-        $arg = array('k0', 'k1');
+        $arg = ['k0', 'k1'];
         $items = $pool->getItems($arg);
         foreach ($items as $item) {
         }
@@ -70,7 +70,7 @@ class TraceableAdapterTest extends AdapterTestCase
 
         $call = $calls[0];
         $this->assertSame('getItems', $call->name);
-        $this->assertSame(array('k0' => false, 'k1' => false), $call->result);
+        $this->assertSame(['k0' => false, 'k1' => false], $call->result);
         $this->assertSame(2, $call->misses);
         $this->assertNotEmpty($call->start);
         $this->assertNotEmpty($call->end);
@@ -85,7 +85,7 @@ class TraceableAdapterTest extends AdapterTestCase
 
         $call = $calls[0];
         $this->assertSame('hasItem', $call->name);
-        $this->assertSame(array('k' => false), $call->result);
+        $this->assertSame(['k' => false], $call->result);
         $this->assertNotEmpty($call->start);
         $this->assertNotEmpty($call->end);
     }
@@ -101,7 +101,7 @@ class TraceableAdapterTest extends AdapterTestCase
 
         $call = $calls[2];
         $this->assertSame('hasItem', $call->name);
-        $this->assertSame(array('k' => true), $call->result);
+        $this->assertSame(['k' => true], $call->result);
         $this->assertNotEmpty($call->start);
         $this->assertNotEmpty($call->end);
     }
@@ -115,7 +115,7 @@ class TraceableAdapterTest extends AdapterTestCase
 
         $call = $calls[0];
         $this->assertSame('deleteItem', $call->name);
-        $this->assertSame(array('k' => true), $call->result);
+        $this->assertSame(['k' => true], $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(0, $call->misses);
         $this->assertNotEmpty($call->start);
@@ -125,14 +125,14 @@ class TraceableAdapterTest extends AdapterTestCase
     public function testDeleteItemsTrace()
     {
         $pool = $this->createCachePool();
-        $arg = array('k0', 'k1');
+        $arg = ['k0', 'k1'];
         $pool->deleteItems($arg);
         $calls = $pool->getCalls();
         $this->assertCount(1, $calls);
 
         $call = $calls[0];
         $this->assertSame('deleteItems', $call->name);
-        $this->assertSame(array('keys' => $arg, 'result' => true), $call->result);
+        $this->assertSame(['keys' => $arg, 'result' => true], $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(0, $call->misses);
         $this->assertNotEmpty($call->start);
@@ -149,7 +149,7 @@ class TraceableAdapterTest extends AdapterTestCase
 
         $call = $calls[1];
         $this->assertSame('save', $call->name);
-        $this->assertSame(array('k' => true), $call->result);
+        $this->assertSame(['k' => true], $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(0, $call->misses);
         $this->assertNotEmpty($call->start);
@@ -166,7 +166,7 @@ class TraceableAdapterTest extends AdapterTestCase
 
         $call = $calls[1];
         $this->assertSame('saveDeferred', $call->name);
-        $this->assertSame(array('k' => true), $call->result);
+        $this->assertSame(['k' => true], $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(0, $call->misses);
         $this->assertNotEmpty($call->start);
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TraceableTagAwareAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TraceableTagAwareAdapterTest.php
index 9b50bfab..5cd4185c 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TraceableTagAwareAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TraceableTagAwareAdapterTest.php
@@ -23,7 +23,7 @@ class TraceableTagAwareAdapterTest extends TraceableAdapterTest
     public function testInvalidateTags()
     {
         $pool = new TraceableTagAwareAdapter(new TagAwareAdapter(new FilesystemAdapter()));
-        $pool->invalidateTags(array('foo'));
+        $pool->invalidateTags(['foo']);
         $calls = $pool->getCalls();
         $this->assertCount(1, $calls);
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/CacheItemTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/CacheItemTest.php
index daca925f..28c681d1 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/CacheItemTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/CacheItemTest.php
@@ -23,33 +23,33 @@ class CacheItemTest extends TestCase
 
     /**
      * @dataProvider provideInvalidKey
-     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Cache key
      */
     public function testInvalidKey($key)
     {
+        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Cache key');
         CacheItem::validateKey($key);
     }
 
     public function provideInvalidKey()
     {
-        return array(
-            array(''),
-            array('{'),
-            array('}'),
-            array('('),
-            array(')'),
-            array('/'),
-            array('\\'),
-            array('@'),
-            array(':'),
-            array(true),
-            array(null),
-            array(1),
-            array(1.1),
-            array(array(array())),
-            array(new \Exception('foo')),
-        );
+        return [
+            [''],
+            ['{'],
+            ['}'],
+            ['('],
+            [')'],
+            ['/'],
+            ['\\'],
+            ['@'],
+            [':'],
+            [true],
+            [null],
+            [1],
+            [1.1],
+            [[[]]],
+            [new \Exception('foo')],
+        ];
     }
 
     public function testTag()
@@ -57,20 +57,20 @@ class CacheItemTest extends TestCase
         $item = new CacheItem();
 
         $this->assertSame($item, $item->tag('foo'));
-        $this->assertSame($item, $item->tag(array('bar', 'baz')));
+        $this->assertSame($item, $item->tag(['bar', 'baz']));
 
-        call_user_func(\Closure::bind(function () use ($item) {
-            $this->assertSame(array('foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz'), $item->tags);
+        \call_user_func(\Closure::bind(function () use ($item) {
+            $this->assertSame(['foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz'], $item->tags);
         }, $this, CacheItem::class));
     }
 
     /**
      * @dataProvider provideInvalidKey
-     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Cache tag
      */
     public function testInvalidTag($tag)
     {
+        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Cache tag');
         $item = new CacheItem();
         $item->tag($tag);
     }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Fixtures/ArrayCache.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Fixtures/ArrayCache.php
index 1a6157e8..13b4f330 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Fixtures/ArrayCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Fixtures/ArrayCache.php
@@ -6,7 +6,7 @@ use Doctrine\Common\Cache\CacheProvider;
 
 class ArrayCache extends CacheProvider
 {
-    private $data = array();
+    private $data = [];
 
     protected function doFetch($id)
     {
@@ -21,12 +21,12 @@ class ArrayCache extends CacheProvider
 
         $expiry = $this->data[$id][1];
 
-        return !$expiry || time() <= $expiry || !$this->doDelete($id);
+        return !$expiry || time() < $expiry || !$this->doDelete($id);
     }
 
     protected function doSave($id, $data, $lifeTime = 0)
     {
-        $this->data[$id] = array($data, $lifeTime ? time() + $lifeTime : false);
+        $this->data[$id] = [$data, $lifeTime ? time() + $lifeTime : false];
 
         return true;
     }
@@ -40,7 +40,7 @@ class ArrayCache extends CacheProvider
 
     protected function doFlush()
     {
-        $this->data = array();
+        $this->data = [];
 
         return true;
     }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Fixtures/ExternalAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Fixtures/ExternalAdapter.php
index 493906ea..be1f9901 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Fixtures/ExternalAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Fixtures/ExternalAdapter.php
@@ -24,9 +24,9 @@ class ExternalAdapter implements CacheItemPoolInterface
 {
     private $cache;
 
-    public function __construct()
+    public function __construct($defaultLifetime = 0)
     {
-        $this->cache = new ArrayAdapter();
+        $this->cache = new ArrayAdapter($defaultLifetime);
     }
 
     public function getItem($key)
@@ -34,7 +34,7 @@ class ExternalAdapter implements CacheItemPoolInterface
         return $this->cache->getItem($key);
     }
 
-    public function getItems(array $keys = array())
+    public function getItems(array $keys = [])
     {
         return $this->cache->getItems($keys);
     }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/AbstractRedisCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/AbstractRedisCacheTest.php
index f70f49d5..7a6cabe8 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/AbstractRedisCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/AbstractRedisCacheTest.php
@@ -15,11 +15,11 @@ use Symfony\Component\Cache\Simple\RedisCache;
 
 abstract class AbstractRedisCacheTest extends CacheTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testSetTtl' => 'Testing expiration slows down the test suite',
         'testSetMultipleTtl' => 'Testing expiration slows down the test suite',
         'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
-    );
+    ];
 
     protected static $redis;
 
@@ -28,14 +28,15 @@ abstract class AbstractRedisCacheTest extends CacheTestCase
         return new RedisCache(self::$redis, str_replace('\\', '.', __CLASS__), $defaultLifetime);
     }
 
-    public static function setupBeforeClass()
+    public static function setUpBeforeClass()
     {
-        if (!extension_loaded('redis')) {
+        if (!\extension_loaded('redis')) {
             self::markTestSkipped('Extension redis required.');
         }
-        if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
-            $e = error_get_last();
-            self::markTestSkipped($e['message']);
+        try {
+            (new \Redis())->connect(getenv('REDIS_HOST'));
+        } catch (\Exception $e) {
+            self::markTestSkipped($e->getMessage());
         }
     }
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ApcuCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ApcuCacheTest.php
index 297a4175..fad0c043 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ApcuCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ApcuCacheTest.php
@@ -15,18 +15,18 @@ use Symfony\Component\Cache\Simple\ApcuCache;
 
 class ApcuCacheTest extends CacheTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testSetTtl' => 'Testing expiration slows down the test suite',
         'testSetMultipleTtl' => 'Testing expiration slows down the test suite',
         'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
-    );
+    ];
 
     public function createSimpleCache($defaultLifetime = 0)
     {
-        if (!function_exists('apcu_fetch') || !ini_get('apc.enabled') || ('cli' === PHP_SAPI && !ini_get('apc.enable_cli'))) {
+        if (!\function_exists('apcu_fetch') || !filter_var(ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN) || ('cli' === \PHP_SAPI && !filter_var(ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN))) {
             $this->markTestSkipped('APCu extension is required.');
         }
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('Fails transiently on Windows.');
         }
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/CacheTestCase.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/CacheTestCase.php
index 48b97282..ff9944a3 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/CacheTestCase.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/CacheTestCase.php
@@ -21,18 +21,18 @@ abstract class CacheTestCase extends SimpleCacheTest
     {
         parent::setUp();
 
-        if (!array_key_exists('testPrune', $this->skippedTests) && !$this->createSimpleCache() instanceof PruneableInterface) {
+        if (!\array_key_exists('testPrune', $this->skippedTests) && !$this->createSimpleCache() instanceof PruneableInterface) {
             $this->skippedTests['testPrune'] = 'Not a pruneable cache pool.';
         }
     }
 
     public static function validKeys()
     {
-        if (defined('HHVM_VERSION')) {
+        if (\defined('HHVM_VERSION')) {
             return parent::validKeys();
         }
 
-        return array_merge(parent::validKeys(), array(array("a\0b")));
+        return array_merge(parent::validKeys(), [["a\0b"]]);
     }
 
     public function testDefaultLifeTime()
@@ -42,6 +42,7 @@ abstract class CacheTestCase extends SimpleCacheTest
         }
 
         $cache = $this->createSimpleCache(2);
+        $cache->clear();
 
         $cache->set('key.dlt', 'value');
         sleep(1);
@@ -50,6 +51,8 @@ abstract class CacheTestCase extends SimpleCacheTest
 
         sleep(2);
         $this->assertNull($cache->get('key.dlt'));
+
+        $cache->clear();
     }
 
     public function testNotUnserializable()
@@ -59,16 +62,19 @@ abstract class CacheTestCase extends SimpleCacheTest
         }
 
         $cache = $this->createSimpleCache();
+        $cache->clear();
 
         $cache->set('foo', new NotUnserializable());
 
         $this->assertNull($cache->get('foo'));
 
-        $cache->setMultiple(array('foo' => new NotUnserializable()));
+        $cache->setMultiple(['foo' => new NotUnserializable()]);
 
-        foreach ($cache->getMultiple(array('foo')) as $value) {
+        foreach ($cache->getMultiple(['foo']) as $value) {
         }
         $this->assertNull($value);
+
+        $cache->clear();
     }
 
     public function testPrune()
@@ -83,6 +89,7 @@ abstract class CacheTestCase extends SimpleCacheTest
 
         /** @var PruneableInterface|CacheInterface $cache */
         $cache = $this->createSimpleCache();
+        $cache->clear();
 
         $cache->set('foo', 'foo-val', new \DateInterval('PT05S'));
         $cache->set('bar', 'bar-val', new \DateInterval('PT10S'));
@@ -124,6 +131,8 @@ abstract class CacheTestCase extends SimpleCacheTest
         $cache->prune();
         $this->assertFalse($this->isPruned($cache, 'foo'));
         $this->assertTrue($this->isPruned($cache, 'qux'));
+
+        $cache->clear();
     }
 }
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ChainCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ChainCacheTest.php
index ab28e3bc..f216bc1f 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ChainCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ChainCacheTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Cache\Tests\Simple;
 
+use PHPUnit\Framework\MockObject\MockObject;
 use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\Simple\ArrayCache;
@@ -24,25 +25,21 @@ class ChainCacheTest extends CacheTestCase
 {
     public function createSimpleCache($defaultLifetime = 0)
     {
-        return new ChainCache(array(new ArrayCache($defaultLifetime), new FilesystemCache('', $defaultLifetime)), $defaultLifetime);
+        return new ChainCache([new ArrayCache($defaultLifetime), new FilesystemCache('', $defaultLifetime)], $defaultLifetime);
     }
 
-    /**
-     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
-     * @expectedExceptionMessage At least one cache must be specified.
-     */
     public function testEmptyCachesException()
     {
-        new ChainCache(array());
+        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('At least one cache must be specified.');
+        new ChainCache([]);
     }
 
-    /**
-     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
-     * @expectedExceptionMessage The class "stdClass" does not implement
-     */
     public function testInvalidCacheException()
     {
-        new ChainCache(array(new \stdClass()));
+        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('The class "stdClass" does not implement');
+        new ChainCache([new \stdClass()]);
     }
 
     public function testPrune()
@@ -51,23 +48,23 @@ class ChainCacheTest extends CacheTestCase
             $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
         }
 
-        $cache = new ChainCache(array(
+        $cache = new ChainCache([
             $this->getPruneableMock(),
             $this->getNonPruneableMock(),
             $this->getPruneableMock(),
-        ));
+        ]);
         $this->assertTrue($cache->prune());
 
-        $cache = new ChainCache(array(
+        $cache = new ChainCache([
             $this->getPruneableMock(),
             $this->getFailingPruneableMock(),
             $this->getPruneableMock(),
-        ));
+        ]);
         $this->assertFalse($cache->prune());
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface
+     * @return MockObject|PruneableCacheInterface
      */
     private function getPruneableMock()
     {
@@ -78,13 +75,13 @@ class ChainCacheTest extends CacheTestCase
         $pruneable
             ->expects($this->atLeastOnce())
             ->method('prune')
-            ->will($this->returnValue(true));
+            ->willReturn(true);
 
         return $pruneable;
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface
+     * @return MockObject|PruneableCacheInterface
      */
     private function getFailingPruneableMock()
     {
@@ -95,13 +92,13 @@ class ChainCacheTest extends CacheTestCase
         $pruneable
             ->expects($this->atLeastOnce())
             ->method('prune')
-            ->will($this->returnValue(false));
+            ->willReturn(false);
 
         return $pruneable;
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|CacheInterface
+     * @return MockObject|CacheInterface
      */
     private function getNonPruneableMock()
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/DoctrineCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/DoctrineCacheTest.php
index 127c9685..af4331d6 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/DoctrineCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/DoctrineCacheTest.php
@@ -19,10 +19,10 @@ use Symfony\Component\Cache\Tests\Fixtures\ArrayCache;
  */
 class DoctrineCacheTest extends CacheTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testObjectDoesNotChangeInCache' => 'ArrayCache does not use serialize/unserialize',
         'testNotUnserializable' => 'ArrayCache does not use serialize/unserialize',
-    );
+    ];
 
     public function createSimpleCache($defaultLifetime = 0)
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/MemcachedCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/MemcachedCacheTest.php
index c4af891a..6df682e9 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/MemcachedCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/MemcachedCacheTest.php
@@ -16,15 +16,15 @@ use Symfony\Component\Cache\Simple\MemcachedCache;
 
 class MemcachedCacheTest extends CacheTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testSetTtl' => 'Testing expiration slows down the test suite',
         'testSetMultipleTtl' => 'Testing expiration slows down the test suite',
         'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
-    );
+    ];
 
     protected static $client;
 
-    public static function setupBeforeClass()
+    public static function setUpBeforeClass()
     {
         if (!MemcachedCache::isSupported()) {
             self::markTestSkipped('Extension memcached >=2.2.0 required.');
@@ -40,20 +40,29 @@ class MemcachedCacheTest extends CacheTestCase
 
     public function createSimpleCache($defaultLifetime = 0)
     {
-        $client = $defaultLifetime ? AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), array('binary_protocol' => false)) : self::$client;
+        $client = $defaultLifetime ? AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['binary_protocol' => false]) : self::$client;
 
         return new MemcachedCache($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
     }
 
+    public function testCreatePersistentConnectionShouldNotDupServerList()
+    {
+        $instance = MemcachedCache::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['persistent_id' => 'persistent']);
+        $this->assertCount(1, $instance->getServerList());
+
+        $instance = MemcachedCache::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['persistent_id' => 'persistent']);
+        $this->assertCount(1, $instance->getServerList());
+    }
+
     public function testOptions()
     {
-        $client = MemcachedCache::createConnection(array(), array(
+        $client = MemcachedCache::createConnection([], [
             'libketama_compatible' => false,
             'distribution' => 'modula',
             'compression' => true,
             'serializer' => 'php',
             'hash' => 'md5',
-        ));
+        ]);
 
         $this->assertSame(\Memcached::SERIALIZER_PHP, $client->getOption(\Memcached::OPT_SERIALIZER));
         $this->assertSame(\Memcached::HASH_MD5, $client->getOption(\Memcached::OPT_HASH));
@@ -64,46 +73,50 @@ class MemcachedCacheTest extends CacheTestCase
 
     /**
      * @dataProvider provideBadOptions
-     * @expectedException \ErrorException
-     * @expectedExceptionMessage constant(): Couldn't find constant Memcached::
      */
     public function testBadOptions($name, $value)
     {
-        MemcachedCache::createConnection(array(), array($name => $value));
+        if (\PHP_VERSION_ID < 80000) {
+            $this->expectException('ErrorException');
+            $this->expectExceptionMessage('constant(): Couldn\'t find constant Memcached::');
+        } else {
+            $this->expectException('Error');
+            $this->expectExceptionMessage('Undefined constant Memcached::');
+        }
+
+        MemcachedCache::createConnection([], [$name => $value]);
     }
 
     public function provideBadOptions()
     {
-        return array(
-            array('foo', 'bar'),
-            array('hash', 'zyx'),
-            array('serializer', 'zyx'),
-            array('distribution', 'zyx'),
-        );
+        return [
+            ['foo', 'bar'],
+            ['hash', 'zyx'],
+            ['serializer', 'zyx'],
+            ['distribution', 'zyx'],
+        ];
     }
 
     public function testDefaultOptions()
     {
         $this->assertTrue(MemcachedCache::isSupported());
 
-        $client = MemcachedCache::createConnection(array());
+        $client = MemcachedCache::createConnection([]);
 
         $this->assertTrue($client->getOption(\Memcached::OPT_COMPRESSION));
         $this->assertSame(1, $client->getOption(\Memcached::OPT_BINARY_PROTOCOL));
         $this->assertSame(1, $client->getOption(\Memcached::OPT_LIBKETAMA_COMPATIBLE));
     }
 
-    /**
-     * @expectedException \Symfony\Component\Cache\Exception\CacheException
-     * @expectedExceptionMessage MemcachedAdapter: "serializer" option must be "php" or "igbinary".
-     */
     public function testOptionSerializer()
     {
+        $this->expectException('Symfony\Component\Cache\Exception\CacheException');
+        $this->expectExceptionMessage('MemcachedAdapter: "serializer" option must be "php" or "igbinary".');
         if (!\Memcached::HAVE_JSON) {
             $this->markTestSkipped('Memcached::HAVE_JSON required');
         }
 
-        new MemcachedCache(MemcachedCache::createConnection(array(), array('serializer' => 'json')));
+        new MemcachedCache(MemcachedCache::createConnection([], ['serializer' => 'json']));
     }
 
     /**
@@ -112,54 +125,54 @@ class MemcachedCacheTest extends CacheTestCase
     public function testServersSetting($dsn, $host, $port)
     {
         $client1 = MemcachedCache::createConnection($dsn);
-        $client2 = MemcachedCache::createConnection(array($dsn));
-        $client3 = MemcachedCache::createConnection(array(array($host, $port)));
-        $expect = array(
+        $client2 = MemcachedCache::createConnection([$dsn]);
+        $client3 = MemcachedCache::createConnection([[$host, $port]]);
+        $expect = [
             'host' => $host,
             'port' => $port,
-        );
+        ];
 
-        $f = function ($s) { return array('host' => $s['host'], 'port' => $s['port']); };
-        $this->assertSame(array($expect), array_map($f, $client1->getServerList()));
-        $this->assertSame(array($expect), array_map($f, $client2->getServerList()));
-        $this->assertSame(array($expect), array_map($f, $client3->getServerList()));
+        $f = function ($s) { return ['host' => $s['host'], 'port' => $s['port']]; };
+        $this->assertSame([$expect], array_map($f, $client1->getServerList()));
+        $this->assertSame([$expect], array_map($f, $client2->getServerList()));
+        $this->assertSame([$expect], array_map($f, $client3->getServerList()));
     }
 
     public function provideServersSetting()
     {
-        yield array(
+        yield [
             'memcached://127.0.0.1/50',
             '127.0.0.1',
             11211,
-        );
-        yield array(
+        ];
+        yield [
             'memcached://localhost:11222?weight=25',
             'localhost',
             11222,
-        );
-        if (ini_get('memcached.use_sasl')) {
-            yield array(
+        ];
+        if (filter_var(ini_get('memcached.use_sasl'), \FILTER_VALIDATE_BOOLEAN)) {
+            yield [
                 'memcached://user:password@127.0.0.1?weight=50',
                 '127.0.0.1',
                 11211,
-            );
+            ];
         }
-        yield array(
+        yield [
             'memcached:///var/run/memcached.sock?weight=25',
             '/var/run/memcached.sock',
             0,
-        );
-        yield array(
+        ];
+        yield [
             'memcached:///var/local/run/memcached.socket?weight=25',
             '/var/local/run/memcached.socket',
             0,
-        );
-        if (ini_get('memcached.use_sasl')) {
-            yield array(
+        ];
+        if (filter_var(ini_get('memcached.use_sasl'), \FILTER_VALIDATE_BOOLEAN)) {
+            yield [
                 'memcached://user:password@/var/local/run/memcached.socket?weight=25',
                 '/var/local/run/memcached.socket',
                 0,
-            );
+            ];
         }
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/MemcachedCacheTextModeTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/MemcachedCacheTextModeTest.php
new file mode 100644
index 00000000..13865a60
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/MemcachedCacheTextModeTest.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Simple;
+
+use Symfony\Component\Cache\Adapter\AbstractAdapter;
+use Symfony\Component\Cache\Simple\MemcachedCache;
+
+class MemcachedCacheTextModeTest extends MemcachedCacheTest
+{
+    public function createSimpleCache($defaultLifetime = 0)
+    {
+        $client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['binary_protocol' => false]);
+
+        return new MemcachedCache($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/NullCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/NullCacheTest.php
index 7b760fd3..31f42c32 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/NullCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/NullCacheTest.php
@@ -40,7 +40,7 @@ class NullCacheTest extends TestCase
     {
         $cache = $this->createCachePool();
 
-        $keys = array('foo', 'bar', 'baz', 'biz');
+        $keys = ['foo', 'bar', 'baz', 'biz'];
 
         $default = new \stdClass();
         $items = $cache->getMultiple($keys, $default);
@@ -75,7 +75,7 @@ class NullCacheTest extends TestCase
 
     public function testDeleteMultiple()
     {
-        $this->assertTrue($this->createCachePool()->deleteMultiple(array('key', 'foo', 'bar')));
+        $this->assertTrue($this->createCachePool()->deleteMultiple(['key', 'foo', 'bar']));
     }
 
     public function testSet()
@@ -90,7 +90,7 @@ class NullCacheTest extends TestCase
     {
         $cache = $this->createCachePool();
 
-        $this->assertFalse($cache->setMultiple(array('key' => 'val')));
+        $this->assertFalse($cache->setMultiple(['key' => 'val']));
         $this->assertNull($cache->get('key'));
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PdoCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PdoCacheTest.php
index cf573095..f5a26341 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PdoCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PdoCacheTest.php
@@ -23,9 +23,9 @@ class PdoCacheTest extends CacheTestCase
 
     protected static $dbFile;
 
-    public static function setupBeforeClass()
+    public static function setUpBeforeClass()
     {
-        if (!extension_loaded('pdo_sqlite')) {
+        if (!\extension_loaded('pdo_sqlite')) {
             self::markTestSkipped('Extension pdo_sqlite required.');
         }
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PdoDbalCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PdoDbalCacheTest.php
index 0c40c04a..4da2b603 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PdoDbalCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PdoDbalCacheTest.php
@@ -24,15 +24,15 @@ class PdoDbalCacheTest extends CacheTestCase
 
     protected static $dbFile;
 
-    public static function setupBeforeClass()
+    public static function setUpBeforeClass()
     {
-        if (!extension_loaded('pdo_sqlite')) {
+        if (!\extension_loaded('pdo_sqlite')) {
             self::markTestSkipped('Extension pdo_sqlite required.');
         }
 
         self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
 
-        $pool = new PdoCache(DriverManager::getConnection(array('driver' => 'pdo_sqlite', 'path' => self::$dbFile)));
+        $pool = new PdoCache(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]));
         $pool->createTable();
     }
 
@@ -43,6 +43,6 @@ class PdoDbalCacheTest extends CacheTestCase
 
     public function createSimpleCache($defaultLifetime = 0)
     {
-        return new PdoCache(DriverManager::getConnection(array('driver' => 'pdo_sqlite', 'path' => self::$dbFile)), '', $defaultLifetime);
+        return new PdoCache(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]), '', $defaultLifetime);
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpArrayCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpArrayCacheTest.php
index 1bd0ca27..bcd7dea5 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpArrayCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpArrayCacheTest.php
@@ -11,16 +11,16 @@
 
 namespace Symfony\Component\Cache\Tests\Simple;
 
-use Symfony\Component\Cache\Tests\Adapter\FilesystemAdapterTest;
 use Symfony\Component\Cache\Simple\NullCache;
 use Symfony\Component\Cache\Simple\PhpArrayCache;
+use Symfony\Component\Cache\Tests\Adapter\FilesystemAdapterTest;
 
 /**
  * @group time-sensitive
  */
 class PhpArrayCacheTest extends CacheTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testBasicUsageWithLongKey' => 'PhpArrayCache does no writes',
 
         'testDelete' => 'PhpArrayCache does no writes',
@@ -45,17 +45,19 @@ class PhpArrayCacheTest extends CacheTestCase
 
         'testDefaultLifeTime' => 'PhpArrayCache does not allow configuring a default lifetime.',
         'testPrune' => 'PhpArrayCache just proxies',
-    );
+    ];
 
     protected static $file;
 
-    public static function setupBeforeClass()
+    public static function setUpBeforeClass()
     {
         self::$file = sys_get_temp_dir().'/symfony-cache/php-array-adapter-test.php';
     }
 
     protected function tearDown()
     {
+        $this->createSimpleCache()->clear();
+
         if (file_exists(sys_get_temp_dir().'/symfony-cache')) {
             FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
         }
@@ -68,22 +70,22 @@ class PhpArrayCacheTest extends CacheTestCase
 
     public function testStore()
     {
-        $arrayWithRefs = array();
+        $arrayWithRefs = [];
         $arrayWithRefs[0] = 123;
         $arrayWithRefs[1] = &$arrayWithRefs[0];
 
-        $object = (object) array(
+        $object = (object) [
             'foo' => 'bar',
             'foo2' => 'bar2',
-        );
+        ];
 
-        $expected = array(
+        $expected = [
             'null' => null,
             'serializedString' => serialize($object),
             'arrayWithRefs' => $arrayWithRefs,
             'object' => $object,
-            'arrayWithObject' => array('bar' => $object),
-        );
+            'arrayWithObject' => ['bar' => $object],
+        ];
 
         $cache = new PhpArrayCache(self::$file, new NullCache());
         $cache->warmUp($expected);
@@ -95,13 +97,13 @@ class PhpArrayCacheTest extends CacheTestCase
 
     public function testStoredFile()
     {
-        $expected = array(
+        $expected = [
             'integer' => 42,
             'float' => 42.42,
             'boolean' => true,
-            'array_simple' => array('foo', 'bar'),
-            'array_associative' => array('foo' => 'bar', 'foo2' => 'bar2'),
-        );
+            'array_simple' => ['foo', 'bar'],
+            'array_associative' => ['foo' => 'bar', 'foo2' => 'bar2'],
+        ];
 
         $cache = new PhpArrayCache(self::$file, new NullCache());
         $cache->warmUp($expected);
@@ -116,7 +118,7 @@ class PhpArrayCacheWrapper extends PhpArrayCache
 {
     public function set($key, $value, $ttl = null)
     {
-        call_user_func(\Closure::bind(function () use ($key, $value) {
+        \call_user_func(\Closure::bind(function () use ($key, $value) {
             $this->values[$key] = $value;
             $this->warmUp($this->values);
             $this->values = eval(substr(file_get_contents($this->file), 6));
@@ -127,10 +129,10 @@ class PhpArrayCacheWrapper extends PhpArrayCache
 
     public function setMultiple($values, $ttl = null)
     {
-        if (!is_array($values) && !$values instanceof \Traversable) {
+        if (!\is_array($values) && !$values instanceof \Traversable) {
             return parent::setMultiple($values, $ttl);
         }
-        call_user_func(\Closure::bind(function () use ($values) {
+        \call_user_func(\Closure::bind(function () use ($values) {
             foreach ($values as $key => $value) {
                 $this->values[$key] = $value;
             }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php
index 4b6a94f7..b08c1604 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php
@@ -20,7 +20,7 @@ use Symfony\Component\Cache\Tests\Adapter\FilesystemAdapterTest;
  */
 class PhpArrayCacheWithFallbackTest extends CacheTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testGetInvalidKeys' => 'PhpArrayCache does no validation',
         'testGetMultipleInvalidKeys' => 'PhpArrayCache does no validation',
         'testDeleteInvalidKeys' => 'PhpArrayCache does no validation',
@@ -32,17 +32,19 @@ class PhpArrayCacheWithFallbackTest extends CacheTestCase
         'testSetMultipleInvalidTtl' => 'PhpArrayCache does no validation',
         'testHasInvalidKeys' => 'PhpArrayCache does no validation',
         'testPrune' => 'PhpArrayCache just proxies',
-    );
+    ];
 
     protected static $file;
 
-    public static function setupBeforeClass()
+    public static function setUpBeforeClass()
     {
         self::$file = sys_get_temp_dir().'/symfony-cache/php-array-adapter-test.php';
     }
 
     protected function tearDown()
     {
+        $this->createSimpleCache()->clear();
+
         if (file_exists(sys_get_temp_dir().'/symfony-cache')) {
             FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
         }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpFilesCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpFilesCacheTest.php
index 7a402682..936f29a4 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpFilesCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpFilesCacheTest.php
@@ -19,9 +19,9 @@ use Symfony\Component\Cache\Simple\PhpFilesCache;
  */
 class PhpFilesCacheTest extends CacheTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testDefaultLifeTime' => 'PhpFilesCache does not allow configuring a default lifetime.',
-    );
+    ];
 
     public function createSimpleCache()
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/Psr6CacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/Psr6CacheTest.php
index 78582894..1bc75c90 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/Psr6CacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/Psr6CacheTest.php
@@ -19,9 +19,9 @@ use Symfony\Component\Cache\Simple\Psr6Cache;
  */
 class Psr6CacheTest extends CacheTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testPrune' => 'Psr6Cache just proxies',
-    );
+    ];
 
     public function createSimpleCache($defaultLifetime = 0)
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisArrayCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisArrayCacheTest.php
index 3c903c8a..ec5e4c06 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisArrayCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisArrayCacheTest.php
@@ -13,12 +13,12 @@ namespace Symfony\Component\Cache\Tests\Simple;
 
 class RedisArrayCacheTest extends AbstractRedisCacheTest
 {
-    public static function setupBeforeClass()
+    public static function setUpBeforeClass()
     {
         parent::setupBeforeClass();
         if (!class_exists('RedisArray')) {
             self::markTestSkipped('The RedisArray class is required.');
         }
-        self::$redis = new \RedisArray(array(getenv('REDIS_HOST')), array('lazy_connect' => true));
+        self::$redis = new \RedisArray([getenv('REDIS_HOST')], ['lazy_connect' => true]);
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisCacheTest.php
index d33421f9..8e3f6088 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisCacheTest.php
@@ -15,7 +15,7 @@ use Symfony\Component\Cache\Simple\RedisCache;
 
 class RedisCacheTest extends AbstractRedisCacheTest
 {
-    public static function setupBeforeClass()
+    public static function setUpBeforeClass()
     {
         parent::setupBeforeClass();
         self::$redis = RedisCache::createConnection('redis://'.getenv('REDIS_HOST'));
@@ -33,50 +33,50 @@ class RedisCacheTest extends AbstractRedisCacheTest
         $redis = RedisCache::createConnection('redis://'.$redisHost.'/2');
         $this->assertSame(2, $redis->getDbNum());
 
-        $redis = RedisCache::createConnection('redis://'.$redisHost, array('timeout' => 3));
+        $redis = RedisCache::createConnection('redis://'.$redisHost, ['timeout' => 3]);
         $this->assertEquals(3, $redis->getTimeout());
 
         $redis = RedisCache::createConnection('redis://'.$redisHost.'?timeout=4');
         $this->assertEquals(4, $redis->getTimeout());
 
-        $redis = RedisCache::createConnection('redis://'.$redisHost, array('read_timeout' => 5));
+        $redis = RedisCache::createConnection('redis://'.$redisHost, ['read_timeout' => 5]);
         $this->assertEquals(5, $redis->getReadTimeout());
     }
 
     /**
      * @dataProvider provideFailedCreateConnection
-     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Redis connection failed
      */
     public function testFailedCreateConnection($dsn)
     {
+        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Redis connection ');
         RedisCache::createConnection($dsn);
     }
 
     public function provideFailedCreateConnection()
     {
-        return array(
-            array('redis://localhost:1234'),
-            array('redis://foo@localhost'),
-            array('redis://localhost/123'),
-        );
+        return [
+            ['redis://localhost:1234'],
+            ['redis://foo@localhost'],
+            ['redis://localhost/123'],
+        ];
     }
 
     /**
      * @dataProvider provideInvalidCreateConnection
-     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Invalid Redis DSN
      */
     public function testInvalidCreateConnection($dsn)
     {
+        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Invalid Redis DSN');
         RedisCache::createConnection($dsn);
     }
 
     public function provideInvalidCreateConnection()
     {
-        return array(
-            array('foo://localhost'),
-            array('redis://'),
-        );
+        return [
+            ['foo://localhost'],
+            ['redis://'],
+        ];
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisClusterCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisClusterCacheTest.php
new file mode 100644
index 00000000..6b7f8039
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisClusterCacheTest.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Simple;
+
+class RedisClusterCacheTest extends AbstractRedisCacheTest
+{
+    public static function setUpBeforeClass()
+    {
+        if (!class_exists('RedisCluster')) {
+            self::markTestSkipped('The RedisCluster class is required.');
+        }
+        if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) {
+            self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
+        }
+
+        self::$redis = new \RedisCluster(null, explode(' ', $hosts));
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/TraceableCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/TraceableCacheTest.php
index 535f93da..e684caf3 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/TraceableCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/TraceableCacheTest.php
@@ -19,9 +19,9 @@ use Symfony\Component\Cache\Simple\TraceableCache;
  */
 class TraceableCacheTest extends CacheTestCase
 {
-    protected $skippedTests = array(
+    protected $skippedTests = [
         'testPrune' => 'TraceableCache just proxies',
-    );
+    ];
 
     public function createSimpleCache($defaultLifetime = 0)
     {
@@ -37,7 +37,7 @@ class TraceableCacheTest extends CacheTestCase
 
         $call = $calls[0];
         $this->assertSame('get', $call->name);
-        $this->assertSame(array('k' => false), $call->result);
+        $this->assertSame(['k' => false], $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(1, $call->misses);
         $this->assertNotEmpty($call->start);
@@ -61,7 +61,7 @@ class TraceableCacheTest extends CacheTestCase
     {
         $pool = $this->createSimpleCache();
         $pool->set('k1', 123);
-        $values = $pool->getMultiple(array('k0', 'k1'));
+        $values = $pool->getMultiple(['k0', 'k1']);
         foreach ($values as $value) {
         }
         $calls = $pool->getCalls();
@@ -69,7 +69,7 @@ class TraceableCacheTest extends CacheTestCase
 
         $call = $calls[1];
         $this->assertSame('getMultiple', $call->name);
-        $this->assertSame(array('k1' => true, 'k0' => false), $call->result);
+        $this->assertSame(['k1' => true, 'k0' => false], $call->result);
         $this->assertSame(1, $call->misses);
         $this->assertNotEmpty($call->start);
         $this->assertNotEmpty($call->end);
@@ -84,7 +84,7 @@ class TraceableCacheTest extends CacheTestCase
 
         $call = $calls[0];
         $this->assertSame('has', $call->name);
-        $this->assertSame(array('k' => false), $call->result);
+        $this->assertSame(['k' => false], $call->result);
         $this->assertNotEmpty($call->start);
         $this->assertNotEmpty($call->end);
     }
@@ -99,7 +99,7 @@ class TraceableCacheTest extends CacheTestCase
 
         $call = $calls[1];
         $this->assertSame('has', $call->name);
-        $this->assertSame(array('k' => true), $call->result);
+        $this->assertSame(['k' => true], $call->result);
         $this->assertNotEmpty($call->start);
         $this->assertNotEmpty($call->end);
     }
@@ -113,7 +113,7 @@ class TraceableCacheTest extends CacheTestCase
 
         $call = $calls[0];
         $this->assertSame('delete', $call->name);
-        $this->assertSame(array('k' => true), $call->result);
+        $this->assertSame(['k' => true], $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(0, $call->misses);
         $this->assertNotEmpty($call->start);
@@ -123,14 +123,14 @@ class TraceableCacheTest extends CacheTestCase
     public function testDeleteMultipleTrace()
     {
         $pool = $this->createSimpleCache();
-        $arg = array('k0', 'k1');
+        $arg = ['k0', 'k1'];
         $pool->deleteMultiple($arg);
         $calls = $pool->getCalls();
         $this->assertCount(1, $calls);
 
         $call = $calls[0];
         $this->assertSame('deleteMultiple', $call->name);
-        $this->assertSame(array('keys' => $arg, 'result' => true), $call->result);
+        $this->assertSame(['keys' => $arg, 'result' => true], $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(0, $call->misses);
         $this->assertNotEmpty($call->start);
@@ -146,7 +146,7 @@ class TraceableCacheTest extends CacheTestCase
 
         $call = $calls[0];
         $this->assertSame('set', $call->name);
-        $this->assertSame(array('k' => true), $call->result);
+        $this->assertSame(['k' => true], $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(0, $call->misses);
         $this->assertNotEmpty($call->start);
@@ -156,13 +156,13 @@ class TraceableCacheTest extends CacheTestCase
     public function testSetMultipleTrace()
     {
         $pool = $this->createSimpleCache();
-        $pool->setMultiple(array('k' => 'foo'));
+        $pool->setMultiple(['k' => 'foo']);
         $calls = $pool->getCalls();
         $this->assertCount(1, $calls);
 
         $call = $calls[0];
         $this->assertSame('setMultiple', $call->name);
-        $this->assertSame(array('keys' => array('k'), 'result' => true), $call->result);
+        $this->assertSame(['keys' => ['k'], 'result' => true], $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(0, $call->misses);
         $this->assertNotEmpty($call->start);
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Traits/PdoPruneableTrait.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Traits/PdoPruneableTrait.php
index a9c459fb..c405de70 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Traits/PdoPruneableTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Traits/PdoPruneableTrait.php
@@ -24,11 +24,11 @@ trait PdoPruneableTrait
         $getPdoConn = $o->getMethod('getConnection');
         $getPdoConn->setAccessible(true);
 
-        /** @var \Doctrine\DBAL\Statement $select */
+        /** @var \Doctrine\DBAL\Statement|\PDOStatement $select */
         $select = $getPdoConn->invoke($cache)->prepare('SELECT 1 FROM cache_items WHERE item_id LIKE :id');
         $select->bindValue(':id', sprintf('%%%s', $name));
-        $select->execute();
+        $result = $select->execute();
 
-        return 0 === count($select->fetchAll(\PDO::FETCH_COLUMN));
+        return 1 !== (int) (\is_object($result) ? $result->fetchOne() : $select->fetch(\PDO::FETCH_COLUMN));
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/AbstractTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/AbstractTrait.php
index d7af3b55..dc291e10 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/AbstractTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/AbstractTrait.php
@@ -26,7 +26,7 @@ trait AbstractTrait
     private $namespace;
     private $namespaceVersion = '';
     private $versioningIsEnabled = false;
-    private $deferred = array();
+    private $deferred = [];
 
     /**
      * @var int|null The maximum length to enforce for identifiers or null when no limit applies
@@ -54,7 +54,7 @@ trait AbstractTrait
     /**
      * Deletes all items in the pool.
      *
-     * @param string The prefix used for all identifiers managed by this pool
+     * @param string $namespace The prefix used for all identifiers managed by this pool
      *
      * @return bool True if the pool was successfully cleared, false otherwise
      */
@@ -93,7 +93,7 @@ trait AbstractTrait
         try {
             return $this->doHave($id);
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to check if key "{key}" is cached', array('key' => $key, 'exception' => $e));
+            CacheItem::log($this->logger, 'Failed to check if key "{key}" is cached', ['key' => $key, 'exception' => $e]);
 
             return false;
         }
@@ -104,20 +104,23 @@ trait AbstractTrait
      */
     public function clear()
     {
+        $this->deferred = [];
         if ($cleared = $this->versioningIsEnabled) {
-            $this->namespaceVersion = 2;
-            foreach ($this->doFetch(array('@'.$this->namespace)) as $v) {
-                $this->namespaceVersion = 1 + (int) $v;
+            $namespaceVersion = substr_replace(base64_encode(pack('V', mt_rand())), static::NS_SEPARATOR, 5);
+            try {
+                $cleared = $this->doSave([static::NS_SEPARATOR.$this->namespace => $namespaceVersion], 0);
+            } catch (\Exception $e) {
+                $cleared = false;
+            }
+            if ($cleared = true === $cleared || [] === $cleared) {
+                $this->namespaceVersion = $namespaceVersion;
             }
-            $this->namespaceVersion .= ':';
-            $cleared = $this->doSave(array('@'.$this->namespace => $this->namespaceVersion), 0);
         }
-        $this->deferred = array();
 
         try {
             return $this->doClear($this->namespace) || $cleared;
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to clear the cache', array('exception' => $e));
+            CacheItem::log($this->logger, 'Failed to clear the cache', ['exception' => $e]);
 
             return false;
         }
@@ -128,7 +131,7 @@ trait AbstractTrait
      */
     public function deleteItem($key)
     {
-        return $this->deleteItems(array($key));
+        return $this->deleteItems([$key]);
     }
 
     /**
@@ -136,7 +139,7 @@ trait AbstractTrait
      */
     public function deleteItems(array $keys)
     {
-        $ids = array();
+        $ids = [];
 
         foreach ($keys as $key) {
             $ids[$key] = $this->getId($key);
@@ -156,12 +159,12 @@ trait AbstractTrait
         foreach ($ids as $key => $id) {
             try {
                 $e = null;
-                if ($this->doDelete(array($id))) {
+                if ($this->doDelete([$id])) {
                     continue;
                 }
             } catch (\Exception $e) {
             }
-            CacheItem::log($this->logger, 'Failed to delete key "{key}"', array('key' => $key, 'exception' => $e));
+            CacheItem::log($this->logger, 'Failed to delete key "{key}"', ['key' => $key, 'exception' => $e]);
             $ok = false;
         }
 
@@ -219,9 +222,9 @@ trait AbstractTrait
             if (false !== $value = unserialize($value)) {
                 return $value;
             }
-            throw new \DomainException('Failed to unserialize cached value');
+            throw new \DomainException('Failed to unserialize cached value.');
         } catch (\Error $e) {
-            throw new \ErrorException($e->getMessage(), $e->getCode(), E_ERROR, $e->getFile(), $e->getLine());
+            throw new \ErrorException($e->getMessage(), $e->getCode(), \E_ERROR, $e->getFile(), $e->getLine());
         } finally {
             ini_set('unserialize_callback_func', $unserializeCallbackHandler);
         }
@@ -232,17 +235,24 @@ trait AbstractTrait
         CacheItem::validateKey($key);
 
         if ($this->versioningIsEnabled && '' === $this->namespaceVersion) {
-            $this->namespaceVersion = '1:';
-            foreach ($this->doFetch(array('@'.$this->namespace)) as $v) {
-                $this->namespaceVersion = $v;
+            $this->namespaceVersion = '1'.static::NS_SEPARATOR;
+            try {
+                foreach ($this->doFetch([static::NS_SEPARATOR.$this->namespace]) as $v) {
+                    $this->namespaceVersion = $v;
+                }
+                if ('1'.static::NS_SEPARATOR === $this->namespaceVersion) {
+                    $this->namespaceVersion = substr_replace(base64_encode(pack('V', time())), static::NS_SEPARATOR, 5);
+                    $this->doSave([static::NS_SEPARATOR.$this->namespace => $this->namespaceVersion], 0);
+                }
+            } catch (\Exception $e) {
             }
         }
 
         if (null === $this->maxIdLength) {
             return $this->namespace.$this->namespaceVersion.$key;
         }
-        if (strlen($id = $this->namespace.$this->namespaceVersion.$key) > $this->maxIdLength) {
-            $id = $this->namespace.$this->namespaceVersion.substr_replace(base64_encode(hash('sha256', $key, true)), ':', -22);
+        if (\strlen($id = $this->namespace.$this->namespaceVersion.$key) > $this->maxIdLength) {
+            $id = $this->namespace.$this->namespaceVersion.substr_replace(base64_encode(hash('sha256', $key, true)), static::NS_SEPARATOR, -(\strlen($this->namespaceVersion) + 22));
         }
 
         return $id;
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/ApcuTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/ApcuTrait.php
index fe7dfbab..2f47f8e6 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/ApcuTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/ApcuTrait.php
@@ -23,15 +23,15 @@ trait ApcuTrait
 {
     public static function isSupported()
     {
-        return function_exists('apcu_fetch') && ini_get('apc.enabled');
+        return \function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN);
     }
 
     private function init($namespace, $defaultLifetime, $version)
     {
         if (!static::isSupported()) {
-            throw new CacheException('APCu is not enabled');
+            throw new CacheException('APCu is not enabled.');
         }
-        if ('cli' === PHP_SAPI) {
+        if ('cli' === \PHP_SAPI) {
             ini_set('apc.use_request_time', 0);
         }
         parent::__construct($namespace, $defaultLifetime);
@@ -52,13 +52,13 @@ trait ApcuTrait
     protected function doFetch(array $ids)
     {
         try {
-            foreach (apcu_fetch($ids, $ok) ?: array() as $k => $v) {
+            foreach (apcu_fetch($ids, $ok) ?: [] as $k => $v) {
                 if (null !== $v || $ok) {
                     yield $k => $v;
                 }
             }
         } catch (\Error $e) {
-            throw new \ErrorException($e->getMessage(), $e->getCode(), E_ERROR, $e->getFile(), $e->getLine());
+            throw new \ErrorException($e->getMessage(), $e->getCode(), \E_ERROR, $e->getFile(), $e->getLine());
         }
     }
 
@@ -75,8 +75,8 @@ trait ApcuTrait
      */
     protected function doClear($namespace)
     {
-        return isset($namespace[0]) && class_exists('APCuIterator', false) && ('cli' !== PHP_SAPI || ini_get('apc.enable_cli'))
-            ? apcu_delete(new \APCuIterator(sprintf('/^%s/', preg_quote($namespace, '/')), APC_ITER_KEY))
+        return isset($namespace[0]) && class_exists('APCuIterator', false) && ('cli' !== \PHP_SAPI || filter_var(ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN))
+            ? apcu_delete(new \APCuIterator(sprintf('/^%s/', preg_quote($namespace, '/')), \APC_ITER_KEY))
             : apcu_clear_cache();
     }
 
@@ -107,7 +107,7 @@ trait ApcuTrait
         } catch (\Exception $e) {
         }
 
-        if (1 === count($values)) {
+        if (1 === \count($values)) {
             // Workaround https://github.com/krakjoe/apcu/issues/170
             apcu_delete(key($values));
         }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/ArrayTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/ArrayTrait.php
index b7d2ad6d..0a60968e 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/ArrayTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/ArrayTrait.php
@@ -24,8 +24,8 @@ trait ArrayTrait
     use LoggerAwareTrait;
 
     private $storeSerialized;
-    private $values = array();
-    private $expiries = array();
+    private $values = [];
+    private $expiries = [];
 
     /**
      * Returns all cached values, with cache miss as null.
@@ -44,7 +44,7 @@ trait ArrayTrait
     {
         CacheItem::validateKey($key);
 
-        return isset($this->expiries[$key]) && ($this->expiries[$key] >= time() || !$this->deleteItem($key));
+        return isset($this->expiries[$key]) && ($this->expiries[$key] > time() || !$this->deleteItem($key));
     }
 
     /**
@@ -52,7 +52,7 @@ trait ArrayTrait
      */
     public function clear()
     {
-        $this->values = $this->expiries = array();
+        $this->values = $this->expiries = [];
 
         return true;
     }
@@ -81,7 +81,7 @@ trait ArrayTrait
     {
         foreach ($keys as $i => $key) {
             try {
-                if (!$isHit = isset($this->expiries[$key]) && ($this->expiries[$key] >= $now || !$this->deleteItem($key))) {
+                if (!$isHit = isset($this->expiries[$key]) && ($this->expiries[$key] > $now || !$this->deleteItem($key))) {
                     $this->values[$key] = $value = null;
                 } elseif (!$this->storeSerialized) {
                     $value = $this->values[$key];
@@ -92,7 +92,7 @@ trait ArrayTrait
                     $isHit = false;
                 }
             } catch (\Exception $e) {
-                CacheItem::log($this->logger, 'Failed to unserialize key "{key}"', array('key' => $key, 'exception' => $e));
+                CacheItem::log($this->logger, 'Failed to unserialize key "{key}"', ['key' => $key, 'exception' => $e]);
                 $this->values[$key] = $value = null;
                 $isHit = false;
             }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/DoctrineTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/DoctrineTrait.php
index c87ecaba..48623e67 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/DoctrineTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/DoctrineTrait.php
@@ -45,7 +45,7 @@ trait DoctrineTrait
                     case 'unserialize':
                     case 'apcu_fetch':
                     case 'apc_fetch':
-                        throw new \ErrorException($e->getMessage(), $e->getCode(), E_ERROR, $e->getFile(), $e->getLine());
+                        throw new \ErrorException($e->getMessage(), $e->getCode(), \E_ERROR, $e->getFile(), $e->getLine());
                 }
             }
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/FilesystemCommonTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/FilesystemCommonTrait.php
index b0f495e4..8071a382 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/FilesystemCommonTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/FilesystemCommonTrait.php
@@ -34,15 +34,15 @@ trait FilesystemCommonTrait
             if (preg_match('#[^-+_.A-Za-z0-9]#', $namespace, $match)) {
                 throw new InvalidArgumentException(sprintf('Namespace contains "%s" but only characters in [-+_.A-Za-z0-9] are allowed.', $match[0]));
             }
-            $directory .= DIRECTORY_SEPARATOR.$namespace;
+            $directory .= \DIRECTORY_SEPARATOR.$namespace;
         }
         if (!file_exists($directory)) {
             @mkdir($directory, 0777, true);
         }
-        $directory .= DIRECTORY_SEPARATOR;
+        $directory .= \DIRECTORY_SEPARATOR;
         // On Windows the whole path is limited to 258 chars
-        if ('\\' === DIRECTORY_SEPARATOR && strlen($directory) > 234) {
-            throw new InvalidArgumentException(sprintf('Cache directory too long (%s)', $directory));
+        if ('\\' === \DIRECTORY_SEPARATOR && \strlen($directory) > 234) {
+            throw new InvalidArgumentException(sprintf('Cache directory too long (%s).', $directory));
         }
 
         $this->directory = $directory;
@@ -99,7 +99,7 @@ trait FilesystemCommonTrait
     private function getFile($id, $mkdir = false)
     {
         $hash = str_replace('/', '-', base64_encode(hash('sha256', static::class.$id, true)));
-        $dir = $this->directory.strtoupper($hash[0].DIRECTORY_SEPARATOR.$hash[1].DIRECTORY_SEPARATOR);
+        $dir = $this->directory.strtoupper($hash[0].\DIRECTORY_SEPARATOR.$hash[1].\DIRECTORY_SEPARATOR);
 
         if ($mkdir && !file_exists($dir)) {
             @mkdir($dir, 0777, true);
@@ -116,6 +116,16 @@ trait FilesystemCommonTrait
         throw new \ErrorException($message, 0, $type, $file, $line);
     }
 
+    public function __sleep()
+    {
+        throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
+    }
+
+    public function __wakeup()
+    {
+        throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
+    }
+
     public function __destruct()
     {
         if (method_exists(parent::class, '__destruct')) {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/FilesystemTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/FilesystemTrait.php
index 23974b3b..9d7f5578 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/FilesystemTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/FilesystemTrait.php
@@ -52,7 +52,7 @@ trait FilesystemTrait
      */
     protected function doFetch(array $ids)
     {
-        $values = array();
+        $values = [];
         $now = time();
 
         foreach ($ids as $id) {
@@ -83,7 +83,7 @@ trait FilesystemTrait
     {
         $file = $this->getFile($id);
 
-        return file_exists($file) && (@filemtime($file) > time() || $this->doFetch(array($id)));
+        return file_exists($file) && (@filemtime($file) > time() || $this->doFetch([$id]));
     }
 
     /**
@@ -99,7 +99,7 @@ trait FilesystemTrait
         }
 
         if (!$ok && !is_writable($this->directory)) {
-            throw new CacheException(sprintf('Cache directory is not writable (%s)', $this->directory));
+            throw new CacheException(sprintf('Cache directory is not writable (%s).', $this->directory));
         }
 
         return $ok;
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/MemcachedTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/MemcachedTrait.php
index 9b877efb..34d0208e 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/MemcachedTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/MemcachedTrait.php
@@ -22,32 +22,32 @@ use Symfony\Component\Cache\Exception\InvalidArgumentException;
  */
 trait MemcachedTrait
 {
-    private static $defaultClientOptions = array(
+    private static $defaultClientOptions = [
         'persistent_id' => null,
         'username' => null,
         'password' => null,
-        'serializer' => 'php',
-    );
+        \Memcached::OPT_SERIALIZER => \Memcached::SERIALIZER_PHP,
+    ];
 
     private $client;
     private $lazyClient;
 
     public static function isSupported()
     {
-        return extension_loaded('memcached') && version_compare(phpversion('memcached'), '2.2.0', '>=');
+        return \extension_loaded('memcached') && version_compare(phpversion('memcached'), '2.2.0', '>=');
     }
 
     private function init(\Memcached $client, $namespace, $defaultLifetime)
     {
         if (!static::isSupported()) {
-            throw new CacheException('Memcached >= 2.2.0 is required');
+            throw new CacheException('Memcached >= 2.2.0 is required.');
         }
-        if ('Memcached' === get_class($client)) {
+        if ('Memcached' === \get_class($client)) {
             $opt = $client->getOption(\Memcached::OPT_SERIALIZER);
             if (\Memcached::SERIALIZER_PHP !== $opt && \Memcached::SERIALIZER_IGBINARY !== $opt) {
                 throw new CacheException('MemcachedAdapter: "serializer" option must be "php" or "igbinary".');
             }
-            $this->maxIdLength -= strlen($client->getOption(\Memcached::OPT_PREFIX_KEY));
+            $this->maxIdLength -= \strlen($client->getOption(\Memcached::OPT_PREFIX_KEY));
             $this->client = $client;
         } else {
             $this->lazyClient = $client;
@@ -64,24 +64,24 @@ trait MemcachedTrait
      *
      * Examples for servers:
      * - 'memcached://user:pass@localhost?weight=33'
-     * - array(array('localhost', 11211, 33))
+     * - [['localhost', 11211, 33]]
      *
-     * @param array[]|string|string[] An array of servers, a DSN, or an array of DSNs
-     * @param array                   An array of options
+     * @param array[]|string|string[] $servers An array of servers, a DSN, or an array of DSNs
+     * @param array                   $options An array of options
      *
      * @return \Memcached
      *
      * @throws \ErrorException When invalid options or servers are provided
      */
-    public static function createConnection($servers, array $options = array())
+    public static function createConnection($servers, array $options = [])
     {
-        if (is_string($servers)) {
-            $servers = array($servers);
-        } elseif (!is_array($servers)) {
-            throw new InvalidArgumentException(sprintf('MemcachedAdapter::createClient() expects array or string as first argument, %s given.', gettype($servers)));
+        if (\is_string($servers)) {
+            $servers = [$servers];
+        } elseif (!\is_array($servers)) {
+            throw new InvalidArgumentException(sprintf('MemcachedAdapter::createClient() expects array or string as first argument, "%s" given.', \gettype($servers)));
         }
         if (!static::isSupported()) {
-            throw new CacheException('Memcached >= 2.2.0 is required');
+            throw new CacheException('Memcached >= 2.2.0 is required.');
         }
         set_error_handler(function ($type, $msg, $file, $line) { throw new \ErrorException($msg, 0, $type, $file, $line); });
         try {
@@ -92,59 +92,60 @@ trait MemcachedTrait
 
             // parse any DSN in $servers
             foreach ($servers as $i => $dsn) {
-                if (is_array($dsn)) {
+                if (\is_array($dsn)) {
                     continue;
                 }
                 if (0 !== strpos($dsn, 'memcached://')) {
-                    throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s does not start with "memcached://"', $dsn));
+                    throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: "%s" does not start with "memcached://".', $dsn));
                 }
                 $params = preg_replace_callback('#^memcached://(?:([^@]*+)@)?#', function ($m) use (&$username, &$password) {
                     if (!empty($m[1])) {
-                        list($username, $password) = explode(':', $m[1], 2) + array(1 => null);
+                        list($username, $password) = explode(':', $m[1], 2) + [1 => null];
                     }
 
                     return 'file://';
                 }, $dsn);
                 if (false === $params = parse_url($params)) {
-                    throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s', $dsn));
+                    throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: "%s".', $dsn));
                 }
                 if (!isset($params['host']) && !isset($params['path'])) {
-                    throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s', $dsn));
+                    throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: "%s".', $dsn));
                 }
                 if (isset($params['path']) && preg_match('#/(\d+)$#', $params['path'], $m)) {
                     $params['weight'] = $m[1];
-                    $params['path'] = substr($params['path'], 0, -strlen($m[0]));
+                    $params['path'] = substr($params['path'], 0, -\strlen($m[0]));
                 }
-                $params += array(
+                $params += [
                     'host' => isset($params['host']) ? $params['host'] : $params['path'],
                     'port' => isset($params['host']) ? 11211 : null,
                     'weight' => 0,
-                );
+                ];
                 if (isset($params['query'])) {
                     parse_str($params['query'], $query);
                     $params += $query;
                     $options = $query + $options;
                 }
 
-                $servers[$i] = array($params['host'], $params['port'], $params['weight']);
+                $servers[$i] = [$params['host'], $params['port'], $params['weight']];
             }
 
             // set client's options
             unset($options['persistent_id'], $options['username'], $options['password'], $options['weight'], $options['lazy']);
-            $options = array_change_key_case($options, CASE_UPPER);
+            $options = array_change_key_case($options, \CASE_UPPER);
             $client->setOption(\Memcached::OPT_BINARY_PROTOCOL, true);
             $client->setOption(\Memcached::OPT_NO_BLOCK, true);
-            if (!array_key_exists('LIBKETAMA_COMPATIBLE', $options) && !array_key_exists(\Memcached::OPT_LIBKETAMA_COMPATIBLE, $options)) {
+            $client->setOption(\Memcached::OPT_TCP_NODELAY, true);
+            if (!\array_key_exists('LIBKETAMA_COMPATIBLE', $options) && !\array_key_exists(\Memcached::OPT_LIBKETAMA_COMPATIBLE, $options)) {
                 $client->setOption(\Memcached::OPT_LIBKETAMA_COMPATIBLE, true);
             }
             foreach ($options as $name => $value) {
-                if (is_int($name)) {
+                if (\is_int($name)) {
                     continue;
                 }
                 if ('HASH' === $name || 'SERIALIZER' === $name || 'DISTRIBUTION' === $name) {
-                    $value = constant('Memcached::'.$name.'_'.strtoupper($value));
+                    $value = \constant('Memcached::'.$name.'_'.strtoupper($value));
                 }
-                $opt = constant('Memcached::OPT_'.$name);
+                $opt = \constant('Memcached::OPT_'.$name);
 
                 unset($options[$name]);
                 $options[$opt] = $value;
@@ -153,14 +154,14 @@ trait MemcachedTrait
 
             // set client's servers, taking care of persistent connections
             if (!$client->isPristine()) {
-                $oldServers = array();
+                $oldServers = [];
                 foreach ($client->getServerList() as $server) {
-                    $oldServers[] = array($server['host'], $server['port']);
+                    $oldServers[] = [$server['host'], $server['port']];
                 }
 
-                $newServers = array();
+                $newServers = [];
                 foreach ($servers as $server) {
-                    if (1 < count($server)) {
+                    if (1 < \count($server)) {
                         $server = array_values($server);
                         unset($server[2]);
                         $server[1] = (int) $server[1];
@@ -169,12 +170,12 @@ trait MemcachedTrait
                 }
 
                 if ($oldServers !== $newServers) {
-                    // before resetting, ensure $servers is valid
-                    $client->addServers($servers);
                     $client->resetServerList();
+                    $client->addServers($servers);
                 }
+            } else {
+                $client->addServers($servers);
             }
-            $client->addServers($servers);
 
             if (null !== $username || null !== $password) {
                 if (!method_exists($client, 'setSaslAuthData')) {
@@ -198,7 +199,12 @@ trait MemcachedTrait
             $lifetime += time();
         }
 
-        return $this->checkResultCode($this->getClient()->setMulti($values, $lifetime));
+        $encodedValues = [];
+        foreach ($values as $key => $value) {
+            $encodedValues[rawurlencode($key)] = $value;
+        }
+
+        return $this->checkResultCode($this->getClient()->setMulti($encodedValues, $lifetime));
     }
 
     /**
@@ -208,9 +214,18 @@ trait MemcachedTrait
     {
         $unserializeCallbackHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');
         try {
-            return $this->checkResultCode($this->getClient()->getMulti($ids));
+            $encodedIds = array_map('rawurlencode', $ids);
+
+            $encodedResult = $this->checkResultCode($this->getClient()->getMulti($encodedIds));
+
+            $result = [];
+            foreach ($encodedResult as $key => $value) {
+                $result[rawurldecode($key)] = $value;
+            }
+
+            return $result;
         } catch (\Error $e) {
-            throw new \ErrorException($e->getMessage(), $e->getCode(), E_ERROR, $e->getFile(), $e->getLine());
+            throw new \ErrorException($e->getMessage(), $e->getCode(), \E_ERROR, $e->getFile(), $e->getLine());
         } finally {
             ini_set('unserialize_callback_func', $unserializeCallbackHandler);
         }
@@ -221,7 +236,7 @@ trait MemcachedTrait
      */
     protected function doHave($id)
     {
-        return false !== $this->getClient()->get($id) || $this->checkResultCode(\Memcached::RES_SUCCESS === $this->client->getResultCode());
+        return false !== $this->getClient()->get(rawurlencode($id)) || $this->checkResultCode(\Memcached::RES_SUCCESS === $this->client->getResultCode());
     }
 
     /**
@@ -230,9 +245,11 @@ trait MemcachedTrait
     protected function doDelete(array $ids)
     {
         $ok = true;
-        foreach ($this->checkResultCode($this->getClient()->deleteMulti($ids)) as $result) {
+        $encodedIds = array_map('rawurlencode', $ids);
+        foreach ($this->checkResultCode($this->getClient()->deleteMulti($encodedIds)) as $result) {
             if (\Memcached::RES_SUCCESS !== $result && \Memcached::RES_NOTFOUND !== $result) {
                 $ok = false;
+                break;
             }
         }
 
@@ -244,7 +261,7 @@ trait MemcachedTrait
      */
     protected function doClear($namespace)
     {
-        return false;
+        return '' === $namespace && $this->getClient()->flush();
     }
 
     private function checkResultCode($result)
@@ -255,7 +272,7 @@ trait MemcachedTrait
             return $result;
         }
 
-        throw new CacheException(sprintf('MemcachedAdapter client error: %s.', strtolower($this->client->getResultMessage())));
+        throw new CacheException('MemcachedAdapter client error: '.strtolower($this->client->getResultMessage()));
     }
 
     /**
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/PdoTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/PdoTrait.php
index a88099ec..917e8dd1 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/PdoTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/PdoTrait.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Cache\Traits;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Driver\ServerInfoAwareConnection;
 use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Driver\ServerInfoAwareConnection;
 use Doctrine\DBAL\Schema\Schema;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 
@@ -33,7 +33,7 @@ trait PdoTrait
     private $timeCol = 'item_time';
     private $username = '';
     private $password = '';
-    private $connectionOptions = array();
+    private $connectionOptions = [];
     private $namespace;
 
     private function init($connOrDsn, $namespace, $defaultLifetime, array $options)
@@ -44,16 +44,16 @@ trait PdoTrait
 
         if ($connOrDsn instanceof \PDO) {
             if (\PDO::ERRMODE_EXCEPTION !== $connOrDsn->getAttribute(\PDO::ATTR_ERRMODE)) {
-                throw new InvalidArgumentException(sprintf('"%s" requires PDO error mode attribute be set to throw Exceptions (i.e. $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION))', __CLASS__));
+                throw new InvalidArgumentException(sprintf('"%s" requires PDO error mode attribute be set to throw Exceptions (i.e. $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION)).', __CLASS__));
             }
 
             $this->conn = $connOrDsn;
         } elseif ($connOrDsn instanceof Connection) {
             $this->conn = $connOrDsn;
-        } elseif (is_string($connOrDsn)) {
+        } elseif (\is_string($connOrDsn)) {
             $this->dsn = $connOrDsn;
         } else {
-            throw new InvalidArgumentException(sprintf('"%s" requires PDO or Doctrine\DBAL\Connection instance or DSN string as first argument, "%s" given.', __CLASS__, is_object($connOrDsn) ? get_class($connOrDsn) : gettype($connOrDsn)));
+            throw new InvalidArgumentException(sprintf('"%s" requires PDO or Doctrine\DBAL\Connection instance or DSN string as first argument, "%s" given.', __CLASS__, \is_object($connOrDsn) ? \get_class($connOrDsn) : \gettype($connOrDsn)));
         }
 
         $this->table = isset($options['db_table']) ? $options['db_table'] : $this->table;
@@ -85,27 +85,31 @@ trait PdoTrait
         $conn = $this->getConnection();
 
         if ($conn instanceof Connection) {
-            $types = array(
+            $types = [
                 'mysql' => 'binary',
                 'sqlite' => 'text',
                 'pgsql' => 'string',
                 'oci' => 'string',
                 'sqlsrv' => 'string',
-            );
+            ];
             if (!isset($types[$this->driver])) {
                 throw new \DomainException(sprintf('Creating the cache table is currently not implemented for PDO driver "%s".', $this->driver));
             }
 
             $schema = new Schema();
             $table = $schema->createTable($this->table);
-            $table->addColumn($this->idCol, $types[$this->driver], array('length' => 255));
-            $table->addColumn($this->dataCol, 'blob', array('length' => 16777215));
-            $table->addColumn($this->lifetimeCol, 'integer', array('unsigned' => true, 'notnull' => false));
-            $table->addColumn($this->timeCol, 'integer', array('unsigned' => true));
-            $table->setPrimaryKey(array($this->idCol));
+            $table->addColumn($this->idCol, $types[$this->driver], ['length' => 255]);
+            $table->addColumn($this->dataCol, 'blob', ['length' => 16777215]);
+            $table->addColumn($this->lifetimeCol, 'integer', ['unsigned' => true, 'notnull' => false]);
+            $table->addColumn($this->timeCol, 'integer', ['unsigned' => true]);
+            $table->setPrimaryKey([$this->idCol]);
 
             foreach ($schema->toSql($conn->getDatabasePlatform()) as $sql) {
-                $conn->exec($sql);
+                if (method_exists($conn, 'executeStatement')) {
+                    $conn->executeStatement($sql);
+                } else {
+                    $conn->exec($sql);
+                }
             }
 
             return;
@@ -136,7 +140,11 @@ trait PdoTrait
                 throw new \DomainException(sprintf('Creating the cache table is currently not implemented for PDO driver "%s".', $this->driver));
         }
 
-        $conn->exec($sql);
+        if (method_exists($conn, 'executeStatement')) {
+            $conn->executeStatement($sql);
+        } else {
+            $conn->exec($sql);
+        }
     }
 
     /**
@@ -166,27 +174,34 @@ trait PdoTrait
     protected function doFetch(array $ids)
     {
         $now = time();
-        $expired = array();
+        $expired = [];
 
-        $sql = str_pad('', (count($ids) << 1) - 1, '?,');
+        $sql = str_pad('', (\count($ids) << 1) - 1, '?,');
         $sql = "SELECT $this->idCol, CASE WHEN $this->lifetimeCol IS NULL OR $this->lifetimeCol + $this->timeCol > ? THEN $this->dataCol ELSE NULL END FROM $this->table WHERE $this->idCol IN ($sql)";
         $stmt = $this->getConnection()->prepare($sql);
         $stmt->bindValue($i = 1, $now, \PDO::PARAM_INT);
         foreach ($ids as $id) {
             $stmt->bindValue(++$i, $id);
         }
-        $stmt->execute();
+        $result = $stmt->execute();
 
-        while ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
+        if (\is_object($result)) {
+            $result = $result->iterateNumeric();
+        } else {
+            $stmt->setFetchMode(\PDO::FETCH_NUM);
+            $result = $stmt;
+        }
+
+        foreach ($result as $row) {
             if (null === $row[1]) {
                 $expired[] = $row[0];
             } else {
-                yield $row[0] => parent::unserialize(is_resource($row[1]) ? stream_get_contents($row[1]) : $row[1]);
+                yield $row[0] => parent::unserialize(\is_resource($row[1]) ? stream_get_contents($row[1]) : $row[1]);
             }
         }
 
         if ($expired) {
-            $sql = str_pad('', (count($expired) << 1) - 1, '?,');
+            $sql = str_pad('', (\count($expired) << 1) - 1, '?,');
             $sql = "DELETE FROM $this->table WHERE $this->lifetimeCol + $this->timeCol <= ? AND $this->idCol IN ($sql)";
             $stmt = $this->getConnection()->prepare($sql);
             $stmt->bindValue($i = 1, $now, \PDO::PARAM_INT);
@@ -207,9 +222,9 @@ trait PdoTrait
 
         $stmt->bindValue(':id', $id);
         $stmt->bindValue(':time', time(), \PDO::PARAM_INT);
-        $stmt->execute();
+        $result = $stmt->execute();
 
-        return (bool) $stmt->fetchColumn();
+        return (bool) (\is_object($result) ? $result->fetchOne() : $stmt->fetchColumn());
     }
 
     /**
@@ -229,7 +244,11 @@ trait PdoTrait
             $sql = "DELETE FROM $this->table WHERE $this->idCol LIKE '$namespace%'";
         }
 
-        $conn->exec($sql);
+        if (method_exists($conn, 'executeStatement')) {
+            $conn->executeStatement($sql);
+        } else {
+            $conn->exec($sql);
+        }
 
         return true;
     }
@@ -239,7 +258,7 @@ trait PdoTrait
      */
     protected function doDelete(array $ids)
     {
-        $sql = str_pad('', (count($ids) << 1) - 1, '?,');
+        $sql = str_pad('', (\count($ids) << 1) - 1, '?,');
         $sql = "DELETE FROM $this->table WHERE $this->idCol IN ($sql)";
         $stmt = $this->getConnection()->prepare($sql);
         $stmt->execute(array_values($ids));
@@ -252,8 +271,8 @@ trait PdoTrait
      */
     protected function doSave(array $values, $lifetime)
     {
-        $serialized = array();
-        $failed = array();
+        $serialized = [];
+        $failed = [];
 
         foreach ($values as $id => $value) {
             try {
@@ -329,9 +348,9 @@ trait PdoTrait
         }
 
         foreach ($serialized as $id => $data) {
-            $stmt->execute();
+            $result = $stmt->execute();
 
-            if (null === $driver && !$stmt->rowCount()) {
+            if (null === $driver && !(\is_object($result) ? $result->rowCount() : $stmt->rowCount())) {
                 try {
                     $insertStmt->execute();
                 } catch (DBALException $e) {
@@ -357,25 +376,37 @@ trait PdoTrait
             if ($this->conn instanceof \PDO) {
                 $this->driver = $this->conn->getAttribute(\PDO::ATTR_DRIVER_NAME);
             } else {
-                switch ($this->driver = $this->conn->getDriver()->getName()) {
-                    case 'mysqli':
-                    case 'pdo_mysql':
-                    case 'drizzle_pdo_mysql':
+                $driver = $this->conn->getDriver();
+
+                switch (true) {
+                    case $driver instanceof \Doctrine\DBAL\Driver\AbstractMySQLDriver:
+                    case $driver instanceof \Doctrine\DBAL\Driver\DrizzlePDOMySql\Driver:
+                    case $driver instanceof \Doctrine\DBAL\Driver\Mysqli\Driver:
+                    case $driver instanceof \Doctrine\DBAL\Driver\PDOMySql\Driver:
+                    case $driver instanceof \Doctrine\DBAL\Driver\PDO\MySQL\Driver:
                         $this->driver = 'mysql';
                         break;
-                    case 'pdo_sqlite':
+                    case $driver instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver:
+                    case $driver instanceof \Doctrine\DBAL\Driver\PDO\SQLite\Driver:
                         $this->driver = 'sqlite';
                         break;
-                    case 'pdo_pgsql':
+                    case $driver instanceof \Doctrine\DBAL\Driver\PDOPgSql\Driver:
+                    case $driver instanceof \Doctrine\DBAL\Driver\PDO\PgSQL\Driver:
                         $this->driver = 'pgsql';
                         break;
-                    case 'oci8':
-                    case 'pdo_oracle':
+                    case $driver instanceof \Doctrine\DBAL\Driver\OCI8\Driver:
+                    case $driver instanceof \Doctrine\DBAL\Driver\PDOOracle\Driver:
+                    case $driver instanceof \Doctrine\DBAL\Driver\PDO\OCI\Driver:
                         $this->driver = 'oci';
                         break;
-                    case 'pdo_sqlsrv':
+                    case $driver instanceof \Doctrine\DBAL\Driver\SQLSrv\Driver:
+                    case $driver instanceof \Doctrine\DBAL\Driver\PDOSqlsrv\Driver:
+                    case $driver instanceof \Doctrine\DBAL\Driver\PDO\SQLSrv\Driver:
                         $this->driver = 'sqlsrv';
                         break;
+                    default:
+                        $this->driver = \get_class($driver);
+                        break;
                 }
             }
         }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/PhpArrayTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/PhpArrayTrait.php
index ae634d6b..972c7512 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/PhpArrayTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/PhpArrayTrait.php
@@ -28,6 +28,8 @@ trait PhpArrayTrait
     private $values;
     private $zendDetectUnicode;
 
+    private static $valuesCache = [];
+
     /**
      * Store an array of cached values.
      *
@@ -37,21 +39,21 @@ trait PhpArrayTrait
     {
         if (file_exists($this->file)) {
             if (!is_file($this->file)) {
-                throw new InvalidArgumentException(sprintf('Cache path exists and is not a file: %s.', $this->file));
+                throw new InvalidArgumentException(sprintf('Cache path exists and is not a file: "%s".', $this->file));
             }
 
             if (!is_writable($this->file)) {
-                throw new InvalidArgumentException(sprintf('Cache file is not writable: %s.', $this->file));
+                throw new InvalidArgumentException(sprintf('Cache file is not writable: "%s".', $this->file));
             }
         } else {
-            $directory = dirname($this->file);
+            $directory = \dirname($this->file);
 
             if (!is_dir($directory) && !@mkdir($directory, 0777, true)) {
-                throw new InvalidArgumentException(sprintf('Cache directory does not exist and cannot be created: %s.', $directory));
+                throw new InvalidArgumentException(sprintf('Cache directory does not exist and cannot be created: "%s".', $directory));
             }
 
             if (!is_writable($directory)) {
-                throw new InvalidArgumentException(sprintf('Cache directory is not writable: %s.', $directory));
+                throw new InvalidArgumentException(sprintf('Cache directory is not writable: "%s".', $directory));
             }
         }
 
@@ -60,21 +62,21 @@ trait PhpArrayTrait
 
 // This file has been auto-generated by the Symfony Cache Component.
 
-return array(
+return [
 
 
 EOF;
 
         foreach ($values as $key => $value) {
-            CacheItem::validateKey(is_int($key) ? (string) $key : $key);
+            CacheItem::validateKey(\is_int($key) ? (string) $key : $key);
 
-            if (null === $value || is_object($value)) {
+            if (null === $value || \is_object($value)) {
                 try {
                     $value = serialize($value);
                 } catch (\Exception $e) {
-                    throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable %s value.', $key, get_class($value)), 0, $e);
+                    throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable "%s" value.', $key, \get_class($value)), 0, $e);
                 }
-            } elseif (is_array($value)) {
+            } elseif (\is_array($value)) {
                 try {
                     $serialized = serialize($value);
                     $unserialized = unserialize($serialized);
@@ -85,19 +87,19 @@ EOF;
                 if ($unserialized !== $value || (false !== strpos($serialized, ';R:') && preg_match('/;R:[1-9]/', $serialized))) {
                     $value = $serialized;
                 }
-            } elseif (is_string($value)) {
+            } elseif (\is_string($value)) {
                 // Serialize strings if they could be confused with serialized objects or arrays
                 if ('N;' === $value || (isset($value[2]) && ':' === $value[1])) {
                     $value = serialize($value);
                 }
             } elseif (!is_scalar($value)) {
-                throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable %s value.', $key, gettype($value)));
+                throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable "%s" value.', $key, \gettype($value)));
             }
 
             $dump .= var_export($key, true).' => '.var_export($value, true).",\n";
         }
 
-        $dump .= "\n);\n";
+        $dump .= "\n];\n";
         $dump = str_replace("' . \"\\0\" . '", "\0", $dump);
 
         $tmpFile = uniqid($this->file, true);
@@ -107,6 +109,7 @@ EOF;
         unset($serialized, $unserialized, $value, $dump);
 
         @rename($tmpFile, $this->file);
+        unset(self::$valuesCache[$this->file]);
 
         $this->initialize();
     }
@@ -116,9 +119,10 @@ EOF;
      */
     public function clear()
     {
-        $this->values = array();
+        $this->values = [];
 
         $cleared = @unlink($this->file) || !file_exists($this->file);
+        unset(self::$valuesCache[$this->file]);
 
         return $this->pool->clear() && $cleared;
     }
@@ -128,11 +132,17 @@ EOF;
      */
     private function initialize()
     {
+        if (isset(self::$valuesCache[$this->file])) {
+            $this->values = self::$valuesCache[$this->file];
+
+            return;
+        }
+
         if ($this->zendDetectUnicode) {
             $zmb = ini_set('zend.detect_unicode', 0);
         }
         try {
-            $this->values = file_exists($this->file) ? (include $this->file ?: array()) : array();
+            $this->values = self::$valuesCache[$this->file] = file_exists($this->file) ? (include $this->file ?: []) : [];
         } finally {
             if ($this->zendDetectUnicode) {
                 ini_set('zend.detect_unicode', $zmb);
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/PhpFilesTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/PhpFilesTrait.php
index c800e1a1..2668b26c 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/PhpFilesTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/PhpFilesTrait.php
@@ -30,7 +30,7 @@ trait PhpFilesTrait
 
     public static function isSupported()
     {
-        return function_exists('opcache_invalidate') && ini_get('opcache.enable');
+        return \function_exists('opcache_invalidate') && filter_var(ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN);
     }
 
     /**
@@ -40,7 +40,7 @@ trait PhpFilesTrait
     {
         $time = time();
         $pruned = true;
-        $allowCompile = 'cli' !== PHP_SAPI || ini_get('opcache.enable_cli');
+        $allowCompile = 'cli' !== \PHP_SAPI || filter_var(ini_get('opcache.enable_cli'), \FILTER_VALIDATE_BOOLEAN);
 
         set_error_handler($this->includeHandler);
         try {
@@ -67,7 +67,7 @@ trait PhpFilesTrait
      */
     protected function doFetch(array $ids)
     {
-        $values = array();
+        $values = [];
         $now = time();
 
         if ($this->zendDetectUnicode) {
@@ -96,7 +96,7 @@ trait PhpFilesTrait
         foreach ($values as $id => $value) {
             if ('N;' === $value) {
                 $values[$id] = null;
-            } elseif (is_string($value) && isset($value[2]) && ':' === $value[1]) {
+            } elseif (\is_string($value) && isset($value[2]) && ':' === $value[1]) {
                 $values[$id] = parent::unserialize($value);
             }
         }
@@ -109,7 +109,7 @@ trait PhpFilesTrait
      */
     protected function doHave($id)
     {
-        return (bool) $this->doFetch(array($id));
+        return (bool) $this->doFetch([$id]);
     }
 
     /**
@@ -118,26 +118,26 @@ trait PhpFilesTrait
     protected function doSave(array $values, $lifetime)
     {
         $ok = true;
-        $data = array($lifetime ? time() + $lifetime : PHP_INT_MAX, '');
-        $allowCompile = 'cli' !== PHP_SAPI || ini_get('opcache.enable_cli');
+        $data = [$lifetime ? time() + $lifetime : \PHP_INT_MAX, ''];
+        $allowCompile = 'cli' !== \PHP_SAPI || filter_var(ini_get('opcache.enable_cli'), \FILTER_VALIDATE_BOOLEAN);
 
         foreach ($values as $key => $value) {
-            if (null === $value || is_object($value)) {
+            if (null === $value || \is_object($value)) {
                 $value = serialize($value);
-            } elseif (is_array($value)) {
+            } elseif (\is_array($value)) {
                 $serialized = serialize($value);
                 $unserialized = parent::unserialize($serialized);
                 // Store arrays serialized if they contain any objects or references
                 if ($unserialized !== $value || (false !== strpos($serialized, ';R:') && preg_match('/;R:[1-9]/', $serialized))) {
                     $value = $serialized;
                 }
-            } elseif (is_string($value)) {
+            } elseif (\is_string($value)) {
                 // Serialize strings if they could be confused with serialized objects or arrays
                 if ('N;' === $value || (isset($value[2]) && ':' === $value[1])) {
                     $value = serialize($value);
                 }
             } elseif (!is_scalar($value)) {
-                throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable %s value.', $key, gettype($value)));
+                throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable "%s" value.', $key, \gettype($value)));
             }
 
             $data[1] = $value;
@@ -150,7 +150,7 @@ trait PhpFilesTrait
         }
 
         if (!$ok && !is_writable($this->directory)) {
-            throw new CacheException(sprintf('Cache directory is not writable (%s)', $this->directory));
+            throw new CacheException(sprintf('Cache directory is not writable (%s).', $this->directory));
         }
 
         return $ok;
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/ProxyTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/ProxyTrait.php
index 06dba7e5..d9e085b9 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/ProxyTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/ProxyTrait.php
@@ -16,6 +16,8 @@ use Symfony\Component\Cache\ResettableInterface;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @internal
  */
 trait ProxyTrait
 {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/RedisProxy.php b/advancedcontentfilter/vendor/symfony/cache/Traits/RedisProxy.php
index b328f94c..98ea3aba 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/RedisProxy.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/RedisProxy.php
@@ -32,7 +32,7 @@ class RedisProxy
     {
         $this->ready ?: $this->ready = $this->initializer->__invoke($this->redis);
 
-        return \call_user_func_array(array($this->redis, $method), $args);
+        return \call_user_func_array([$this->redis, $method], $args);
     }
 
     public function hscan($strKey, &$iIterator, $strPattern = null, $iCount = null)
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/RedisTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/RedisTrait.php
index ac8b5a5f..a30d6d3f 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/RedisTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/RedisTrait.php
@@ -11,10 +11,9 @@
 
 namespace Symfony\Component\Cache\Traits;
 
-use Predis\Connection\Factory;
 use Predis\Connection\Aggregate\ClusterInterface;
-use Predis\Connection\Aggregate\PredisCluster;
 use Predis\Connection\Aggregate\RedisCluster;
+use Predis\Connection\Factory;
 use Predis\Response\Status;
 use Symfony\Component\Cache\Exception\CacheException;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
@@ -27,7 +26,7 @@ use Symfony\Component\Cache\Exception\InvalidArgumentException;
  */
 trait RedisTrait
 {
-    private static $defaultConnectionOptions = array(
+    private static $defaultConnectionOptions = [
         'class' => null,
         'persistent' => 0,
         'persistent_id' => null,
@@ -35,23 +34,21 @@ trait RedisTrait
         'read_timeout' => 0,
         'retry_interval' => 0,
         'lazy' => false,
-    );
+    ];
     private $redis;
 
     /**
      * @param \Redis|\RedisArray|\RedisCluster|\Predis\Client $redisClient
      */
-    public function init($redisClient, $namespace = '', $defaultLifetime = 0)
+    private function init($redisClient, $namespace = '', $defaultLifetime = 0)
     {
         parent::__construct($namespace, $defaultLifetime);
 
         if (preg_match('#[^-+_.A-Za-z0-9]#', $namespace, $match)) {
             throw new InvalidArgumentException(sprintf('RedisAdapter namespace contains "%s" but only characters in [-+_.A-Za-z0-9] are allowed.', $match[0]));
         }
-        if ($redisClient instanceof \RedisCluster) {
-            $this->enableVersioning();
-        } elseif (!$redisClient instanceof \Redis && !$redisClient instanceof \RedisArray && !$redisClient instanceof \Predis\Client && !$redisClient instanceof RedisProxy) {
-            throw new InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\Client, %s given', __METHOD__, is_object($redisClient) ? get_class($redisClient) : gettype($redisClient)));
+        if (!$redisClient instanceof \Redis && !$redisClient instanceof \RedisArray && !$redisClient instanceof \RedisCluster && !$redisClient instanceof \Predis\Client && !$redisClient instanceof RedisProxy) {
+            throw new InvalidArgumentException(sprintf('"%s()" expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\Client, "%s" given.', __METHOD__, \is_object($redisClient) ? \get_class($redisClient) : \gettype($redisClient)));
         }
         $this->redis = $redisClient;
     }
@@ -73,10 +70,10 @@ trait RedisTrait
      *
      * @return \Redis|\Predis\Client According to the "class" option
      */
-    public static function createConnection($dsn, array $options = array())
+    public static function createConnection($dsn, array $options = [])
     {
         if (0 !== strpos($dsn, 'redis://')) {
-            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s does not start with "redis://"', $dsn));
+            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s" does not start with "redis://".', $dsn));
         }
         $params = preg_replace_callback('#^redis://(?:(?:[^:@]*+:)?([^@]*+)@)?#', function ($m) use (&$auth) {
             if (isset($m[1])) {
@@ -86,34 +83,34 @@ trait RedisTrait
             return 'file://';
         }, $dsn);
         if (false === $params = parse_url($params)) {
-            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s', $dsn));
+            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s".', $dsn));
         }
         if (!isset($params['host']) && !isset($params['path'])) {
-            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s', $dsn));
+            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s".', $dsn));
         }
         if (isset($params['path']) && preg_match('#/(\d+)$#', $params['path'], $m)) {
             $params['dbindex'] = $m[1];
-            $params['path'] = substr($params['path'], 0, -strlen($m[0]));
+            $params['path'] = substr($params['path'], 0, -\strlen($m[0]));
         }
         if (isset($params['host'])) {
             $scheme = 'tcp';
         } else {
             $scheme = 'unix';
         }
-        $params += array(
+        $params += [
             'host' => isset($params['host']) ? $params['host'] : $params['path'],
             'port' => isset($params['host']) ? 6379 : null,
             'dbindex' => 0,
-        );
+        ];
         if (isset($params['query'])) {
             parse_str($params['query'], $query);
             $params += $query;
         }
         $params += $options + self::$defaultConnectionOptions;
-        if (null === $params['class'] && !extension_loaded('redis') && !class_exists(\Predis\Client::class)) {
-            throw new CacheException(sprintf('Cannot find the "redis" extension, and "predis/predis" is not installed: %s', $dsn));
+        if (null === $params['class'] && !\extension_loaded('redis') && !class_exists(\Predis\Client::class)) {
+            throw new CacheException(sprintf('Cannot find the "redis" extension, and "predis/predis" is not installed: "%s".', $dsn));
         }
-        $class = null === $params['class'] ? (extension_loaded('redis') ? \Redis::class : \Predis\Client::class) : $params['class'];
+        $class = null === $params['class'] ? (\extension_loaded('redis') ? \Redis::class : \Predis\Client::class) : $params['class'];
 
         if (is_a($class, \Redis::class, true)) {
             $connect = $params['persistent'] || $params['persistent_id'] ? 'pconnect' : 'connect';
@@ -122,21 +119,24 @@ trait RedisTrait
             $initializer = function ($redis) use ($connect, $params, $dsn, $auth) {
                 try {
                     @$redis->{$connect}($params['host'], $params['port'], $params['timeout'], $params['persistent_id'], $params['retry_interval']);
+
+                    set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
+                    $isConnected = $redis->isConnected();
+                    restore_error_handler();
+                    if (!$isConnected) {
+                        $error = preg_match('/^Redis::p?connect\(\): (.*)/', $error, $error) ? sprintf(' (%s)', $error[1]) : '';
+                        throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$error.'.');
+                    }
+
+                    if ((null !== $auth && !$redis->auth($auth))
+                        || ($params['dbindex'] && !$redis->select($params['dbindex']))
+                        || ($params['read_timeout'] && !$redis->setOption(\Redis::OPT_READ_TIMEOUT, $params['read_timeout']))
+                    ) {
+                        $e = preg_replace('/^ERR /', '', $redis->getLastError());
+                        throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e.'.');
+                    }
                 } catch (\RedisException $e) {
-                    throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s', $e->getMessage(), $dsn));
-                }
-
-                if (@!$redis->isConnected()) {
-                    $e = ($e = error_get_last()) && preg_match('/^Redis::p?connect\(\): (.*)/', $e['message'], $e) ? sprintf(' (%s)', $e[1]) : '';
-                    throw new InvalidArgumentException(sprintf('Redis connection failed%s: %s', $e, $dsn));
-                }
-
-                if ((null !== $auth && !$redis->auth($auth))
-                    || ($params['dbindex'] && !$redis->select($params['dbindex']))
-                    || ($params['read_timeout'] && !$redis->setOption(\Redis::OPT_READ_TIMEOUT, $params['read_timeout']))
-                ) {
-                    $e = preg_replace('/^ERR /', '', $redis->getLastError());
-                    throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s', $e, $dsn));
+                    throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e->getMessage());
                 }
 
                 return true;
@@ -153,9 +153,9 @@ trait RedisTrait
             $params['password'] = $auth;
             $redis = new $class((new Factory())->create($params));
         } elseif (class_exists($class, false)) {
-            throw new InvalidArgumentException(sprintf('"%s" is not a subclass of "Redis" or "Predis\Client"', $class));
+            throw new InvalidArgumentException(sprintf('"%s" is not a subclass of "Redis" or "Predis\Client".', $class));
         } else {
-            throw new InvalidArgumentException(sprintf('Class "%s" does not exist', $class));
+            throw new InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));
         }
 
         return $redis;
@@ -166,18 +166,35 @@ trait RedisTrait
      */
     protected function doFetch(array $ids)
     {
-        if ($ids) {
+        if (!$ids) {
+            return [];
+        }
+
+        $result = [];
+
+        if ($this->redis instanceof \Predis\Client && $this->redis->getConnection() instanceof ClusterInterface) {
             $values = $this->pipeline(function () use ($ids) {
                 foreach ($ids as $id) {
-                    yield 'get' => array($id);
+                    yield 'get' => [$id];
                 }
             });
-            foreach ($values as $id => $v) {
-                if ($v) {
-                    yield $id => parent::unserialize($v);
-                }
+        } else {
+            $values = $this->redis->mget($ids);
+
+            if (!\is_array($values) || \count($values) !== \count($ids)) {
+                return [];
+            }
+
+            $values = array_combine($ids, $values);
+        }
+
+        foreach ($values as $id => $v) {
+            if ($v) {
+                $result[$id] = parent::unserialize($v);
             }
         }
+
+        return $result;
     }
 
     /**
@@ -193,32 +210,31 @@ trait RedisTrait
      */
     protected function doClear($namespace)
     {
-        // When using a native Redis cluster, clearing the cache is done by versioning in AbstractTrait::clear().
-        // This means old keys are not really removed until they expire and may need gargage collection.
-
         $cleared = true;
-        $hosts = array($this->redis);
-        $evalArgs = array(array($namespace), 0);
+        $hosts = [$this->redis];
+        $evalArgs = [[$namespace], 0];
 
         if ($this->redis instanceof \Predis\Client) {
-            $evalArgs = array(0, $namespace);
+            $evalArgs = [0, $namespace];
 
             $connection = $this->redis->getConnection();
-            if ($connection instanceof PredisCluster) {
-                $hosts = array();
+            if ($connection instanceof ClusterInterface && $connection instanceof \Traversable) {
+                $hosts = [];
                 foreach ($connection as $c) {
                     $hosts[] = new \Predis\Client($c);
                 }
-            } elseif ($connection instanceof RedisCluster) {
-                return false;
             }
         } elseif ($this->redis instanceof \RedisArray) {
-            $hosts = array();
+            $hosts = [];
             foreach ($this->redis->_hosts() as $host) {
                 $hosts[] = $this->redis->_instance($host);
             }
         } elseif ($this->redis instanceof \RedisCluster) {
-            return false;
+            $hosts = [];
+            foreach ($this->redis->_masters() as $host) {
+                $hosts[] = $h = new \Redis();
+                $h->connect($host[0], $host[1]);
+            }
         }
         foreach ($hosts as $host) {
             if (!isset($namespace[0])) {
@@ -240,12 +256,12 @@ trait RedisTrait
             $cursor = null;
             do {
                 $keys = $host instanceof \Predis\Client ? $host->scan($cursor, 'MATCH', $namespace.'*', 'COUNT', 1000) : $host->scan($cursor, $namespace.'*', 1000);
-                if (isset($keys[1]) && is_array($keys[1])) {
+                if (isset($keys[1]) && \is_array($keys[1])) {
                     $cursor = $keys[0];
                     $keys = $keys[1];
                 }
                 if ($keys) {
-                    $host->del($keys);
+                    $this->doDelete($keys);
                 }
             } while ($cursor = (int) $cursor);
         }
@@ -258,7 +274,17 @@ trait RedisTrait
      */
     protected function doDelete(array $ids)
     {
-        if ($ids) {
+        if (!$ids) {
+            return true;
+        }
+
+        if ($this->redis instanceof \Predis\Client && $this->redis->getConnection() instanceof ClusterInterface) {
+            $this->pipeline(function () use ($ids) {
+                foreach ($ids as $id) {
+                    yield 'del' => [$id];
+                }
+            })->rewind();
+        } else {
             $this->redis->del($ids);
         }
 
@@ -270,8 +296,8 @@ trait RedisTrait
      */
     protected function doSave(array $values, $lifetime)
     {
-        $serialized = array();
-        $failed = array();
+        $serialized = [];
+        $failed = [];
 
         foreach ($values as $id => $value) {
             try {
@@ -288,9 +314,9 @@ trait RedisTrait
         $results = $this->pipeline(function () use ($serialized, $lifetime) {
             foreach ($serialized as $id => $value) {
                 if (0 >= $lifetime) {
-                    yield 'set' => array($id, $value);
+                    yield 'set' => [$id, $value];
                 } else {
-                    yield 'setEx' => array($id, $lifetime, $value);
+                    yield 'setEx' => [$id, $lifetime, $value];
                 }
             }
         });
@@ -305,24 +331,33 @@ trait RedisTrait
 
     private function pipeline(\Closure $generator)
     {
-        $ids = array();
+        $ids = [];
 
-        if ($this->redis instanceof \Predis\Client && !$this->redis->getConnection() instanceof ClusterInterface) {
+        if ($this->redis instanceof \RedisCluster || ($this->redis instanceof \Predis\Client && $this->redis->getConnection() instanceof RedisCluster)) {
+            // phpredis & predis don't support pipelining with RedisCluster
+            // see https://github.com/phpredis/phpredis/blob/develop/cluster.markdown#pipelining
+            // see https://github.com/nrk/predis/issues/267#issuecomment-123781423
+            $results = [];
+            foreach ($generator() as $command => $args) {
+                $results[] = \call_user_func_array([$this->redis, $command], $args);
+                $ids[] = $args[0];
+            }
+        } elseif ($this->redis instanceof \Predis\Client) {
             $results = $this->redis->pipeline(function ($redis) use ($generator, &$ids) {
                 foreach ($generator() as $command => $args) {
-                    call_user_func_array(array($redis, $command), $args);
+                    \call_user_func_array([$redis, $command], $args);
                     $ids[] = $args[0];
                 }
             });
         } elseif ($this->redis instanceof \RedisArray) {
-            $connections = $results = $ids = array();
+            $connections = $results = $ids = [];
             foreach ($generator() as $command => $args) {
                 if (!isset($connections[$h = $this->redis->_target($args[0])])) {
-                    $connections[$h] = array($this->redis->_instance($h), -1);
+                    $connections[$h] = [$this->redis->_instance($h), -1];
                     $connections[$h][0]->multi(\Redis::PIPELINE);
                 }
-                call_user_func_array(array($connections[$h][0], $command), $args);
-                $results[] = array($h, ++$connections[$h][1]);
+                \call_user_func_array([$connections[$h][0], $command], $args);
+                $results[] = [$h, ++$connections[$h][1]];
                 $ids[] = $args[0];
             }
             foreach ($connections as $h => $c) {
@@ -331,19 +366,10 @@ trait RedisTrait
             foreach ($results as $k => list($h, $c)) {
                 $results[$k] = $connections[$h][$c];
             }
-        } elseif ($this->redis instanceof \RedisCluster || ($this->redis instanceof \Predis\Client && $this->redis->getConnection() instanceof ClusterInterface)) {
-            // phpredis & predis don't support pipelining with RedisCluster
-            // see https://github.com/phpredis/phpredis/blob/develop/cluster.markdown#pipelining
-            // see https://github.com/nrk/predis/issues/267#issuecomment-123781423
-            $results = array();
-            foreach ($generator() as $command => $args) {
-                $results[] = call_user_func_array(array($this->redis, $command), $args);
-                $ids[] = $args[0];
-            }
         } else {
             $this->redis->multi(\Redis::PIPELINE);
             foreach ($generator() as $command => $args) {
-                call_user_func_array(array($this->redis, $command), $args);
+                \call_user_func_array([$this->redis, $command], $args);
                 $ids[] = $args[0];
             }
             $results = $this->redis->exec();
diff --git a/advancedcontentfilter/vendor/symfony/cache/composer.json b/advancedcontentfilter/vendor/symfony/cache/composer.json
index e13cd967..f412e4f1 100644
--- a/advancedcontentfilter/vendor/symfony/cache/composer.json
+++ b/advancedcontentfilter/vendor/symfony/cache/composer.json
@@ -28,9 +28,9 @@
     },
     "require-dev": {
         "cache/integration-tests": "dev-master",
-        "doctrine/cache": "~1.6",
-        "doctrine/dbal": "~2.4",
-        "predis/predis": "~1.0"
+        "doctrine/cache": "^1.6",
+        "doctrine/dbal": "^2.4|^3.0",
+        "predis/predis": "^1.0"
     },
     "conflict": {
         "symfony/var-dumper": "<3.3"
@@ -41,10 +41,5 @@
             "/Tests/"
         ]
     },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.4-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/phpunit.xml.dist b/advancedcontentfilter/vendor/symfony/cache/phpunit.xml.dist
index 9b3c30d7..c35458ca 100644
--- a/advancedcontentfilter/vendor/symfony/cache/phpunit.xml.dist
+++ b/advancedcontentfilter/vendor/symfony/cache/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.2/phpunit.xsd"
          backupGlobals="false"
          colors="true"
          bootstrap="vendor/autoload.php"
@@ -36,11 +36,11 @@
                 <array>
                     <element key="time-sensitive">
                         <array>
-                            <element><string>Cache\IntegrationTests</string></element>
-                            <element><string>Doctrine\Common\Cache</string></element>
-                            <element><string>Symfony\Component\Cache</string></element>
-                            <element><string>Symfony\Component\Cache\Tests\Fixtures</string></element>
-                            <element><string>Symfony\Component\Cache\Traits</string></element>
+                            <element key="0"><string>Cache\IntegrationTests</string></element>
+                            <element key="1"><string>Doctrine\Common\Cache</string></element>
+                            <element key="2"><string>Symfony\Component\Cache</string></element>
+                            <element key="3"><string>Symfony\Component\Cache\Tests\Fixtures</string></element>
+                            <element key="4"><string>Symfony\Component\Cache\Traits</string></element>
                         </array>
                     </element>
                 </array>
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Compiler.php b/advancedcontentfilter/vendor/symfony/expression-language/Compiler.php
index 66d10604..1ae427b9 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Compiler.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Compiler.php
@@ -110,22 +110,22 @@ class Compiler
      */
     public function repr($value)
     {
-        if (is_int($value) || is_float($value)) {
-            if (false !== $locale = setlocale(LC_NUMERIC, 0)) {
-                setlocale(LC_NUMERIC, 'C');
+        if (\is_int($value) || \is_float($value)) {
+            if (false !== $locale = setlocale(\LC_NUMERIC, 0)) {
+                setlocale(\LC_NUMERIC, 'C');
             }
 
             $this->raw($value);
 
             if (false !== $locale) {
-                setlocale(LC_NUMERIC, $locale);
+                setlocale(\LC_NUMERIC, $locale);
             }
         } elseif (null === $value) {
             $this->raw('null');
-        } elseif (is_bool($value)) {
+        } elseif (\is_bool($value)) {
             $this->raw($value ? 'true' : 'false');
-        } elseif (is_array($value)) {
-            $this->raw('array(');
+        } elseif (\is_array($value)) {
+            $this->raw('[');
             $first = true;
             foreach ($value as $key => $value) {
                 if (!$first) {
@@ -136,7 +136,7 @@ class Compiler
                 $this->raw(' => ');
                 $this->repr($value);
             }
-            $this->raw(')');
+            $this->raw(']');
         } else {
             $this->string($value);
         }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/ExpressionFunction.php b/advancedcontentfilter/vendor/symfony/expression-language/ExpressionFunction.php
index ad775dbd..77c88f66 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/ExpressionFunction.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/ExpressionFunction.php
@@ -76,23 +76,23 @@ class ExpressionFunction
     public static function fromPhp($phpFunctionName, $expressionFunctionName = null)
     {
         $phpFunctionName = ltrim($phpFunctionName, '\\');
-        if (!function_exists($phpFunctionName)) {
+        if (!\function_exists($phpFunctionName)) {
             throw new \InvalidArgumentException(sprintf('PHP function "%s" does not exist.', $phpFunctionName));
         }
 
         $parts = explode('\\', $phpFunctionName);
-        if (!$expressionFunctionName && count($parts) > 1) {
+        if (!$expressionFunctionName && \count($parts) > 1) {
             throw new \InvalidArgumentException(sprintf('An expression function name must be defined when PHP function "%s" is namespaced.', $phpFunctionName));
         }
 
         $compiler = function () use ($phpFunctionName) {
-            return sprintf('\%s(%s)', $phpFunctionName, implode(', ', func_get_args()));
+            return sprintf('\%s(%s)', $phpFunctionName, implode(', ', \func_get_args()));
         };
 
         $evaluator = function () use ($phpFunctionName) {
-            $args = func_get_args();
+            $args = \func_get_args();
 
-            return call_user_func_array($phpFunctionName, array_splice($args, 1));
+            return \call_user_func_array($phpFunctionName, array_splice($args, 1));
         };
 
         return new self($expressionFunctionName ?: end($parts), $compiler, $evaluator);
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/ExpressionLanguage.php b/advancedcontentfilter/vendor/symfony/expression-language/ExpressionLanguage.php
index a9cfc4ca..16476669 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/ExpressionLanguage.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/ExpressionLanguage.php
@@ -28,20 +28,20 @@ class ExpressionLanguage
     private $parser;
     private $compiler;
 
-    protected $functions = array();
+    protected $functions = [];
 
     /**
      * @param CacheItemPoolInterface                $cache
      * @param ExpressionFunctionProviderInterface[] $providers
      */
-    public function __construct($cache = null, array $providers = array())
+    public function __construct($cache = null, array $providers = [])
     {
         if (null !== $cache) {
             if ($cache instanceof ParserCacheInterface) {
-                @trigger_error(sprintf('Passing an instance of %s as constructor argument for %s is deprecated as of 3.2 and will be removed in 4.0. Pass an instance of %s instead.', ParserCacheInterface::class, self::class, CacheItemPoolInterface::class), E_USER_DEPRECATED);
+                @trigger_error(sprintf('Passing an instance of %s as constructor argument for %s is deprecated as of 3.2 and will be removed in 4.0. Pass an instance of %s instead.', ParserCacheInterface::class, self::class, CacheItemPoolInterface::class), \E_USER_DEPRECATED);
                 $cache = new ParserCacheAdapter($cache);
             } elseif (!$cache instanceof CacheItemPoolInterface) {
-                throw new \InvalidArgumentException(sprintf('Cache argument has to implement %s.', CacheItemPoolInterface::class));
+                throw new \InvalidArgumentException(sprintf('Cache argument has to implement "%s".', CacheItemPoolInterface::class));
             }
         }
 
@@ -60,7 +60,7 @@ class ExpressionLanguage
      *
      * @return string The compiled PHP source code
      */
-    public function compile($expression, $names = array())
+    public function compile($expression, $names = [])
     {
         return $this->getCompiler()->compile($this->parse($expression, $names)->getNodes())->getSource();
     }
@@ -71,9 +71,9 @@ class ExpressionLanguage
      * @param Expression|string $expression The expression to compile
      * @param array             $values     An array of values
      *
-     * @return string The result of the evaluation of the expression
+     * @return mixed The result of the evaluation of the expression
      */
-    public function evaluate($expression, $values = array())
+    public function evaluate($expression, $values = [])
     {
         return $this->parse($expression, array_keys($values))->getNodes()->evaluate($this->functions, $values);
     }
@@ -93,10 +93,10 @@ class ExpressionLanguage
         }
 
         asort($names);
-        $cacheKeyItems = array();
+        $cacheKeyItems = [];
 
         foreach ($names as $nameKey => $name) {
-            $cacheKeyItems[] = is_int($nameKey) ? $name : $nameKey.':'.$name;
+            $cacheKeyItems[] = \is_int($nameKey) ? $name : $nameKey.':'.$name;
         }
 
         $cacheItem = $this->cache->getItem(rawurlencode($expression.'//'.implode('|', $cacheKeyItems)));
@@ -129,7 +129,7 @@ class ExpressionLanguage
             throw new \LogicException('Registering functions after calling evaluate(), compile() or parse() is not supported.');
         }
 
-        $this->functions[$name] = array('compiler' => $compiler, 'evaluator' => $evaluator);
+        $this->functions[$name] = ['compiler' => $compiler, 'evaluator' => $evaluator];
     }
 
     public function addFunction(ExpressionFunction $function)
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/LICENSE b/advancedcontentfilter/vendor/symfony/expression-language/LICENSE
index 21d7fb9e..9e936ec0 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/LICENSE
+++ b/advancedcontentfilter/vendor/symfony/expression-language/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2018 Fabien Potencier
+Copyright (c) 2004-2020 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Lexer.php b/advancedcontentfilter/vendor/symfony/expression-language/Lexer.php
index aeeda8a8..ace847b0 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Lexer.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Lexer.php
@@ -29,11 +29,11 @@ class Lexer
      */
     public function tokenize($expression)
     {
-        $expression = str_replace(array("\r", "\n", "\t", "\v", "\f"), ' ', $expression);
+        $expression = str_replace(["\r", "\n", "\t", "\v", "\f"], ' ', $expression);
         $cursor = 0;
-        $tokens = array();
-        $brackets = array();
-        $end = strlen($expression);
+        $tokens = [];
+        $brackets = [];
+        $end = \strlen($expression);
 
         while ($cursor < $end) {
             if (' ' == $expression[$cursor]) {
@@ -45,26 +45,26 @@ class Lexer
             if (preg_match('/[0-9]+(?:\.[0-9]+)?/A', $expression, $match, 0, $cursor)) {
                 // numbers
                 $number = (float) $match[0];  // floats
-                if (preg_match('/^[0-9]+$/', $match[0]) && $number <= PHP_INT_MAX) {
+                if (preg_match('/^[0-9]+$/', $match[0]) && $number <= \PHP_INT_MAX) {
                     $number = (int) $match[0]; // integers lower than the maximum
                 }
                 $tokens[] = new Token(Token::NUMBER_TYPE, $number, $cursor + 1);
-                $cursor += strlen($match[0]);
+                $cursor += \strlen($match[0]);
             } elseif (false !== strpos('([{', $expression[$cursor])) {
                 // opening bracket
-                $brackets[] = array($expression[$cursor], $cursor);
+                $brackets[] = [$expression[$cursor], $cursor];
 
                 $tokens[] = new Token(Token::PUNCTUATION_TYPE, $expression[$cursor], $cursor + 1);
                 ++$cursor;
             } elseif (false !== strpos(')]}', $expression[$cursor])) {
                 // closing bracket
                 if (empty($brackets)) {
-                    throw new SyntaxError(sprintf('Unexpected "%s"', $expression[$cursor]), $cursor, $expression);
+                    throw new SyntaxError(sprintf('Unexpected "%s".', $expression[$cursor]), $cursor, $expression);
                 }
 
                 list($expect, $cur) = array_pop($brackets);
                 if ($expression[$cursor] != strtr($expect, '([{', ')]}')) {
-                    throw new SyntaxError(sprintf('Unclosed "%s"', $expect), $cur, $expression);
+                    throw new SyntaxError(sprintf('Unclosed "%s".', $expect), $cur, $expression);
                 }
 
                 $tokens[] = new Token(Token::PUNCTUATION_TYPE, $expression[$cursor], $cursor + 1);
@@ -72,11 +72,11 @@ class Lexer
             } elseif (preg_match('/"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'/As', $expression, $match, 0, $cursor)) {
                 // strings
                 $tokens[] = new Token(Token::STRING_TYPE, stripcslashes(substr($match[0], 1, -1)), $cursor + 1);
-                $cursor += strlen($match[0]);
-            } elseif (preg_match('/not in(?=[\s(])|\!\=\=|not(?=[\s(])|and(?=[\s(])|\=\=\=|\>\=|or(?=[\s(])|\<\=|\*\*|\.\.|in(?=[\s(])|&&|\|\||matches|\=\=|\!\=|\*|~|%|\/|\>|\||\!|\^|&|\+|\<|\-/A', $expression, $match, 0, $cursor)) {
+                $cursor += \strlen($match[0]);
+            } elseif (preg_match('/(?<=^|[\s(])not in(?=[\s(])|\!\=\=|(?<=^|[\s(])not(?=[\s(])|(?<=^|[\s(])and(?=[\s(])|\=\=\=|\>\=|(?<=^|[\s(])or(?=[\s(])|\<\=|\*\*|\.\.|(?<=^|[\s(])in(?=[\s(])|&&|\|\||(?<=^|[\s(])matches|\=\=|\!\=|\*|~|%|\/|\>|\||\!|\^|&|\+|\<|\-/A', $expression, $match, 0, $cursor)) {
                 // operators
                 $tokens[] = new Token(Token::OPERATOR_TYPE, $match[0], $cursor + 1);
-                $cursor += strlen($match[0]);
+                $cursor += \strlen($match[0]);
             } elseif (false !== strpos('.,?:', $expression[$cursor])) {
                 // punctuation
                 $tokens[] = new Token(Token::PUNCTUATION_TYPE, $expression[$cursor], $cursor + 1);
@@ -84,10 +84,10 @@ class Lexer
             } elseif (preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/A', $expression, $match, 0, $cursor)) {
                 // names
                 $tokens[] = new Token(Token::NAME_TYPE, $match[0], $cursor + 1);
-                $cursor += strlen($match[0]);
+                $cursor += \strlen($match[0]);
             } else {
                 // unlexable
-                throw new SyntaxError(sprintf('Unexpected character "%s"', $expression[$cursor]), $cursor, $expression);
+                throw new SyntaxError(sprintf('Unexpected character "%s".', $expression[$cursor]), $cursor, $expression);
             }
         }
 
@@ -95,7 +95,7 @@ class Lexer
 
         if (!empty($brackets)) {
             list($expect, $cur) = array_pop($brackets);
-            throw new SyntaxError(sprintf('Unclosed "%s"', $expect), $cur, $expression);
+            throw new SyntaxError(sprintf('Unclosed "%s".', $expect), $cur, $expression);
         }
 
         return new TokenStream($tokens, $expression);
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Node/ArgumentsNode.php b/advancedcontentfilter/vendor/symfony/expression-language/Node/ArgumentsNode.php
index 1c78d805..e9849a44 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Node/ArgumentsNode.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Node/ArgumentsNode.php
@@ -27,7 +27,7 @@ class ArgumentsNode extends ArrayNode
 
     public function toArray()
     {
-        $array = array();
+        $array = [];
 
         foreach ($this->getKeyValuePairs() as $pair) {
             $array[] = $pair['value'];
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Node/ArrayNode.php b/advancedcontentfilter/vendor/symfony/expression-language/Node/ArrayNode.php
index e1a2f2e9..921319a7 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Node/ArrayNode.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Node/ArrayNode.php
@@ -41,14 +41,14 @@ class ArrayNode extends Node
      */
     public function compile(Compiler $compiler)
     {
-        $compiler->raw('array(');
+        $compiler->raw('[');
         $this->compileArguments($compiler);
-        $compiler->raw(')');
+        $compiler->raw(']');
     }
 
     public function evaluate($functions, $values)
     {
-        $result = array();
+        $result = [];
         foreach ($this->getKeyValuePairs() as $pair) {
             $result[$pair['key']->evaluate($functions, $values)] = $pair['value']->evaluate($functions, $values);
         }
@@ -58,12 +58,12 @@ class ArrayNode extends Node
 
     public function toArray()
     {
-        $value = array();
+        $value = [];
         foreach ($this->getKeyValuePairs() as $pair) {
             $value[$pair['key']->attributes['value']] = $pair['value'];
         }
 
-        $array = array();
+        $array = [];
 
         if ($this->isHash($value)) {
             foreach ($value as $k => $v) {
@@ -88,9 +88,9 @@ class ArrayNode extends Node
 
     protected function getKeyValuePairs()
     {
-        $pairs = array();
+        $pairs = [];
         foreach (array_chunk($this->nodes, 2) as $pair) {
-            $pairs[] = array('key' => $pair[0], 'value' => $pair[1]);
+            $pairs[] = ['key' => $pair[0], 'value' => $pair[1]];
         }
 
         return $pairs;
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Node/BinaryNode.php b/advancedcontentfilter/vendor/symfony/expression-language/Node/BinaryNode.php
index 33b4c8f0..549161b3 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Node/BinaryNode.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Node/BinaryNode.php
@@ -20,24 +20,24 @@ use Symfony\Component\ExpressionLanguage\Compiler;
  */
 class BinaryNode extends Node
 {
-    private static $operators = array(
+    private static $operators = [
         '~' => '.',
         'and' => '&&',
         'or' => '||',
-    );
+    ];
 
-    private static $functions = array(
+    private static $functions = [
         '**' => 'pow',
         '..' => 'range',
         'in' => 'in_array',
         'not in' => '!in_array',
-    );
+    ];
 
     public function __construct($operator, Node $left, Node $right)
     {
         parent::__construct(
-            array('left' => $left, 'right' => $right),
-            array('operator' => $operator)
+            ['left' => $left, 'right' => $right],
+            ['operator' => $operator]
         );
     }
 
@@ -93,7 +93,7 @@ class BinaryNode extends Node
             $right = $this->nodes['right']->evaluate($functions, $values);
 
             if ('not in' === $operator) {
-                return !in_array($left, $right);
+                return !\in_array($left, $right);
             }
             $f = self::$functions[$operator];
 
@@ -135,9 +135,9 @@ class BinaryNode extends Node
             case '<=':
                 return $left <= $right;
             case 'not in':
-                return !in_array($left, $right);
+                return !\in_array($left, $right);
             case 'in':
-                return in_array($left, $right);
+                return \in_array($left, $right);
             case '+':
                 return $left + $right;
             case '-':
@@ -147,8 +147,16 @@ class BinaryNode extends Node
             case '*':
                 return $left * $right;
             case '/':
+                if (0 == $right) {
+                    throw new \DivisionByZeroError('Division by zero.');
+                }
+
                 return $left / $right;
             case '%':
+                if (0 == $right) {
+                    throw new \DivisionByZeroError('Modulo by zero.');
+                }
+
                 return $left % $right;
             case 'matches':
                 return preg_match($right, $left);
@@ -157,6 +165,6 @@ class BinaryNode extends Node
 
     public function toArray()
     {
-        return array('(', $this->nodes['left'], ' '.$this->attributes['operator'].' ', $this->nodes['right'], ')');
+        return ['(', $this->nodes['left'], ' '.$this->attributes['operator'].' ', $this->nodes['right'], ')'];
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Node/ConditionalNode.php b/advancedcontentfilter/vendor/symfony/expression-language/Node/ConditionalNode.php
index 9db0f931..ca1b484b 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Node/ConditionalNode.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Node/ConditionalNode.php
@@ -23,7 +23,7 @@ class ConditionalNode extends Node
     public function __construct(Node $expr1, Node $expr2, Node $expr3)
     {
         parent::__construct(
-            array('expr1' => $expr1, 'expr2' => $expr2, 'expr3' => $expr3)
+            ['expr1' => $expr1, 'expr2' => $expr2, 'expr3' => $expr3]
         );
     }
 
@@ -51,6 +51,6 @@ class ConditionalNode extends Node
 
     public function toArray()
     {
-        return array('(', $this->nodes['expr1'], ' ? ', $this->nodes['expr2'], ' : ', $this->nodes['expr3'], ')');
+        return ['(', $this->nodes['expr1'], ' ? ', $this->nodes['expr2'], ' : ', $this->nodes['expr3'], ')'];
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Node/ConstantNode.php b/advancedcontentfilter/vendor/symfony/expression-language/Node/ConstantNode.php
index 733d481b..670e52ed 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Node/ConstantNode.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Node/ConstantNode.php
@@ -26,8 +26,8 @@ class ConstantNode extends Node
     {
         $this->isIdentifier = $isIdentifier;
         parent::__construct(
-            array(),
-            array('value' => $value)
+            [],
+            ['value' => $value]
         );
     }
 
@@ -43,7 +43,7 @@ class ConstantNode extends Node
 
     public function toArray()
     {
-        $array = array();
+        $array = [];
         $value = $this->attributes['value'];
 
         if ($this->isIdentifier) {
@@ -56,7 +56,7 @@ class ConstantNode extends Node
             $array[] = 'null';
         } elseif (is_numeric($value)) {
             $array[] = $value;
-        } elseif (!is_array($value)) {
+        } elseif (!\is_array($value)) {
             $array[] = $this->dumpString($value);
         } elseif ($this->isHash($value)) {
             foreach ($value as $k => $v) {
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Node/FunctionNode.php b/advancedcontentfilter/vendor/symfony/expression-language/Node/FunctionNode.php
index 13928c8d..90008d5d 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Node/FunctionNode.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Node/FunctionNode.php
@@ -23,36 +23,36 @@ class FunctionNode extends Node
     public function __construct($name, Node $arguments)
     {
         parent::__construct(
-            array('arguments' => $arguments),
-            array('name' => $name)
+            ['arguments' => $arguments],
+            ['name' => $name]
         );
     }
 
     public function compile(Compiler $compiler)
     {
-        $arguments = array();
+        $arguments = [];
         foreach ($this->nodes['arguments']->nodes as $node) {
             $arguments[] = $compiler->subcompile($node);
         }
 
         $function = $compiler->getFunction($this->attributes['name']);
 
-        $compiler->raw(call_user_func_array($function['compiler'], $arguments));
+        $compiler->raw(\call_user_func_array($function['compiler'], $arguments));
     }
 
     public function evaluate($functions, $values)
     {
-        $arguments = array($values);
+        $arguments = [$values];
         foreach ($this->nodes['arguments']->nodes as $node) {
             $arguments[] = $node->evaluate($functions, $values);
         }
 
-        return call_user_func_array($functions[$this->attributes['name']]['evaluator'], $arguments);
+        return \call_user_func_array($functions[$this->attributes['name']]['evaluator'], $arguments);
     }
 
     public function toArray()
     {
-        $array = array();
+        $array = [];
         $array[] = $this->attributes['name'];
 
         foreach ($this->nodes['arguments']->nodes as $node) {
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Node/GetAttrNode.php b/advancedcontentfilter/vendor/symfony/expression-language/Node/GetAttrNode.php
index 2ecba97f..dffe0e30 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Node/GetAttrNode.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Node/GetAttrNode.php
@@ -27,8 +27,8 @@ class GetAttrNode extends Node
     public function __construct(Node $node, Node $attribute, ArrayNode $arguments, $type)
     {
         parent::__construct(
-            array('node' => $node, 'attribute' => $attribute, 'arguments' => $arguments),
-            array('type' => $type)
+            ['node' => $node, 'attribute' => $attribute, 'arguments' => $arguments],
+            ['type' => $type]
         );
     }
 
@@ -69,7 +69,7 @@ class GetAttrNode extends Node
         switch ($this->attributes['type']) {
             case self::PROPERTY_CALL:
                 $obj = $this->nodes['node']->evaluate($functions, $values);
-                if (!is_object($obj)) {
+                if (!\is_object($obj)) {
                     throw new \RuntimeException('Unable to get a property on a non-object.');
                 }
 
@@ -79,18 +79,24 @@ class GetAttrNode extends Node
 
             case self::METHOD_CALL:
                 $obj = $this->nodes['node']->evaluate($functions, $values);
-                if (!is_object($obj)) {
+                if (!\is_object($obj)) {
                     throw new \RuntimeException('Unable to get a property on a non-object.');
                 }
-                if (!is_callable($toCall = array($obj, $this->nodes['attribute']->attributes['value']))) {
-                    throw new \RuntimeException(sprintf('Unable to call method "%s" of object "%s".', $this->nodes['attribute']->attributes['value'], get_class($obj)));
+                if (!\is_callable($toCall = [$obj, $this->nodes['attribute']->attributes['value']])) {
+                    throw new \RuntimeException(sprintf('Unable to call method "%s" of object "%s".', $this->nodes['attribute']->attributes['value'], \get_class($obj)));
                 }
 
-                return call_user_func_array($toCall, $this->nodes['arguments']->evaluate($functions, $values));
+                $arguments = $this->nodes['arguments']->evaluate($functions, $values);
+
+                if (\PHP_VERSION_ID >= 80000) {
+                    $arguments = array_values($arguments);
+                }
+
+                return \call_user_func_array($toCall, $arguments);
 
             case self::ARRAY_CALL:
                 $array = $this->nodes['node']->evaluate($functions, $values);
-                if (!is_array($array) && !$array instanceof \ArrayAccess) {
+                if (!\is_array($array) && !$array instanceof \ArrayAccess) {
                     throw new \RuntimeException('Unable to get an item on a non-array.');
                 }
 
@@ -102,13 +108,13 @@ class GetAttrNode extends Node
     {
         switch ($this->attributes['type']) {
             case self::PROPERTY_CALL:
-                return array($this->nodes['node'], '.', $this->nodes['attribute']);
+                return [$this->nodes['node'], '.', $this->nodes['attribute']];
 
             case self::METHOD_CALL:
-                return array($this->nodes['node'], '.', $this->nodes['attribute'], '(', $this->nodes['arguments'], ')');
+                return [$this->nodes['node'], '.', $this->nodes['attribute'], '(', $this->nodes['arguments'], ')'];
 
             case self::ARRAY_CALL:
-                return array($this->nodes['node'], '[', $this->nodes['attribute'], ']');
+                return [$this->nodes['node'], '[', $this->nodes['attribute'], ']'];
         }
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Node/NameNode.php b/advancedcontentfilter/vendor/symfony/expression-language/Node/NameNode.php
index 9e1462f2..1c9c277b 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Node/NameNode.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Node/NameNode.php
@@ -23,8 +23,8 @@ class NameNode extends Node
     public function __construct($name)
     {
         parent::__construct(
-            array(),
-            array('name' => $name)
+            [],
+            ['name' => $name]
         );
     }
 
@@ -40,6 +40,6 @@ class NameNode extends Node
 
     public function toArray()
     {
-        return array($this->attributes['name']);
+        return [$this->attributes['name']];
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Node/Node.php b/advancedcontentfilter/vendor/symfony/expression-language/Node/Node.php
index 1db4e852..95045902 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Node/Node.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Node/Node.php
@@ -20,14 +20,14 @@ use Symfony\Component\ExpressionLanguage\Compiler;
  */
 class Node
 {
-    public $nodes = array();
-    public $attributes = array();
+    public $nodes = [];
+    public $attributes = [];
 
     /**
      * @param array $nodes      An array of nodes
      * @param array $attributes An array of attributes
      */
-    public function __construct(array $nodes = array(), array $attributes = array())
+    public function __construct(array $nodes = [], array $attributes = [])
     {
         $this->nodes = $nodes;
         $this->attributes = $attributes;
@@ -35,14 +35,14 @@ class Node
 
     public function __toString()
     {
-        $attributes = array();
+        $attributes = [];
         foreach ($this->attributes as $name => $value) {
             $attributes[] = sprintf('%s: %s', $name, str_replace("\n", '', var_export($value, true)));
         }
 
-        $repr = array(str_replace('Symfony\Component\ExpressionLanguage\Node\\', '', get_class($this)).'('.implode(', ', $attributes));
+        $repr = [str_replace('Symfony\Component\ExpressionLanguage\Node\\', '', static::class).'('.implode(', ', $attributes)];
 
-        if (count($this->nodes)) {
+        if (\count($this->nodes)) {
             foreach ($this->nodes as $node) {
                 foreach (explode("\n", (string) $node) as $line) {
                     $repr[] = '    '.$line;
@@ -66,7 +66,7 @@ class Node
 
     public function evaluate($functions, $values)
     {
-        $results = array();
+        $results = [];
         foreach ($this->nodes as $node) {
             $results[] = $node->evaluate($functions, $values);
         }
@@ -76,7 +76,7 @@ class Node
 
     public function toArray()
     {
-        throw new \BadMethodCallException(sprintf('Dumping a "%s" instance is not supported yet.', get_class($this)));
+        throw new \BadMethodCallException(sprintf('Dumping a "%s" instance is not supported yet.', static::class));
     }
 
     public function dump()
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Node/UnaryNode.php b/advancedcontentfilter/vendor/symfony/expression-language/Node/UnaryNode.php
index 58310321..497b7fe5 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Node/UnaryNode.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Node/UnaryNode.php
@@ -20,18 +20,18 @@ use Symfony\Component\ExpressionLanguage\Compiler;
  */
 class UnaryNode extends Node
 {
-    private static $operators = array(
+    private static $operators = [
         '!' => '!',
         'not' => '!',
         '+' => '+',
         '-' => '-',
-    );
+    ];
 
     public function __construct($operator, Node $node)
     {
         parent::__construct(
-            array('node' => $node),
-            array('operator' => $operator)
+            ['node' => $node],
+            ['operator' => $operator]
         );
     }
 
@@ -61,6 +61,6 @@ class UnaryNode extends Node
 
     public function toArray()
     {
-        return array('(', $this->attributes['operator'].' ', $this->nodes['node'], ')');
+        return ['(', $this->attributes['operator'].' ', $this->nodes['node'], ')'];
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Parser.php b/advancedcontentfilter/vendor/symfony/expression-language/Parser.php
index 4b1ce8e3..bfc24395 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Parser.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Parser.php
@@ -36,40 +36,40 @@ class Parser
     {
         $this->functions = $functions;
 
-        $this->unaryOperators = array(
-            'not' => array('precedence' => 50),
-            '!' => array('precedence' => 50),
-            '-' => array('precedence' => 500),
-            '+' => array('precedence' => 500),
-        );
-        $this->binaryOperators = array(
-            'or' => array('precedence' => 10, 'associativity' => self::OPERATOR_LEFT),
-            '||' => array('precedence' => 10, 'associativity' => self::OPERATOR_LEFT),
-            'and' => array('precedence' => 15, 'associativity' => self::OPERATOR_LEFT),
-            '&&' => array('precedence' => 15, 'associativity' => self::OPERATOR_LEFT),
-            '|' => array('precedence' => 16, 'associativity' => self::OPERATOR_LEFT),
-            '^' => array('precedence' => 17, 'associativity' => self::OPERATOR_LEFT),
-            '&' => array('precedence' => 18, 'associativity' => self::OPERATOR_LEFT),
-            '==' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
-            '===' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
-            '!=' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
-            '!==' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
-            '<' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
-            '>' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
-            '>=' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
-            '<=' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
-            'not in' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
-            'in' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
-            'matches' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
-            '..' => array('precedence' => 25, 'associativity' => self::OPERATOR_LEFT),
-            '+' => array('precedence' => 30, 'associativity' => self::OPERATOR_LEFT),
-            '-' => array('precedence' => 30, 'associativity' => self::OPERATOR_LEFT),
-            '~' => array('precedence' => 40, 'associativity' => self::OPERATOR_LEFT),
-            '*' => array('precedence' => 60, 'associativity' => self::OPERATOR_LEFT),
-            '/' => array('precedence' => 60, 'associativity' => self::OPERATOR_LEFT),
-            '%' => array('precedence' => 60, 'associativity' => self::OPERATOR_LEFT),
-            '**' => array('precedence' => 200, 'associativity' => self::OPERATOR_RIGHT),
-        );
+        $this->unaryOperators = [
+            'not' => ['precedence' => 50],
+            '!' => ['precedence' => 50],
+            '-' => ['precedence' => 500],
+            '+' => ['precedence' => 500],
+        ];
+        $this->binaryOperators = [
+            'or' => ['precedence' => 10, 'associativity' => self::OPERATOR_LEFT],
+            '||' => ['precedence' => 10, 'associativity' => self::OPERATOR_LEFT],
+            'and' => ['precedence' => 15, 'associativity' => self::OPERATOR_LEFT],
+            '&&' => ['precedence' => 15, 'associativity' => self::OPERATOR_LEFT],
+            '|' => ['precedence' => 16, 'associativity' => self::OPERATOR_LEFT],
+            '^' => ['precedence' => 17, 'associativity' => self::OPERATOR_LEFT],
+            '&' => ['precedence' => 18, 'associativity' => self::OPERATOR_LEFT],
+            '==' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
+            '===' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
+            '!=' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
+            '!==' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
+            '<' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
+            '>' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
+            '>=' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
+            '<=' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
+            'not in' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
+            'in' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
+            'matches' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
+            '..' => ['precedence' => 25, 'associativity' => self::OPERATOR_LEFT],
+            '+' => ['precedence' => 30, 'associativity' => self::OPERATOR_LEFT],
+            '-' => ['precedence' => 30, 'associativity' => self::OPERATOR_LEFT],
+            '~' => ['precedence' => 40, 'associativity' => self::OPERATOR_LEFT],
+            '*' => ['precedence' => 60, 'associativity' => self::OPERATOR_LEFT],
+            '/' => ['precedence' => 60, 'associativity' => self::OPERATOR_LEFT],
+            '%' => ['precedence' => 60, 'associativity' => self::OPERATOR_LEFT],
+            '**' => ['precedence' => 200, 'associativity' => self::OPERATOR_RIGHT],
+        ];
     }
 
     /**
@@ -92,14 +92,14 @@ class Parser
      *
      * @throws SyntaxError
      */
-    public function parse(TokenStream $stream, $names = array())
+    public function parse(TokenStream $stream, $names = [])
     {
         $this->stream = $stream;
         $this->names = $names;
 
         $node = $this->parseExpression();
         if (!$stream->isEOF()) {
-            throw new SyntaxError(sprintf('Unexpected token "%s" of value "%s"', $stream->current->type, $stream->current->value), $stream->current->cursor, $stream->getExpression());
+            throw new SyntaxError(sprintf('Unexpected token "%s" of value "%s".', $stream->current->type, $stream->current->value), $stream->current->cursor, $stream->getExpression());
         }
 
         return $node;
@@ -195,18 +195,18 @@ class Parser
                     default:
                         if ('(' === $this->stream->current->value) {
                             if (false === isset($this->functions[$token->value])) {
-                                throw new SyntaxError(sprintf('The function "%s" does not exist', $token->value), $token->cursor, $this->stream->getExpression(), $token->value, array_keys($this->functions));
+                                throw new SyntaxError(sprintf('The function "%s" does not exist.', $token->value), $token->cursor, $this->stream->getExpression(), $token->value, array_keys($this->functions));
                             }
 
                             $node = new Node\FunctionNode($token->value, $this->parseArguments());
                         } else {
-                            if (!in_array($token->value, $this->names, true)) {
-                                throw new SyntaxError(sprintf('Variable "%s" is not valid', $token->value), $token->cursor, $this->stream->getExpression(), $token->value, $this->names);
+                            if (!\in_array($token->value, $this->names, true)) {
+                                throw new SyntaxError(sprintf('Variable "%s" is not valid.', $token->value), $token->cursor, $this->stream->getExpression(), $token->value, $this->names);
                             }
 
                             // is the name used in the compiled code different
                             // from the name used in the expression?
-                            if (is_int($name = array_search($token->value, $this->names))) {
+                            if (\is_int($name = array_search($token->value, $this->names))) {
                                 $name = $token->value;
                             }
 
@@ -227,7 +227,7 @@ class Parser
                 } elseif ($token->test(Token::PUNCTUATION_TYPE, '{')) {
                     $node = $this->parseHashExpression();
                 } else {
-                    throw new SyntaxError(sprintf('Unexpected token "%s" of value "%s"', $token->type, $token->value), $token->cursor, $this->stream->getExpression());
+                    throw new SyntaxError(sprintf('Unexpected token "%s" of value "%s".', $token->type, $token->value), $token->cursor, $this->stream->getExpression());
                 }
         }
 
@@ -289,7 +289,7 @@ class Parser
             } else {
                 $current = $this->stream->current;
 
-                throw new SyntaxError(sprintf('A hash key must be a quoted string, a number, a name, or an expression enclosed in parentheses (unexpected token "%s" of value "%s"', $current->type, $current->value), $current->cursor, $this->stream->getExpression());
+                throw new SyntaxError(sprintf('A hash key must be a quoted string, a number, a name, or an expression enclosed in parentheses (unexpected token "%s" of value "%s".', $current->type, $current->value), $current->cursor, $this->stream->getExpression());
             }
 
             $this->stream->expect(Token::PUNCTUATION_TYPE, ':', 'A hash key must be followed by a colon (:)');
@@ -327,7 +327,7 @@ class Parser
                     // As a result, if $token is NOT an operator OR $token->value is NOT a valid property or method name, an exception shall be thrown.
                     (Token::OPERATOR_TYPE !== $token->type || !preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/A', $token->value))
                 ) {
-                    throw new SyntaxError('Expected name', $token->cursor, $this->stream->getExpression());
+                    throw new SyntaxError('Expected name.', $token->cursor, $this->stream->getExpression());
                 }
 
                 $arg = new Node\ConstantNode($token->value, true);
@@ -364,7 +364,7 @@ class Parser
      */
     public function parseArguments()
     {
-        $args = array();
+        $args = [];
         $this->stream->expect(Token::PUNCTUATION_TYPE, '(', 'A list of arguments must begin with an opening parenthesis');
         while (!$this->stream->current->test(Token::PUNCTUATION_TYPE, ')')) {
             if (!empty($args)) {
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/ParserCache/ArrayParserCache.php b/advancedcontentfilter/vendor/symfony/expression-language/ParserCache/ArrayParserCache.php
index 12496250..f009df73 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/ParserCache/ArrayParserCache.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/ParserCache/ArrayParserCache.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\ExpressionLanguage\ParserCache;
 
-@trigger_error('The '.__NAMESPACE__.'\ArrayParserCache class is deprecated since Symfony 3.2 and will be removed in 4.0. Use the Symfony\Component\Cache\Adapter\ArrayAdapter class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ArrayParserCache class is deprecated since Symfony 3.2 and will be removed in 4.0. Use the Symfony\Component\Cache\Adapter\ArrayAdapter class instead.', \E_USER_DEPRECATED);
 
 use Symfony\Component\ExpressionLanguage\ParsedExpression;
 
@@ -22,7 +22,7 @@ use Symfony\Component\ExpressionLanguage\ParsedExpression;
  */
 class ArrayParserCache implements ParserCacheInterface
 {
-    private $cache = array();
+    private $cache = [];
 
     /**
      * {@inheritdoc}
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/ParserCache/ParserCacheAdapter.php b/advancedcontentfilter/vendor/symfony/expression-language/ParserCache/ParserCacheAdapter.php
index a3e227d0..b9b448dd 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/ParserCache/ParserCacheAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/ParserCache/ParserCacheAdapter.php
@@ -30,7 +30,7 @@ class ParserCacheAdapter implements CacheItemPoolInterface
         $this->pool = $pool;
 
         $this->createCacheItem = \Closure::bind(
-            function ($key, $value, $isHit) {
+            static function ($key, $value, $isHit) {
                 $item = new CacheItem();
                 $item->key = $key;
                 $item->value = $value;
@@ -65,9 +65,9 @@ class ParserCacheAdapter implements CacheItemPoolInterface
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = array())
+    public function getItems(array $keys = [])
     {
-        throw new \BadMethodCallException('Not implemented');
+        throw new \BadMethodCallException('Not implemented.');
     }
 
     /**
@@ -75,7 +75,7 @@ class ParserCacheAdapter implements CacheItemPoolInterface
      */
     public function hasItem($key)
     {
-        throw new \BadMethodCallException('Not implemented');
+        throw new \BadMethodCallException('Not implemented.');
     }
 
     /**
@@ -83,7 +83,7 @@ class ParserCacheAdapter implements CacheItemPoolInterface
      */
     public function clear()
     {
-        throw new \BadMethodCallException('Not implemented');
+        throw new \BadMethodCallException('Not implemented.');
     }
 
     /**
@@ -91,7 +91,7 @@ class ParserCacheAdapter implements CacheItemPoolInterface
      */
     public function deleteItem($key)
     {
-        throw new \BadMethodCallException('Not implemented');
+        throw new \BadMethodCallException('Not implemented.');
     }
 
     /**
@@ -99,7 +99,7 @@ class ParserCacheAdapter implements CacheItemPoolInterface
      */
     public function deleteItems(array $keys)
     {
-        throw new \BadMethodCallException('Not implemented');
+        throw new \BadMethodCallException('Not implemented.');
     }
 
     /**
@@ -107,7 +107,7 @@ class ParserCacheAdapter implements CacheItemPoolInterface
      */
     public function saveDeferred(CacheItemInterface $item)
     {
-        throw new \BadMethodCallException('Not implemented');
+        throw new \BadMethodCallException('Not implemented.');
     }
 
     /**
@@ -115,6 +115,6 @@ class ParserCacheAdapter implements CacheItemPoolInterface
      */
     public function commit()
     {
-        throw new \BadMethodCallException('Not implemented');
+        throw new \BadMethodCallException('Not implemented.');
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/ParserCache/ParserCacheInterface.php b/advancedcontentfilter/vendor/symfony/expression-language/ParserCache/ParserCacheInterface.php
index ed66b21b..98a80edd 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/ParserCache/ParserCacheInterface.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/ParserCache/ParserCacheInterface.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\ExpressionLanguage\ParserCache;
 
-@trigger_error('The '.__NAMESPACE__.'\ParserCacheInterface interface is deprecated since Symfony 3.2 and will be removed in 4.0. Use Psr\Cache\CacheItemPoolInterface instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ParserCacheInterface interface is deprecated since Symfony 3.2 and will be removed in 4.0. Use Psr\Cache\CacheItemPoolInterface instead.', \E_USER_DEPRECATED);
 
 use Symfony\Component\ExpressionLanguage\ParsedExpression;
 
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Resources/bin/generate_operator_regex.php b/advancedcontentfilter/vendor/symfony/expression-language/Resources/bin/generate_operator_regex.php
index 74a10089..c86e9625 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Resources/bin/generate_operator_regex.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Resources/bin/generate_operator_regex.php
@@ -9,15 +9,19 @@
  * file that was distributed with this source code.
  */
 
-$operators = array('not', '!', 'or', '||', '&&', 'and', '|', '^', '&', '==', '===', '!=', '!==', '<', '>', '>=', '<=', 'not in', 'in', '..', '+', '-', '~', '*', '/', '%', 'matches', '**');
+$operators = ['not', '!', 'or', '||', '&&', 'and', '|', '^', '&', '==', '===', '!=', '!==', '<', '>', '>=', '<=', 'not in', 'in', '..', '+', '-', '~', '*', '/', '%', 'matches', '**'];
 $operators = array_combine($operators, array_map('strlen', $operators));
 arsort($operators);
 
-$regex = array();
+$regex = [];
 foreach ($operators as $operator => $length) {
-    // an operator that ends with a character must be followed by
-    // a whitespace or a parenthesis
-    $regex[] = preg_quote($operator, '/').(ctype_alpha($operator[$length - 1]) ? '(?=[\s(])' : '');
+    // Collisions of character operators:
+    // - an operator that begins with a character must have a space or a parenthesis before or starting at the beginning of a string
+    // - an operator that ends with a character must be followed by a whitespace or a parenthesis
+    $regex[] =
+        (ctype_alpha($operator[0]) ? '(?<=^|[\s(])' : '')
+        .preg_quote($operator, '/')
+        .(ctype_alpha($operator[$length - 1]) ? '(?=[\s(])' : '');
 }
 
 echo '/'.implode('|', $regex).'/A';
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/SyntaxError.php b/advancedcontentfilter/vendor/symfony/expression-language/SyntaxError.php
index 12348e68..a942b8cb 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/SyntaxError.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/SyntaxError.php
@@ -15,14 +15,14 @@ class SyntaxError extends \LogicException
 {
     public function __construct($message, $cursor = 0, $expression = '', $subject = null, array $proposals = null)
     {
-        $message = sprintf('%s around position %d', $message, $cursor);
+        $message = sprintf('%s around position %d', rtrim($message, '.'), $cursor);
         if ($expression) {
             $message = sprintf('%s for expression `%s`', $message, $expression);
         }
         $message .= '.';
 
         if (null !== $subject && null !== $proposals) {
-            $minScore = INF;
+            $minScore = \INF;
             foreach ($proposals as $proposal) {
                 $distance = levenshtein($subject, $proposal);
                 if ($distance < $minScore) {
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/ExpressionFunctionTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/ExpressionFunctionTest.php
index f2710fb1..d7e23cb4 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/ExpressionFunctionTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/ExpressionFunctionTest.php
@@ -21,21 +21,17 @@ use Symfony\Component\ExpressionLanguage\ExpressionFunction;
  */
 class ExpressionFunctionTest extends TestCase
 {
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage PHP function "fn_does_not_exist" does not exist.
-     */
     public function testFunctionDoesNotExist()
     {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('PHP function "fn_does_not_exist" does not exist.');
         ExpressionFunction::fromPhp('fn_does_not_exist');
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage An expression function name must be defined when PHP function "Symfony\Component\ExpressionLanguage\Tests\fn_namespaced" is namespaced.
-     */
     public function testFunctionNamespaced()
     {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('An expression function name must be defined when PHP function "Symfony\Component\ExpressionLanguage\Tests\fn_namespaced" is namespaced.');
         ExpressionFunction::fromPhp('Symfony\Component\ExpressionLanguage\Tests\fn_namespaced');
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/ExpressionLanguageTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/ExpressionLanguageTest.php
index 70328c8e..97e915ac 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/ExpressionLanguageTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/ExpressionLanguageTest.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\ExpressionLanguage\Tests;
 
-use Symfony\Component\ExpressionLanguage\ExpressionFunction;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\ExpressionLanguage\ExpressionFunction;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\ExpressionLanguage\ParsedExpression;
 use Symfony\Component\ExpressionLanguage\Tests\Fixtures\TestProvider;
@@ -36,18 +36,18 @@ class ExpressionLanguageTest extends TestCase
         $cacheItemMock
             ->expects($this->exactly(2))
             ->method('get')
-            ->will($this->returnCallback(function () use (&$savedParsedExpression) {
+            ->willReturnCallback(function () use (&$savedParsedExpression) {
                 return $savedParsedExpression;
-            }))
+            })
         ;
 
         $cacheItemMock
             ->expects($this->exactly(1))
             ->method('set')
             ->with($this->isInstanceOf(ParsedExpression::class))
-            ->will($this->returnCallback(function ($parsedExpression) use (&$savedParsedExpression) {
+            ->willReturnCallback(function ($parsedExpression) use (&$savedParsedExpression) {
                 $savedParsedExpression = $parsedExpression;
-            }))
+            })
         ;
 
         $cacheMock
@@ -56,10 +56,10 @@ class ExpressionLanguageTest extends TestCase
             ->with($cacheItemMock)
         ;
 
-        $parsedExpression = $expressionLanguage->parse('1 + 1', array());
+        $parsedExpression = $expressionLanguage->parse('1 + 1', []);
         $this->assertSame($savedParsedExpression, $parsedExpression);
 
-        $parsedExpression = $expressionLanguage->parse('1 + 1', array());
+        $parsedExpression = $expressionLanguage->parse('1 + 1', []);
         $this->assertSame($savedParsedExpression, $parsedExpression);
     }
 
@@ -70,7 +70,6 @@ class ExpressionLanguageTest extends TestCase
     {
         $cacheMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
 
-        $cacheItemMock = $this->getMockBuilder('Psr\Cache\CacheItemInterface')->getMock();
         $savedParsedExpression = null;
         $expressionLanguage = new ExpressionLanguage($cacheMock);
 
@@ -85,29 +84,27 @@ class ExpressionLanguageTest extends TestCase
             ->expects($this->exactly(1))
             ->method('save')
             ->with('1%20%2B%201%2F%2F', $this->isInstanceOf(ParsedExpression::class))
-            ->will($this->returnCallback(function ($key, $expression) use (&$savedParsedExpression) {
+            ->willReturnCallback(function ($key, $expression) use (&$savedParsedExpression) {
                 $savedParsedExpression = $expression;
-            }))
+            })
         ;
 
-        $parsedExpression = $expressionLanguage->parse('1 + 1', array());
+        $parsedExpression = $expressionLanguage->parse('1 + 1', []);
         $this->assertSame($savedParsedExpression, $parsedExpression);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Cache argument has to implement Psr\Cache\CacheItemPoolInterface.
-     */
     public function testWrongCacheImplementation()
     {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Cache argument has to implement "Psr\Cache\CacheItemPoolInterface".');
         $cacheMock = $this->getMockBuilder('Psr\Cache\CacheItemSpoolInterface')->getMock();
-        $expressionLanguage = new ExpressionLanguage($cacheMock);
+        new ExpressionLanguage($cacheMock);
     }
 
     public function testConstantFunction()
     {
         $expressionLanguage = new ExpressionLanguage();
-        $this->assertEquals(PHP_VERSION, $expressionLanguage->evaluate('constant("PHP_VERSION")'));
+        $this->assertEquals(\PHP_VERSION, $expressionLanguage->evaluate('constant("PHP_VERSION")'));
 
         $expressionLanguage = new ExpressionLanguage();
         $this->assertEquals('\constant("PHP_VERSION")', $expressionLanguage->compile('constant("PHP_VERSION")'));
@@ -115,7 +112,7 @@ class ExpressionLanguageTest extends TestCase
 
     public function testProviders()
     {
-        $expressionLanguage = new ExpressionLanguage(null, array(new TestProvider()));
+        $expressionLanguage = new ExpressionLanguage(null, [new TestProvider()]);
         $this->assertEquals('foo', $expressionLanguage->evaluate('identity("foo")'));
         $this->assertEquals('"foo"', $expressionLanguage->compile('identity("foo")'));
         $this->assertEquals('FOO', $expressionLanguage->evaluate('strtoupper("foo")'));
@@ -146,45 +143,43 @@ class ExpressionLanguageTest extends TestCase
         $this->assertSame($expected, $result);
     }
 
-    /**
-     * @expectedException \Symfony\Component\ExpressionLanguage\SyntaxError
-     * @expectedExceptionMessage Unexpected end of expression around position 6 for expression `node.`.
-     */
     public function testParseThrowsInsteadOfNotice()
     {
+        $this->expectException('Symfony\Component\ExpressionLanguage\SyntaxError');
+        $this->expectExceptionMessage('Unexpected end of expression around position 6 for expression `node.`.');
         $expressionLanguage = new ExpressionLanguage();
-        $expressionLanguage->parse('node.', array('node'));
+        $expressionLanguage->parse('node.', ['node']);
     }
 
     public function shortCircuitProviderEvaluate()
     {
-        $object = $this->getMockBuilder('stdClass')->setMethods(array('foo'))->getMock();
+        $object = $this->getMockBuilder('stdClass')->setMethods(['foo'])->getMock();
         $object->expects($this->never())->method('foo');
 
-        return array(
-            array('false and object.foo()', array('object' => $object), false),
-            array('false && object.foo()', array('object' => $object), false),
-            array('true || object.foo()', array('object' => $object), true),
-            array('true or object.foo()', array('object' => $object), true),
-        );
+        return [
+            ['false and object.foo()', ['object' => $object], false],
+            ['false && object.foo()', ['object' => $object], false],
+            ['true || object.foo()', ['object' => $object], true],
+            ['true or object.foo()', ['object' => $object], true],
+        ];
     }
 
     public function shortCircuitProviderCompile()
     {
-        return array(
-            array('false and foo', array('foo' => 'foo'), false),
-            array('false && foo', array('foo' => 'foo'), false),
-            array('true || foo', array('foo' => 'foo'), true),
-            array('true or foo', array('foo' => 'foo'), true),
-        );
+        return [
+            ['false and foo', ['foo' => 'foo'], false],
+            ['false && foo', ['foo' => 'foo'], false],
+            ['true || foo', ['foo' => 'foo'], true],
+            ['true or foo', ['foo' => 'foo'], true],
+        ];
     }
 
     public function testCachingForOverriddenVariableNames()
     {
         $expressionLanguage = new ExpressionLanguage();
         $expression = 'a + b';
-        $expressionLanguage->evaluate($expression, array('a' => 1, 'b' => 1));
-        $result = $expressionLanguage->compile($expression, array('a', 'B' => 'b'));
+        $expressionLanguage->evaluate($expression, ['a' => 1, 'b' => 1]);
+        $result = $expressionLanguage->compile($expression, ['a', 'B' => 'b']);
         $this->assertSame('($a + $B)', $result);
     }
 
@@ -192,7 +187,7 @@ class ExpressionLanguageTest extends TestCase
     {
         $expressionLanguage = new ExpressionLanguage();
         $expression = '123 === a';
-        $result = $expressionLanguage->compile($expression, array('a'));
+        $result = $expressionLanguage->compile($expression, ['a']);
         $this->assertSame('(123 === $a)', $result);
     }
 
@@ -201,7 +196,7 @@ class ExpressionLanguageTest extends TestCase
         $cacheMock = $this->getMockBuilder('Psr\Cache\CacheItemPoolInterface')->getMock();
         $cacheItemMock = $this->getMockBuilder('Psr\Cache\CacheItemInterface')->getMock();
         $expressionLanguage = new ExpressionLanguage($cacheMock);
-        $savedParsedExpressions = array();
+        $savedParsedExpression = null;
 
         $cacheMock
             ->expects($this->exactly(2))
@@ -213,18 +208,18 @@ class ExpressionLanguageTest extends TestCase
         $cacheItemMock
             ->expects($this->exactly(2))
             ->method('get')
-            ->will($this->returnCallback(function () use (&$savedParsedExpression) {
+            ->willReturnCallback(function () use (&$savedParsedExpression) {
                 return $savedParsedExpression;
-            }))
+            })
         ;
 
         $cacheItemMock
             ->expects($this->exactly(1))
             ->method('set')
             ->with($this->isInstanceOf(ParsedExpression::class))
-            ->will($this->returnCallback(function ($parsedExpression) use (&$savedParsedExpression) {
+            ->willReturnCallback(function ($parsedExpression) use (&$savedParsedExpression) {
                 $savedParsedExpression = $parsedExpression;
-            }))
+            })
         ;
 
         $cacheMock
@@ -234,48 +229,57 @@ class ExpressionLanguageTest extends TestCase
         ;
 
         $expression = 'a + b';
-        $expressionLanguage->compile($expression, array('a', 'B' => 'b'));
-        $expressionLanguage->compile($expression, array('B' => 'b', 'a'));
+        $expressionLanguage->compile($expression, ['a', 'B' => 'b']);
+        $expressionLanguage->compile($expression, ['B' => 'b', 'a']);
+    }
+
+    public function testOperatorCollisions()
+    {
+        $expressionLanguage = new ExpressionLanguage();
+        $expression = 'foo.not in [bar]';
+        $compiled = $expressionLanguage->compile($expression, ['foo', 'bar']);
+        $this->assertSame('in_array($foo->not, [0 => $bar])', $compiled);
+
+        $result = $expressionLanguage->evaluate($expression, ['foo' => (object) ['not' => 'test'], 'bar' => 'test']);
+        $this->assertTrue($result);
     }
 
     /**
      * @dataProvider getRegisterCallbacks
-     * @expectedException \LogicException
      */
     public function testRegisterAfterParse($registerCallback)
     {
+        $this->expectException('LogicException');
         $el = new ExpressionLanguage();
-        $el->parse('1 + 1', array());
+        $el->parse('1 + 1', []);
         $registerCallback($el);
     }
 
     /**
      * @dataProvider getRegisterCallbacks
-     * @expectedException \LogicException
      */
     public function testRegisterAfterEval($registerCallback)
     {
+        $this->expectException('LogicException');
         $el = new ExpressionLanguage();
         $el->evaluate('1 + 1');
         $registerCallback($el);
     }
 
-    /**
-     * @expectedException \RuntimeException
-     * @expectedExceptionMessageRegExp  /Unable to call method "\w+" of object "\w+"./
-     */
     public function testCallBadCallable()
     {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessageMatches('/Unable to call method "\w+" of object "\w+"./');
         $el = new ExpressionLanguage();
-        $el->evaluate('foo.myfunction()', array('foo' => new \stdClass()));
+        $el->evaluate('foo.myfunction()', ['foo' => new \stdClass()]);
     }
 
     /**
      * @dataProvider getRegisterCallbacks
-     * @expectedException \LogicException
      */
     public function testRegisterAfterCompile($registerCallback)
     {
+        $this->expectException('LogicException');
         $el = new ExpressionLanguage();
         $el->compile('1 + 1');
         $registerCallback($el);
@@ -283,22 +287,22 @@ class ExpressionLanguageTest extends TestCase
 
     public function getRegisterCallbacks()
     {
-        return array(
-            array(
+        return [
+            [
                 function (ExpressionLanguage $el) {
                     $el->register('fn', function () {}, function () {});
                 },
-            ),
-            array(
+            ],
+            [
                 function (ExpressionLanguage $el) {
                     $el->addFunction(new ExpressionFunction('fn', function () {}, function () {}));
                 },
-            ),
-            array(
+            ],
+            [
                 function (ExpressionLanguage $el) {
                     $el->registerProvider(new TestProvider());
                 },
-            ),
-        );
+            ],
+        ];
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Fixtures/TestProvider.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Fixtures/TestProvider.php
index 20c5182b..8405d4f9 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Fixtures/TestProvider.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Fixtures/TestProvider.php
@@ -19,7 +19,7 @@ class TestProvider implements ExpressionFunctionProviderInterface
 {
     public function getFunctions()
     {
-        return array(
+        return [
             new ExpressionFunction('identity', function ($input) {
                 return $input;
             }, function (array $values, $input) {
@@ -31,7 +31,7 @@ class TestProvider implements ExpressionFunctionProviderInterface
             ExpressionFunction::fromPhp('\strtolower'),
 
             ExpressionFunction::fromPhp('Symfony\Component\ExpressionLanguage\Tests\Fixtures\fn_namespaced', 'fn_namespaced'),
-        );
+        ];
     }
 }
 
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/LexerTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/LexerTest.php
index 87c16f70..6c3d1a7d 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/LexerTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/LexerTest.php
@@ -33,59 +33,55 @@ class LexerTest extends TestCase
      */
     public function testTokenize($tokens, $expression)
     {
-        $tokens[] = new Token('end of expression', null, strlen($expression) + 1);
+        $tokens[] = new Token('end of expression', null, \strlen($expression) + 1);
         $this->assertEquals(new TokenStream($tokens, $expression), $this->lexer->tokenize($expression));
     }
 
-    /**
-     * @expectedException \Symfony\Component\ExpressionLanguage\SyntaxError
-     * @expectedExceptionMessage Unexpected character "'" around position 33 for expression `service(faulty.expression.example').dummyMethod()`.
-     */
     public function testTokenizeThrowsErrorWithMessage()
     {
+        $this->expectException('Symfony\Component\ExpressionLanguage\SyntaxError');
+        $this->expectExceptionMessage('Unexpected character "\'" around position 33 for expression `service(faulty.expression.example\').dummyMethod()`.');
         $expression = "service(faulty.expression.example').dummyMethod()";
         $this->lexer->tokenize($expression);
     }
 
-    /**
-     * @expectedException \Symfony\Component\ExpressionLanguage\SyntaxError
-     * @expectedExceptionMessage Unclosed "(" around position 7 for expression `service(unclosed.expression.dummyMethod()`.
-     */
     public function testTokenizeThrowsErrorOnUnclosedBrace()
     {
+        $this->expectException('Symfony\Component\ExpressionLanguage\SyntaxError');
+        $this->expectExceptionMessage('Unclosed "(" around position 7 for expression `service(unclosed.expression.dummyMethod()`.');
         $expression = 'service(unclosed.expression.dummyMethod()';
         $this->lexer->tokenize($expression);
     }
 
     public function getTokenizeData()
     {
-        return array(
-            array(
-                array(new Token('name', 'a', 3)),
+        return [
+            [
+                [new Token('name', 'a', 3)],
                 '  a  ',
-            ),
-            array(
-                array(new Token('name', 'a', 1)),
+            ],
+            [
+                [new Token('name', 'a', 1)],
                 'a',
-            ),
-            array(
-                array(new Token('string', 'foo', 1)),
+            ],
+            [
+                [new Token('string', 'foo', 1)],
                 '"foo"',
-            ),
-            array(
-                array(new Token('number', '3', 1)),
+            ],
+            [
+                [new Token('number', '3', 1)],
                 '3',
-            ),
-            array(
-                array(new Token('operator', '+', 1)),
+            ],
+            [
+                [new Token('operator', '+', 1)],
                 '+',
-            ),
-            array(
-                array(new Token('punctuation', '.', 1)),
+            ],
+            [
+                [new Token('punctuation', '.', 1)],
                 '.',
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     new Token('punctuation', '(', 1),
                     new Token('number', '3', 2),
                     new Token('operator', '+', 4),
@@ -101,21 +97,33 @@ class LexerTest extends TestCase
                     new Token('punctuation', '[', 25),
                     new Token('number', '4', 26),
                     new Token('punctuation', ']', 27),
-                ),
+                ],
                 '(3 + 5) ~ foo("bar").baz[4]',
-            ),
-            array(
-                array(new Token('operator', '..', 1)),
+            ],
+            [
+                [new Token('operator', '..', 1)],
                 '..',
-            ),
-            array(
-                array(new Token('string', '#foo', 1)),
+            ],
+            [
+                [new Token('string', '#foo', 1)],
                 "'#foo'",
-            ),
-            array(
-                array(new Token('string', '#foo', 1)),
+            ],
+            [
+                [new Token('string', '#foo', 1)],
                 '"#foo"',
-            ),
-        );
+            ],
+            [
+                [
+                    new Token('name', 'foo', 1),
+                    new Token('punctuation', '.', 4),
+                    new Token('name', 'not', 5),
+                    new Token('operator', 'in', 9),
+                    new Token('punctuation', '[', 12),
+                    new Token('name', 'bar', 13),
+                    new Token('punctuation', ']', 16),
+                ],
+                'foo.not in [bar]',
+            ],
+        ];
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/AbstractNodeTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/AbstractNodeTest.php
index a6f80c2f..29750374 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/AbstractNodeTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/AbstractNodeTest.php
@@ -19,7 +19,7 @@ abstract class AbstractNodeTest extends TestCase
     /**
      * @dataProvider getEvaluateData
      */
-    public function testEvaluate($expected, $node, $variables = array(), $functions = array())
+    public function testEvaluate($expected, $node, $variables = [], $functions = [])
     {
         $this->assertSame($expected, $node->evaluate($functions, $variables));
     }
@@ -29,7 +29,7 @@ abstract class AbstractNodeTest extends TestCase
     /**
      * @dataProvider getCompileData
      */
-    public function testCompile($expected, $node, $functions = array())
+    public function testCompile($expected, $node, $functions = [])
     {
         $compiler = new Compiler($functions);
         $node->compile($compiler);
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ArgumentsNodeTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ArgumentsNodeTest.php
index 60a6d1ca..9d88b4ae 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ArgumentsNodeTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ArgumentsNodeTest.php
@@ -17,16 +17,16 @@ class ArgumentsNodeTest extends ArrayNodeTest
 {
     public function getCompileData()
     {
-        return array(
-            array('"a", "b"', $this->getArrayNode()),
-        );
+        return [
+            ['"a", "b"', $this->getArrayNode()],
+        ];
     }
 
     public function getDumpData()
     {
-        return array(
-            array('"a", "b"', $this->getArrayNode()),
-        );
+        return [
+            ['"a", "b"', $this->getArrayNode()],
+        ];
     }
 
     protected function createArrayNode()
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ArrayNodeTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ArrayNodeTest.php
index 11a35d46..3d03d837 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ArrayNodeTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ArrayNodeTest.php
@@ -30,31 +30,31 @@ class ArrayNodeTest extends AbstractNodeTest
 
     public function getEvaluateData()
     {
-        return array(
-            array(array('b' => 'a', 'b'), $this->getArrayNode()),
-        );
+        return [
+            [['b' => 'a', 'b'], $this->getArrayNode()],
+        ];
     }
 
     public function getCompileData()
     {
-        return array(
-            array('array("b" => "a", 0 => "b")', $this->getArrayNode()),
-        );
+        return [
+            ['["b" => "a", 0 => "b"]', $this->getArrayNode()],
+        ];
     }
 
     public function getDumpData()
     {
-        yield array('{"b": "a", 0: "b"}', $this->getArrayNode());
+        yield ['{"b": "a", 0: "b"}', $this->getArrayNode()];
 
         $array = $this->createArrayNode();
         $array->addElement(new ConstantNode('c'), new ConstantNode('a"b'));
         $array->addElement(new ConstantNode('d'), new ConstantNode('a\b'));
-        yield array('{"a\\"b": "c", "a\\\\b": "d"}', $array);
+        yield ['{"a\\"b": "c", "a\\\\b": "d"}', $array];
 
         $array = $this->createArrayNode();
         $array->addElement(new ConstantNode('c'));
         $array->addElement(new ConstantNode('d'));
-        yield array('["c", "d"]', $array);
+        yield ['["c", "d"]', $array];
     }
 
     protected function getArrayNode()
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/BinaryNodeTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/BinaryNodeTest.php
index 258d276b..b45a1e57 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/BinaryNodeTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/BinaryNodeTest.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\ExpressionLanguage\Tests\Node;
 
-use Symfony\Component\ExpressionLanguage\Node\BinaryNode;
 use Symfony\Component\ExpressionLanguage\Node\ArrayNode;
+use Symfony\Component\ExpressionLanguage\Node\BinaryNode;
 use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
 
 class BinaryNodeTest extends AbstractNodeTest
@@ -23,47 +23,47 @@ class BinaryNodeTest extends AbstractNodeTest
         $array->addElement(new ConstantNode('a'));
         $array->addElement(new ConstantNode('b'));
 
-        return array(
-            array(true, new BinaryNode('or', new ConstantNode(true), new ConstantNode(false))),
-            array(true, new BinaryNode('||', new ConstantNode(true), new ConstantNode(false))),
-            array(false, new BinaryNode('and', new ConstantNode(true), new ConstantNode(false))),
-            array(false, new BinaryNode('&&', new ConstantNode(true), new ConstantNode(false))),
+        return [
+            [true, new BinaryNode('or', new ConstantNode(true), new ConstantNode(false))],
+            [true, new BinaryNode('||', new ConstantNode(true), new ConstantNode(false))],
+            [false, new BinaryNode('and', new ConstantNode(true), new ConstantNode(false))],
+            [false, new BinaryNode('&&', new ConstantNode(true), new ConstantNode(false))],
 
-            array(0, new BinaryNode('&', new ConstantNode(2), new ConstantNode(4))),
-            array(6, new BinaryNode('|', new ConstantNode(2), new ConstantNode(4))),
-            array(6, new BinaryNode('^', new ConstantNode(2), new ConstantNode(4))),
+            [0, new BinaryNode('&', new ConstantNode(2), new ConstantNode(4))],
+            [6, new BinaryNode('|', new ConstantNode(2), new ConstantNode(4))],
+            [6, new BinaryNode('^', new ConstantNode(2), new ConstantNode(4))],
 
-            array(true, new BinaryNode('<', new ConstantNode(1), new ConstantNode(2))),
-            array(true, new BinaryNode('<=', new ConstantNode(1), new ConstantNode(2))),
-            array(true, new BinaryNode('<=', new ConstantNode(1), new ConstantNode(1))),
+            [true, new BinaryNode('<', new ConstantNode(1), new ConstantNode(2))],
+            [true, new BinaryNode('<=', new ConstantNode(1), new ConstantNode(2))],
+            [true, new BinaryNode('<=', new ConstantNode(1), new ConstantNode(1))],
 
-            array(false, new BinaryNode('>', new ConstantNode(1), new ConstantNode(2))),
-            array(false, new BinaryNode('>=', new ConstantNode(1), new ConstantNode(2))),
-            array(true, new BinaryNode('>=', new ConstantNode(1), new ConstantNode(1))),
+            [false, new BinaryNode('>', new ConstantNode(1), new ConstantNode(2))],
+            [false, new BinaryNode('>=', new ConstantNode(1), new ConstantNode(2))],
+            [true, new BinaryNode('>=', new ConstantNode(1), new ConstantNode(1))],
 
-            array(true, new BinaryNode('===', new ConstantNode(true), new ConstantNode(true))),
-            array(false, new BinaryNode('!==', new ConstantNode(true), new ConstantNode(true))),
+            [true, new BinaryNode('===', new ConstantNode(true), new ConstantNode(true))],
+            [false, new BinaryNode('!==', new ConstantNode(true), new ConstantNode(true))],
 
-            array(false, new BinaryNode('==', new ConstantNode(2), new ConstantNode(1))),
-            array(true, new BinaryNode('!=', new ConstantNode(2), new ConstantNode(1))),
+            [false, new BinaryNode('==', new ConstantNode(2), new ConstantNode(1))],
+            [true, new BinaryNode('!=', new ConstantNode(2), new ConstantNode(1))],
 
-            array(-1, new BinaryNode('-', new ConstantNode(1), new ConstantNode(2))),
-            array(3, new BinaryNode('+', new ConstantNode(1), new ConstantNode(2))),
-            array(4, new BinaryNode('*', new ConstantNode(2), new ConstantNode(2))),
-            array(1, new BinaryNode('/', new ConstantNode(2), new ConstantNode(2))),
-            array(1, new BinaryNode('%', new ConstantNode(5), new ConstantNode(2))),
-            array(25, new BinaryNode('**', new ConstantNode(5), new ConstantNode(2))),
-            array('ab', new BinaryNode('~', new ConstantNode('a'), new ConstantNode('b'))),
+            [-1, new BinaryNode('-', new ConstantNode(1), new ConstantNode(2))],
+            [3, new BinaryNode('+', new ConstantNode(1), new ConstantNode(2))],
+            [4, new BinaryNode('*', new ConstantNode(2), new ConstantNode(2))],
+            [1, new BinaryNode('/', new ConstantNode(2), new ConstantNode(2))],
+            [1, new BinaryNode('%', new ConstantNode(5), new ConstantNode(2))],
+            [25, new BinaryNode('**', new ConstantNode(5), new ConstantNode(2))],
+            ['ab', new BinaryNode('~', new ConstantNode('a'), new ConstantNode('b'))],
 
-            array(true, new BinaryNode('in', new ConstantNode('a'), $array)),
-            array(false, new BinaryNode('in', new ConstantNode('c'), $array)),
-            array(true, new BinaryNode('not in', new ConstantNode('c'), $array)),
-            array(false, new BinaryNode('not in', new ConstantNode('a'), $array)),
+            [true, new BinaryNode('in', new ConstantNode('a'), $array)],
+            [false, new BinaryNode('in', new ConstantNode('c'), $array)],
+            [true, new BinaryNode('not in', new ConstantNode('c'), $array)],
+            [false, new BinaryNode('not in', new ConstantNode('a'), $array)],
 
-            array(array(1, 2, 3), new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))),
+            [[1, 2, 3], new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))],
 
-            array(1, new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('/^[a-z]+$/'))),
-        );
+            [1, new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('/^[a-z]+$/'))],
+        ];
     }
 
     public function getCompileData()
@@ -72,47 +72,47 @@ class BinaryNodeTest extends AbstractNodeTest
         $array->addElement(new ConstantNode('a'));
         $array->addElement(new ConstantNode('b'));
 
-        return array(
-            array('(true || false)', new BinaryNode('or', new ConstantNode(true), new ConstantNode(false))),
-            array('(true || false)', new BinaryNode('||', new ConstantNode(true), new ConstantNode(false))),
-            array('(true && false)', new BinaryNode('and', new ConstantNode(true), new ConstantNode(false))),
-            array('(true && false)', new BinaryNode('&&', new ConstantNode(true), new ConstantNode(false))),
+        return [
+            ['(true || false)', new BinaryNode('or', new ConstantNode(true), new ConstantNode(false))],
+            ['(true || false)', new BinaryNode('||', new ConstantNode(true), new ConstantNode(false))],
+            ['(true && false)', new BinaryNode('and', new ConstantNode(true), new ConstantNode(false))],
+            ['(true && false)', new BinaryNode('&&', new ConstantNode(true), new ConstantNode(false))],
 
-            array('(2 & 4)', new BinaryNode('&', new ConstantNode(2), new ConstantNode(4))),
-            array('(2 | 4)', new BinaryNode('|', new ConstantNode(2), new ConstantNode(4))),
-            array('(2 ^ 4)', new BinaryNode('^', new ConstantNode(2), new ConstantNode(4))),
+            ['(2 & 4)', new BinaryNode('&', new ConstantNode(2), new ConstantNode(4))],
+            ['(2 | 4)', new BinaryNode('|', new ConstantNode(2), new ConstantNode(4))],
+            ['(2 ^ 4)', new BinaryNode('^', new ConstantNode(2), new ConstantNode(4))],
 
-            array('(1 < 2)', new BinaryNode('<', new ConstantNode(1), new ConstantNode(2))),
-            array('(1 <= 2)', new BinaryNode('<=', new ConstantNode(1), new ConstantNode(2))),
-            array('(1 <= 1)', new BinaryNode('<=', new ConstantNode(1), new ConstantNode(1))),
+            ['(1 < 2)', new BinaryNode('<', new ConstantNode(1), new ConstantNode(2))],
+            ['(1 <= 2)', new BinaryNode('<=', new ConstantNode(1), new ConstantNode(2))],
+            ['(1 <= 1)', new BinaryNode('<=', new ConstantNode(1), new ConstantNode(1))],
 
-            array('(1 > 2)', new BinaryNode('>', new ConstantNode(1), new ConstantNode(2))),
-            array('(1 >= 2)', new BinaryNode('>=', new ConstantNode(1), new ConstantNode(2))),
-            array('(1 >= 1)', new BinaryNode('>=', new ConstantNode(1), new ConstantNode(1))),
+            ['(1 > 2)', new BinaryNode('>', new ConstantNode(1), new ConstantNode(2))],
+            ['(1 >= 2)', new BinaryNode('>=', new ConstantNode(1), new ConstantNode(2))],
+            ['(1 >= 1)', new BinaryNode('>=', new ConstantNode(1), new ConstantNode(1))],
 
-            array('(true === true)', new BinaryNode('===', new ConstantNode(true), new ConstantNode(true))),
-            array('(true !== true)', new BinaryNode('!==', new ConstantNode(true), new ConstantNode(true))),
+            ['(true === true)', new BinaryNode('===', new ConstantNode(true), new ConstantNode(true))],
+            ['(true !== true)', new BinaryNode('!==', new ConstantNode(true), new ConstantNode(true))],
 
-            array('(2 == 1)', new BinaryNode('==', new ConstantNode(2), new ConstantNode(1))),
-            array('(2 != 1)', new BinaryNode('!=', new ConstantNode(2), new ConstantNode(1))),
+            ['(2 == 1)', new BinaryNode('==', new ConstantNode(2), new ConstantNode(1))],
+            ['(2 != 1)', new BinaryNode('!=', new ConstantNode(2), new ConstantNode(1))],
 
-            array('(1 - 2)', new BinaryNode('-', new ConstantNode(1), new ConstantNode(2))),
-            array('(1 + 2)', new BinaryNode('+', new ConstantNode(1), new ConstantNode(2))),
-            array('(2 * 2)', new BinaryNode('*', new ConstantNode(2), new ConstantNode(2))),
-            array('(2 / 2)', new BinaryNode('/', new ConstantNode(2), new ConstantNode(2))),
-            array('(5 % 2)', new BinaryNode('%', new ConstantNode(5), new ConstantNode(2))),
-            array('pow(5, 2)', new BinaryNode('**', new ConstantNode(5), new ConstantNode(2))),
-            array('("a" . "b")', new BinaryNode('~', new ConstantNode('a'), new ConstantNode('b'))),
+            ['(1 - 2)', new BinaryNode('-', new ConstantNode(1), new ConstantNode(2))],
+            ['(1 + 2)', new BinaryNode('+', new ConstantNode(1), new ConstantNode(2))],
+            ['(2 * 2)', new BinaryNode('*', new ConstantNode(2), new ConstantNode(2))],
+            ['(2 / 2)', new BinaryNode('/', new ConstantNode(2), new ConstantNode(2))],
+            ['(5 % 2)', new BinaryNode('%', new ConstantNode(5), new ConstantNode(2))],
+            ['pow(5, 2)', new BinaryNode('**', new ConstantNode(5), new ConstantNode(2))],
+            ['("a" . "b")', new BinaryNode('~', new ConstantNode('a'), new ConstantNode('b'))],
 
-            array('in_array("a", array(0 => "a", 1 => "b"))', new BinaryNode('in', new ConstantNode('a'), $array)),
-            array('in_array("c", array(0 => "a", 1 => "b"))', new BinaryNode('in', new ConstantNode('c'), $array)),
-            array('!in_array("c", array(0 => "a", 1 => "b"))', new BinaryNode('not in', new ConstantNode('c'), $array)),
-            array('!in_array("a", array(0 => "a", 1 => "b"))', new BinaryNode('not in', new ConstantNode('a'), $array)),
+            ['in_array("a", [0 => "a", 1 => "b"])', new BinaryNode('in', new ConstantNode('a'), $array)],
+            ['in_array("c", [0 => "a", 1 => "b"])', new BinaryNode('in', new ConstantNode('c'), $array)],
+            ['!in_array("c", [0 => "a", 1 => "b"])', new BinaryNode('not in', new ConstantNode('c'), $array)],
+            ['!in_array("a", [0 => "a", 1 => "b"])', new BinaryNode('not in', new ConstantNode('a'), $array)],
 
-            array('range(1, 3)', new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))),
+            ['range(1, 3)', new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))],
 
-            array('preg_match("/^[a-z]+/i\$/", "abc")', new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('/^[a-z]+/i$/'))),
-        );
+            ['preg_match("/^[a-z]+/i\$/", "abc")', new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('/^[a-z]+/i$/'))],
+        ];
     }
 
     public function getDumpData()
@@ -121,46 +121,46 @@ class BinaryNodeTest extends AbstractNodeTest
         $array->addElement(new ConstantNode('a'));
         $array->addElement(new ConstantNode('b'));
 
-        return array(
-            array('(true or false)', new BinaryNode('or', new ConstantNode(true), new ConstantNode(false))),
-            array('(true || false)', new BinaryNode('||', new ConstantNode(true), new ConstantNode(false))),
-            array('(true and false)', new BinaryNode('and', new ConstantNode(true), new ConstantNode(false))),
-            array('(true && false)', new BinaryNode('&&', new ConstantNode(true), new ConstantNode(false))),
+        return [
+            ['(true or false)', new BinaryNode('or', new ConstantNode(true), new ConstantNode(false))],
+            ['(true || false)', new BinaryNode('||', new ConstantNode(true), new ConstantNode(false))],
+            ['(true and false)', new BinaryNode('and', new ConstantNode(true), new ConstantNode(false))],
+            ['(true && false)', new BinaryNode('&&', new ConstantNode(true), new ConstantNode(false))],
 
-            array('(2 & 4)', new BinaryNode('&', new ConstantNode(2), new ConstantNode(4))),
-            array('(2 | 4)', new BinaryNode('|', new ConstantNode(2), new ConstantNode(4))),
-            array('(2 ^ 4)', new BinaryNode('^', new ConstantNode(2), new ConstantNode(4))),
+            ['(2 & 4)', new BinaryNode('&', new ConstantNode(2), new ConstantNode(4))],
+            ['(2 | 4)', new BinaryNode('|', new ConstantNode(2), new ConstantNode(4))],
+            ['(2 ^ 4)', new BinaryNode('^', new ConstantNode(2), new ConstantNode(4))],
 
-            array('(1 < 2)', new BinaryNode('<', new ConstantNode(1), new ConstantNode(2))),
-            array('(1 <= 2)', new BinaryNode('<=', new ConstantNode(1), new ConstantNode(2))),
-            array('(1 <= 1)', new BinaryNode('<=', new ConstantNode(1), new ConstantNode(1))),
+            ['(1 < 2)', new BinaryNode('<', new ConstantNode(1), new ConstantNode(2))],
+            ['(1 <= 2)', new BinaryNode('<=', new ConstantNode(1), new ConstantNode(2))],
+            ['(1 <= 1)', new BinaryNode('<=', new ConstantNode(1), new ConstantNode(1))],
 
-            array('(1 > 2)', new BinaryNode('>', new ConstantNode(1), new ConstantNode(2))),
-            array('(1 >= 2)', new BinaryNode('>=', new ConstantNode(1), new ConstantNode(2))),
-            array('(1 >= 1)', new BinaryNode('>=', new ConstantNode(1), new ConstantNode(1))),
+            ['(1 > 2)', new BinaryNode('>', new ConstantNode(1), new ConstantNode(2))],
+            ['(1 >= 2)', new BinaryNode('>=', new ConstantNode(1), new ConstantNode(2))],
+            ['(1 >= 1)', new BinaryNode('>=', new ConstantNode(1), new ConstantNode(1))],
 
-            array('(true === true)', new BinaryNode('===', new ConstantNode(true), new ConstantNode(true))),
-            array('(true !== true)', new BinaryNode('!==', new ConstantNode(true), new ConstantNode(true))),
+            ['(true === true)', new BinaryNode('===', new ConstantNode(true), new ConstantNode(true))],
+            ['(true !== true)', new BinaryNode('!==', new ConstantNode(true), new ConstantNode(true))],
 
-            array('(2 == 1)', new BinaryNode('==', new ConstantNode(2), new ConstantNode(1))),
-            array('(2 != 1)', new BinaryNode('!=', new ConstantNode(2), new ConstantNode(1))),
+            ['(2 == 1)', new BinaryNode('==', new ConstantNode(2), new ConstantNode(1))],
+            ['(2 != 1)', new BinaryNode('!=', new ConstantNode(2), new ConstantNode(1))],
 
-            array('(1 - 2)', new BinaryNode('-', new ConstantNode(1), new ConstantNode(2))),
-            array('(1 + 2)', new BinaryNode('+', new ConstantNode(1), new ConstantNode(2))),
-            array('(2 * 2)', new BinaryNode('*', new ConstantNode(2), new ConstantNode(2))),
-            array('(2 / 2)', new BinaryNode('/', new ConstantNode(2), new ConstantNode(2))),
-            array('(5 % 2)', new BinaryNode('%', new ConstantNode(5), new ConstantNode(2))),
-            array('(5 ** 2)', new BinaryNode('**', new ConstantNode(5), new ConstantNode(2))),
-            array('("a" ~ "b")', new BinaryNode('~', new ConstantNode('a'), new ConstantNode('b'))),
+            ['(1 - 2)', new BinaryNode('-', new ConstantNode(1), new ConstantNode(2))],
+            ['(1 + 2)', new BinaryNode('+', new ConstantNode(1), new ConstantNode(2))],
+            ['(2 * 2)', new BinaryNode('*', new ConstantNode(2), new ConstantNode(2))],
+            ['(2 / 2)', new BinaryNode('/', new ConstantNode(2), new ConstantNode(2))],
+            ['(5 % 2)', new BinaryNode('%', new ConstantNode(5), new ConstantNode(2))],
+            ['(5 ** 2)', new BinaryNode('**', new ConstantNode(5), new ConstantNode(2))],
+            ['("a" ~ "b")', new BinaryNode('~', new ConstantNode('a'), new ConstantNode('b'))],
 
-            array('("a" in ["a", "b"])', new BinaryNode('in', new ConstantNode('a'), $array)),
-            array('("c" in ["a", "b"])', new BinaryNode('in', new ConstantNode('c'), $array)),
-            array('("c" not in ["a", "b"])', new BinaryNode('not in', new ConstantNode('c'), $array)),
-            array('("a" not in ["a", "b"])', new BinaryNode('not in', new ConstantNode('a'), $array)),
+            ['("a" in ["a", "b"])', new BinaryNode('in', new ConstantNode('a'), $array)],
+            ['("c" in ["a", "b"])', new BinaryNode('in', new ConstantNode('c'), $array)],
+            ['("c" not in ["a", "b"])', new BinaryNode('not in', new ConstantNode('c'), $array)],
+            ['("a" not in ["a", "b"])', new BinaryNode('not in', new ConstantNode('a'), $array)],
 
-            array('(1 .. 3)', new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))),
+            ['(1 .. 3)', new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))],
 
-            array('("abc" matches "/^[a-z]+/i$/")', new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('/^[a-z]+/i$/'))),
-        );
+            ['("abc" matches "/^[a-z]+/i$/")', new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('/^[a-z]+/i$/'))],
+        ];
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ConditionalNodeTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ConditionalNodeTest.php
index cbf9e8d4..13b7cbde 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ConditionalNodeTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ConditionalNodeTest.php
@@ -18,25 +18,25 @@ class ConditionalNodeTest extends AbstractNodeTest
 {
     public function getEvaluateData()
     {
-        return array(
-            array(1, new ConditionalNode(new ConstantNode(true), new ConstantNode(1), new ConstantNode(2))),
-            array(2, new ConditionalNode(new ConstantNode(false), new ConstantNode(1), new ConstantNode(2))),
-        );
+        return [
+            [1, new ConditionalNode(new ConstantNode(true), new ConstantNode(1), new ConstantNode(2))],
+            [2, new ConditionalNode(new ConstantNode(false), new ConstantNode(1), new ConstantNode(2))],
+        ];
     }
 
     public function getCompileData()
     {
-        return array(
-            array('((true) ? (1) : (2))', new ConditionalNode(new ConstantNode(true), new ConstantNode(1), new ConstantNode(2))),
-            array('((false) ? (1) : (2))', new ConditionalNode(new ConstantNode(false), new ConstantNode(1), new ConstantNode(2))),
-        );
+        return [
+            ['((true) ? (1) : (2))', new ConditionalNode(new ConstantNode(true), new ConstantNode(1), new ConstantNode(2))],
+            ['((false) ? (1) : (2))', new ConditionalNode(new ConstantNode(false), new ConstantNode(1), new ConstantNode(2))],
+        ];
     }
 
     public function getDumpData()
     {
-        return array(
-            array('(true ? 1 : 2)', new ConditionalNode(new ConstantNode(true), new ConstantNode(1), new ConstantNode(2))),
-            array('(false ? 1 : 2)', new ConditionalNode(new ConstantNode(false), new ConstantNode(1), new ConstantNode(2))),
-        );
+        return [
+            ['(true ? 1 : 2)', new ConditionalNode(new ConstantNode(true), new ConstantNode(1), new ConstantNode(2))],
+            ['(false ? 1 : 2)', new ConditionalNode(new ConstantNode(false), new ConstantNode(1), new ConstantNode(2))],
+        ];
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ConstantNodeTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ConstantNodeTest.php
index af79a91c..fee9f5bf 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ConstantNodeTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ConstantNodeTest.php
@@ -17,44 +17,44 @@ class ConstantNodeTest extends AbstractNodeTest
 {
     public function getEvaluateData()
     {
-        return array(
-            array(false, new ConstantNode(false)),
-            array(true, new ConstantNode(true)),
-            array(null, new ConstantNode(null)),
-            array(3, new ConstantNode(3)),
-            array(3.3, new ConstantNode(3.3)),
-            array('foo', new ConstantNode('foo')),
-            array(array(1, 'b' => 'a'), new ConstantNode(array(1, 'b' => 'a'))),
-        );
+        return [
+            [false, new ConstantNode(false)],
+            [true, new ConstantNode(true)],
+            [null, new ConstantNode(null)],
+            [3, new ConstantNode(3)],
+            [3.3, new ConstantNode(3.3)],
+            ['foo', new ConstantNode('foo')],
+            [[1, 'b' => 'a'], new ConstantNode([1, 'b' => 'a'])],
+        ];
     }
 
     public function getCompileData()
     {
-        return array(
-            array('false', new ConstantNode(false)),
-            array('true', new ConstantNode(true)),
-            array('null', new ConstantNode(null)),
-            array('3', new ConstantNode(3)),
-            array('3.3', new ConstantNode(3.3)),
-            array('"foo"', new ConstantNode('foo')),
-            array('array(0 => 1, "b" => "a")', new ConstantNode(array(1, 'b' => 'a'))),
-        );
+        return [
+            ['false', new ConstantNode(false)],
+            ['true', new ConstantNode(true)],
+            ['null', new ConstantNode(null)],
+            ['3', new ConstantNode(3)],
+            ['3.3', new ConstantNode(3.3)],
+            ['"foo"', new ConstantNode('foo')],
+            ['[0 => 1, "b" => "a"]', new ConstantNode([1, 'b' => 'a'])],
+        ];
     }
 
     public function getDumpData()
     {
-        return array(
-            array('false', new ConstantNode(false)),
-            array('true', new ConstantNode(true)),
-            array('null', new ConstantNode(null)),
-            array('3', new ConstantNode(3)),
-            array('3.3', new ConstantNode(3.3)),
-            array('"foo"', new ConstantNode('foo')),
-            array('foo', new ConstantNode('foo', true)),
-            array('{0: 1, "b": "a", 1: true}', new ConstantNode(array(1, 'b' => 'a', true))),
-            array('{"a\\"b": "c", "a\\\\b": "d"}', new ConstantNode(array('a"b' => 'c', 'a\\b' => 'd'))),
-            array('["c", "d"]', new ConstantNode(array('c', 'd'))),
-            array('{"a": ["b"]}', new ConstantNode(array('a' => array('b')))),
-        );
+        return [
+            ['false', new ConstantNode(false)],
+            ['true', new ConstantNode(true)],
+            ['null', new ConstantNode(null)],
+            ['3', new ConstantNode(3)],
+            ['3.3', new ConstantNode(3.3)],
+            ['"foo"', new ConstantNode('foo')],
+            ['foo', new ConstantNode('foo', true)],
+            ['{0: 1, "b": "a", 1: true}', new ConstantNode([1, 'b' => 'a', true])],
+            ['{"a\\"b": "c", "a\\\\b": "d"}', new ConstantNode(['a"b' => 'c', 'a\\b' => 'd'])],
+            ['["c", "d"]', new ConstantNode(['c', 'd'])],
+            ['{"a": ["b"]}', new ConstantNode(['a' => ['b']])],
+        ];
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/FunctionNodeTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/FunctionNodeTest.php
index 8d6f92a9..c6cb02c1 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/FunctionNodeTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/FunctionNodeTest.php
@@ -11,42 +11,42 @@
 
 namespace Symfony\Component\ExpressionLanguage\Tests\Node;
 
-use Symfony\Component\ExpressionLanguage\Node\FunctionNode;
 use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
+use Symfony\Component\ExpressionLanguage\Node\FunctionNode;
 use Symfony\Component\ExpressionLanguage\Node\Node;
 
 class FunctionNodeTest extends AbstractNodeTest
 {
     public function getEvaluateData()
     {
-        return array(
-            array('bar', new FunctionNode('foo', new Node(array(new ConstantNode('bar')))), array(), array('foo' => $this->getCallables())),
-        );
+        return [
+            ['bar', new FunctionNode('foo', new Node([new ConstantNode('bar')])), [], ['foo' => $this->getCallables()]],
+        ];
     }
 
     public function getCompileData()
     {
-        return array(
-            array('foo("bar")', new FunctionNode('foo', new Node(array(new ConstantNode('bar')))), array('foo' => $this->getCallables())),
-        );
+        return [
+            ['foo("bar")', new FunctionNode('foo', new Node([new ConstantNode('bar')])), ['foo' => $this->getCallables()]],
+        ];
     }
 
     public function getDumpData()
     {
-        return array(
-            array('foo("bar")', new FunctionNode('foo', new Node(array(new ConstantNode('bar')))), array('foo' => $this->getCallables())),
-        );
+        return [
+            ['foo("bar")', new FunctionNode('foo', new Node([new ConstantNode('bar')])), ['foo' => $this->getCallables()]],
+        ];
     }
 
     protected function getCallables()
     {
-        return array(
+        return [
             'compiler' => function ($arg) {
                 return sprintf('foo(%s)', $arg);
             },
             'evaluator' => function ($variables, $arg) {
                 return $arg;
             },
-        );
+        ];
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/GetAttrNodeTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/GetAttrNodeTest.php
index cf7cd7a0..c790f33a 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/GetAttrNodeTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/GetAttrNodeTest.php
@@ -12,49 +12,49 @@
 namespace Symfony\Component\ExpressionLanguage\Tests\Node;
 
 use Symfony\Component\ExpressionLanguage\Node\ArrayNode;
-use Symfony\Component\ExpressionLanguage\Node\NameNode;
-use Symfony\Component\ExpressionLanguage\Node\GetAttrNode;
 use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
+use Symfony\Component\ExpressionLanguage\Node\GetAttrNode;
+use Symfony\Component\ExpressionLanguage\Node\NameNode;
 
 class GetAttrNodeTest extends AbstractNodeTest
 {
     public function getEvaluateData()
     {
-        return array(
-            array('b', new GetAttrNode(new NameNode('foo'), new ConstantNode(0), $this->getArrayNode(), GetAttrNode::ARRAY_CALL), array('foo' => array('b' => 'a', 'b'))),
-            array('a', new GetAttrNode(new NameNode('foo'), new ConstantNode('b'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL), array('foo' => array('b' => 'a', 'b'))),
+        return [
+            ['b', new GetAttrNode(new NameNode('foo'), new ConstantNode(0), $this->getArrayNode(), GetAttrNode::ARRAY_CALL), ['foo' => ['b' => 'a', 'b']]],
+            ['a', new GetAttrNode(new NameNode('foo'), new ConstantNode('b'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL), ['foo' => ['b' => 'a', 'b']]],
 
-            array('bar', new GetAttrNode(new NameNode('foo'), new ConstantNode('foo'), $this->getArrayNode(), GetAttrNode::PROPERTY_CALL), array('foo' => new Obj())),
+            ['bar', new GetAttrNode(new NameNode('foo'), new ConstantNode('foo'), $this->getArrayNode(), GetAttrNode::PROPERTY_CALL), ['foo' => new Obj()]],
 
-            array('baz', new GetAttrNode(new NameNode('foo'), new ConstantNode('foo'), $this->getArrayNode(), GetAttrNode::METHOD_CALL), array('foo' => new Obj())),
-            array('a', new GetAttrNode(new NameNode('foo'), new NameNode('index'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL), array('foo' => array('b' => 'a', 'b'), 'index' => 'b')),
-        );
+            ['baz', new GetAttrNode(new NameNode('foo'), new ConstantNode('foo'), $this->getArrayNode(), GetAttrNode::METHOD_CALL), ['foo' => new Obj()]],
+            ['a', new GetAttrNode(new NameNode('foo'), new NameNode('index'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL), ['foo' => ['b' => 'a', 'b'], 'index' => 'b']],
+        ];
     }
 
     public function getCompileData()
     {
-        return array(
-            array('$foo[0]', new GetAttrNode(new NameNode('foo'), new ConstantNode(0), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)),
-            array('$foo["b"]', new GetAttrNode(new NameNode('foo'), new ConstantNode('b'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)),
+        return [
+            ['$foo[0]', new GetAttrNode(new NameNode('foo'), new ConstantNode(0), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)],
+            ['$foo["b"]', new GetAttrNode(new NameNode('foo'), new ConstantNode('b'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)],
 
-            array('$foo->foo', new GetAttrNode(new NameNode('foo'), new ConstantNode('foo'), $this->getArrayNode(), GetAttrNode::PROPERTY_CALL), array('foo' => new Obj())),
+            ['$foo->foo', new GetAttrNode(new NameNode('foo'), new ConstantNode('foo'), $this->getArrayNode(), GetAttrNode::PROPERTY_CALL), ['foo' => new Obj()]],
 
-            array('$foo->foo(array("b" => "a", 0 => "b"))', new GetAttrNode(new NameNode('foo'), new ConstantNode('foo'), $this->getArrayNode(), GetAttrNode::METHOD_CALL), array('foo' => new Obj())),
-            array('$foo[$index]', new GetAttrNode(new NameNode('foo'), new NameNode('index'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)),
-        );
+            ['$foo->foo(["b" => "a", 0 => "b"])', new GetAttrNode(new NameNode('foo'), new ConstantNode('foo'), $this->getArrayNode(), GetAttrNode::METHOD_CALL), ['foo' => new Obj()]],
+            ['$foo[$index]', new GetAttrNode(new NameNode('foo'), new NameNode('index'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)],
+        ];
     }
 
     public function getDumpData()
     {
-        return array(
-            array('foo[0]', new GetAttrNode(new NameNode('foo'), new ConstantNode(0), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)),
-            array('foo["b"]', new GetAttrNode(new NameNode('foo'), new ConstantNode('b'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)),
+        return [
+            ['foo[0]', new GetAttrNode(new NameNode('foo'), new ConstantNode(0), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)],
+            ['foo["b"]', new GetAttrNode(new NameNode('foo'), new ConstantNode('b'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)],
 
-            array('foo.foo', new GetAttrNode(new NameNode('foo'), new NameNode('foo'), $this->getArrayNode(), GetAttrNode::PROPERTY_CALL), array('foo' => new Obj())),
+            ['foo.foo', new GetAttrNode(new NameNode('foo'), new NameNode('foo'), $this->getArrayNode(), GetAttrNode::PROPERTY_CALL), ['foo' => new Obj()]],
 
-            array('foo.foo({"b": "a", 0: "b"})', new GetAttrNode(new NameNode('foo'), new NameNode('foo'), $this->getArrayNode(), GetAttrNode::METHOD_CALL), array('foo' => new Obj())),
-            array('foo[index]', new GetAttrNode(new NameNode('foo'), new NameNode('index'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)),
-        );
+            ['foo.foo({"b": "a", 0: "b"})', new GetAttrNode(new NameNode('foo'), new NameNode('foo'), $this->getArrayNode(), GetAttrNode::METHOD_CALL), ['foo' => new Obj()]],
+            ['foo[index]', new GetAttrNode(new NameNode('foo'), new NameNode('index'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)],
+        ];
     }
 
     protected function getArrayNode()
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/NameNodeTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/NameNodeTest.php
index 5fa2c37f..a30c27b8 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/NameNodeTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/NameNodeTest.php
@@ -17,22 +17,22 @@ class NameNodeTest extends AbstractNodeTest
 {
     public function getEvaluateData()
     {
-        return array(
-            array('bar', new NameNode('foo'), array('foo' => 'bar')),
-        );
+        return [
+            ['bar', new NameNode('foo'), ['foo' => 'bar']],
+        ];
     }
 
     public function getCompileData()
     {
-        return array(
-            array('$foo', new NameNode('foo')),
-        );
+        return [
+            ['$foo', new NameNode('foo')],
+        ];
     }
 
     public function getDumpData()
     {
-        return array(
-            array('foo', new NameNode('foo')),
-        );
+        return [
+            ['foo', new NameNode('foo')],
+        ];
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/NodeTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/NodeTest.php
index 0f35b5fe..351da051 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/NodeTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/NodeTest.php
@@ -12,14 +12,14 @@
 namespace Symfony\Component\ExpressionLanguage\Tests\Node;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\ExpressionLanguage\Node\Node;
 use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
+use Symfony\Component\ExpressionLanguage\Node\Node;
 
 class NodeTest extends TestCase
 {
     public function testToString()
     {
-        $node = new Node(array(new ConstantNode('foo')));
+        $node = new Node([new ConstantNode('foo')]);
 
         $this->assertEquals(<<<'EOF'
 Node(
@@ -31,7 +31,7 @@ EOF
 
     public function testSerialization()
     {
-        $node = new Node(array('foo' => 'bar'), array('bar' => 'foo'));
+        $node = new Node(['foo' => 'bar'], ['bar' => 'foo']);
 
         $serializedNode = serialize($node);
         $unserializedNode = unserialize($serializedNode);
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/UnaryNodeTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/UnaryNodeTest.php
index ae2e3eee..bac75d24 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/UnaryNodeTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/UnaryNodeTest.php
@@ -11,38 +11,38 @@
 
 namespace Symfony\Component\ExpressionLanguage\Tests\Node;
 
-use Symfony\Component\ExpressionLanguage\Node\UnaryNode;
 use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
+use Symfony\Component\ExpressionLanguage\Node\UnaryNode;
 
 class UnaryNodeTest extends AbstractNodeTest
 {
     public function getEvaluateData()
     {
-        return array(
-            array(-1, new UnaryNode('-', new ConstantNode(1))),
-            array(3, new UnaryNode('+', new ConstantNode(3))),
-            array(false, new UnaryNode('!', new ConstantNode(true))),
-            array(false, new UnaryNode('not', new ConstantNode(true))),
-        );
+        return [
+            [-1, new UnaryNode('-', new ConstantNode(1))],
+            [3, new UnaryNode('+', new ConstantNode(3))],
+            [false, new UnaryNode('!', new ConstantNode(true))],
+            [false, new UnaryNode('not', new ConstantNode(true))],
+        ];
     }
 
     public function getCompileData()
     {
-        return array(
-            array('(-1)', new UnaryNode('-', new ConstantNode(1))),
-            array('(+3)', new UnaryNode('+', new ConstantNode(3))),
-            array('(!true)', new UnaryNode('!', new ConstantNode(true))),
-            array('(!true)', new UnaryNode('not', new ConstantNode(true))),
-        );
+        return [
+            ['(-1)', new UnaryNode('-', new ConstantNode(1))],
+            ['(+3)', new UnaryNode('+', new ConstantNode(3))],
+            ['(!true)', new UnaryNode('!', new ConstantNode(true))],
+            ['(!true)', new UnaryNode('not', new ConstantNode(true))],
+        ];
     }
 
     public function getDumpData()
     {
-        return array(
-            array('(- 1)', new UnaryNode('-', new ConstantNode(1))),
-            array('(+ 3)', new UnaryNode('+', new ConstantNode(3))),
-            array('(! true)', new UnaryNode('!', new ConstantNode(true))),
-            array('(not true)', new UnaryNode('not', new ConstantNode(true))),
-        );
+        return [
+            ['(- 1)', new UnaryNode('-', new ConstantNode(1))],
+            ['(+ 3)', new UnaryNode('+', new ConstantNode(3))],
+            ['(! true)', new UnaryNode('!', new ConstantNode(true))],
+            ['(not true)', new UnaryNode('not', new ConstantNode(true))],
+        ];
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/ParserCache/ParserCacheAdapterTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/ParserCache/ParserCacheAdapterTest.php
index 44731611..f82af92e 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/ParserCache/ParserCacheAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/ParserCache/ParserCacheAdapterTest.php
@@ -12,9 +12,9 @@
 namespace Symfony\Component\ExpressionLanguage\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\ExpressionLanguage\Node\Node;
 use Symfony\Component\ExpressionLanguage\ParsedExpression;
 use Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheAdapter;
-use Symfony\Component\ExpressionLanguage\Node\Node;
 
 /**
  * @group legacy
@@ -38,8 +38,8 @@ class ParserCacheAdapterTest extends TestCase
 
         $cacheItem = $parserCacheAdapter->getItem($key);
 
-        $this->assertEquals($cacheItem->get(), $value);
-        $this->assertEquals($cacheItem->isHit(), true);
+        $this->assertEquals($value, $cacheItem->get());
+        $this->assertTrue($cacheItem->isHit());
     }
 
     public function testSave()
@@ -47,7 +47,7 @@ class ParserCacheAdapterTest extends TestCase
         $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
         $cacheItemMock = $this->getMockBuilder('Psr\Cache\CacheItemInterface')->getMock();
         $key = 'key';
-        $value = new ParsedExpression('1 + 1', new Node(array(), array()));
+        $value = new ParsedExpression('1 + 1', new Node([], []));
         $parserCacheAdapter = new ParserCacheAdapter($poolMock);
 
         $poolMock
@@ -68,14 +68,14 @@ class ParserCacheAdapterTest extends TestCase
             ->willReturn($value)
         ;
 
-        $cacheItem = $parserCacheAdapter->save($cacheItemMock);
+        $parserCacheAdapter->save($cacheItemMock);
     }
 
     public function testGetItems()
     {
         $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
         $parserCacheAdapter = new ParserCacheAdapter($poolMock);
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class);
+        $this->expectException(\BadMethodCallException::class);
 
         $parserCacheAdapter->getItems();
     }
@@ -85,7 +85,7 @@ class ParserCacheAdapterTest extends TestCase
         $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
         $key = 'key';
         $parserCacheAdapter = new ParserCacheAdapter($poolMock);
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class);
+        $this->expectException(\BadMethodCallException::class);
 
         $parserCacheAdapter->hasItem($key);
     }
@@ -94,7 +94,7 @@ class ParserCacheAdapterTest extends TestCase
     {
         $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
         $parserCacheAdapter = new ParserCacheAdapter($poolMock);
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class);
+        $this->expectException(\BadMethodCallException::class);
 
         $parserCacheAdapter->clear();
     }
@@ -104,7 +104,7 @@ class ParserCacheAdapterTest extends TestCase
         $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
         $key = 'key';
         $parserCacheAdapter = new ParserCacheAdapter($poolMock);
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class);
+        $this->expectException(\BadMethodCallException::class);
 
         $parserCacheAdapter->deleteItem($key);
     }
@@ -112,9 +112,9 @@ class ParserCacheAdapterTest extends TestCase
     public function testDeleteItems()
     {
         $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
-        $keys = array('key');
+        $keys = ['key'];
         $parserCacheAdapter = new ParserCacheAdapter($poolMock);
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class);
+        $this->expectException(\BadMethodCallException::class);
 
         $parserCacheAdapter->deleteItems($keys);
     }
@@ -124,7 +124,7 @@ class ParserCacheAdapterTest extends TestCase
         $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
         $parserCacheAdapter = new ParserCacheAdapter($poolMock);
         $cacheItemMock = $this->getMockBuilder('Psr\Cache\CacheItemInterface')->getMock();
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class);
+        $this->expectException(\BadMethodCallException::class);
 
         $parserCacheAdapter->saveDeferred($cacheItemMock);
     }
@@ -133,7 +133,7 @@ class ParserCacheAdapterTest extends TestCase
     {
         $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
         $parserCacheAdapter = new ParserCacheAdapter($poolMock);
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class);
+        $this->expectException(\BadMethodCallException::class);
 
         $parserCacheAdapter->commit();
     }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/ParserTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/ParserTest.php
index 11464abd..2d5a0a6c 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/ParserTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/ParserTest.php
@@ -12,41 +12,37 @@
 namespace Symfony\Component\ExpressionLanguage\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\ExpressionLanguage\Parser;
 use Symfony\Component\ExpressionLanguage\Lexer;
 use Symfony\Component\ExpressionLanguage\Node;
+use Symfony\Component\ExpressionLanguage\Parser;
 
 class ParserTest extends TestCase
 {
-    /**
-     * @expectedException        \Symfony\Component\ExpressionLanguage\SyntaxError
-     * @expectedExceptionMessage Variable "foo" is not valid around position 1 for expression `foo`.
-     */
     public function testParseWithInvalidName()
     {
+        $this->expectException('Symfony\Component\ExpressionLanguage\SyntaxError');
+        $this->expectExceptionMessage('Variable "foo" is not valid around position 1 for expression `foo`.');
         $lexer = new Lexer();
-        $parser = new Parser(array());
+        $parser = new Parser([]);
         $parser->parse($lexer->tokenize('foo'));
     }
 
-    /**
-     * @expectedException        \Symfony\Component\ExpressionLanguage\SyntaxError
-     * @expectedExceptionMessage Variable "foo" is not valid around position 1 for expression `foo`.
-     */
     public function testParseWithZeroInNames()
     {
+        $this->expectException('Symfony\Component\ExpressionLanguage\SyntaxError');
+        $this->expectExceptionMessage('Variable "foo" is not valid around position 1 for expression `foo`.');
         $lexer = new Lexer();
-        $parser = new Parser(array());
-        $parser->parse($lexer->tokenize('foo'), array(0));
+        $parser = new Parser([]);
+        $parser->parse($lexer->tokenize('foo'), [0]);
     }
 
     /**
      * @dataProvider getParseData
      */
-    public function testParse($node, $expression, $names = array())
+    public function testParse($node, $expression, $names = [])
     {
         $lexer = new Lexer();
-        $parser = new Parser(array());
+        $parser = new Parser([]);
         $this->assertEquals($node, $parser->parse($lexer->tokenize($expression), $names));
     }
 
@@ -57,63 +53,66 @@ class ParserTest extends TestCase
         $arguments->addElement(new Node\ConstantNode(2));
         $arguments->addElement(new Node\ConstantNode(true));
 
-        return array(
-            array(
+        $arrayNode = new Node\ArrayNode();
+        $arrayNode->addElement(new Node\NameNode('bar'));
+
+        return [
+            [
                 new Node\NameNode('a'),
                 'a',
-                array('a'),
-            ),
-            array(
+                ['a'],
+            ],
+            [
                 new Node\ConstantNode('a'),
                 '"a"',
-            ),
-            array(
+            ],
+            [
                 new Node\ConstantNode(3),
                 '3',
-            ),
-            array(
+            ],
+            [
                 new Node\ConstantNode(false),
                 'false',
-            ),
-            array(
+            ],
+            [
                 new Node\ConstantNode(true),
                 'true',
-            ),
-            array(
+            ],
+            [
                 new Node\ConstantNode(null),
                 'null',
-            ),
-            array(
+            ],
+            [
                 new Node\UnaryNode('-', new Node\ConstantNode(3)),
                 '-3',
-            ),
-            array(
+            ],
+            [
                 new Node\BinaryNode('-', new Node\ConstantNode(3), new Node\ConstantNode(3)),
                 '3 - 3',
-            ),
-            array(
+            ],
+            [
                 new Node\BinaryNode('*',
                     new Node\BinaryNode('-', new Node\ConstantNode(3), new Node\ConstantNode(3)),
                     new Node\ConstantNode(2)
                 ),
                 '(3 - 3) * 2',
-            ),
-            array(
+            ],
+            [
                 new Node\GetAttrNode(new Node\NameNode('foo'), new Node\ConstantNode('bar', true), new Node\ArgumentsNode(), Node\GetAttrNode::PROPERTY_CALL),
                 'foo.bar',
-                array('foo'),
-            ),
-            array(
+                ['foo'],
+            ],
+            [
                 new Node\GetAttrNode(new Node\NameNode('foo'), new Node\ConstantNode('bar', true), new Node\ArgumentsNode(), Node\GetAttrNode::METHOD_CALL),
                 'foo.bar()',
-                array('foo'),
-            ),
-            array(
+                ['foo'],
+            ],
+            [
                 new Node\GetAttrNode(new Node\NameNode('foo'), new Node\ConstantNode('not', true), new Node\ArgumentsNode(), Node\GetAttrNode::METHOD_CALL),
                 'foo.not()',
-                array('foo'),
-            ),
-            array(
+                ['foo'],
+            ],
+            [
                 new Node\GetAttrNode(
                     new Node\NameNode('foo'),
                     new Node\ConstantNode('bar', true),
@@ -121,24 +120,24 @@ class ParserTest extends TestCase
                     Node\GetAttrNode::METHOD_CALL
                 ),
                 'foo.bar("arg1", 2, true)',
-                array('foo'),
-            ),
-            array(
+                ['foo'],
+            ],
+            [
                 new Node\GetAttrNode(new Node\NameNode('foo'), new Node\ConstantNode(3), new Node\ArgumentsNode(), Node\GetAttrNode::ARRAY_CALL),
                 'foo[3]',
-                array('foo'),
-            ),
-            array(
+                ['foo'],
+            ],
+            [
                 new Node\ConditionalNode(new Node\ConstantNode(true), new Node\ConstantNode(true), new Node\ConstantNode(false)),
                 'true ? true : false',
-            ),
-            array(
+            ],
+            [
                 new Node\BinaryNode('matches', new Node\ConstantNode('foo'), new Node\ConstantNode('/foo/')),
                 '"foo" matches "/foo/"',
-            ),
+            ],
 
             // chained calls
-            array(
+            [
                 $this->createGetAttrNode(
                     $this->createGetAttrNode(
                         $this->createGetAttrNode(
@@ -147,15 +146,45 @@ class ParserTest extends TestCase
                         'baz', Node\GetAttrNode::PROPERTY_CALL),
                     '3', Node\GetAttrNode::ARRAY_CALL),
                 'foo.bar().foo().baz[3]',
-                array('foo'),
-            ),
+                ['foo'],
+            ],
 
-            array(
+            [
                 new Node\NameNode('foo'),
                 'bar',
-                array('foo' => 'bar'),
-            ),
-        );
+                ['foo' => 'bar'],
+            ],
+
+            // Operators collisions
+            [
+                new Node\BinaryNode(
+                    'in',
+                    new Node\GetAttrNode(
+                        new Node\NameNode('foo'),
+                        new Node\ConstantNode('not', true),
+                        new Node\ArgumentsNode(),
+                        Node\GetAttrNode::PROPERTY_CALL
+                    ),
+                    $arrayNode
+                ),
+                'foo.not in [bar]',
+                ['foo', 'bar'],
+            ],
+            [
+                new Node\BinaryNode(
+                    'or',
+                    new Node\UnaryNode('not', new Node\NameNode('foo')),
+                    new Node\GetAttrNode(
+                        new Node\NameNode('foo'),
+                        new Node\ConstantNode('not', true),
+                        new Node\ArgumentsNode(),
+                        Node\GetAttrNode::PROPERTY_CALL
+                    )
+                ),
+                'not foo or foo.not',
+                ['foo'],
+            ],
+        ];
     }
 
     private function createGetAttrNode($node, $item, $type)
@@ -165,46 +194,44 @@ class ParserTest extends TestCase
 
     /**
      * @dataProvider getInvalidPostfixData
-     * @expectedException \Symfony\Component\ExpressionLanguage\SyntaxError
      */
-    public function testParseWithInvalidPostfixData($expr, $names = array())
+    public function testParseWithInvalidPostfixData($expr, $names = [])
     {
+        $this->expectException('Symfony\Component\ExpressionLanguage\SyntaxError');
         $lexer = new Lexer();
-        $parser = new Parser(array());
+        $parser = new Parser([]);
         $parser->parse($lexer->tokenize($expr), $names);
     }
 
     public function getInvalidPostfixData()
     {
-        return array(
-            array(
+        return [
+            [
                 'foo."#"',
-                array('foo'),
-            ),
-            array(
+                ['foo'],
+            ],
+            [
                 'foo."bar"',
-                array('foo'),
-            ),
-            array(
+                ['foo'],
+            ],
+            [
                 'foo.**',
-                array('foo'),
-            ),
-            array(
+                ['foo'],
+            ],
+            [
                 'foo.123',
-                array('foo'),
-            ),
-        );
+                ['foo'],
+            ],
+        ];
     }
 
-    /**
-     * @expectedException \Symfony\Component\ExpressionLanguage\SyntaxError
-     * @expectedExceptionMessage Did you mean "baz"?
-     */
     public function testNameProposal()
     {
+        $this->expectException('Symfony\Component\ExpressionLanguage\SyntaxError');
+        $this->expectExceptionMessage('Did you mean "baz"?');
         $lexer = new Lexer();
-        $parser = new Parser(array());
+        $parser = new Parser([]);
 
-        $parser->parse($lexer->tokenize('foo > bar'), array('foo', 'baz'));
+        $parser->parse($lexer->tokenize('foo > bar'), ['foo', 'baz']);
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Token.php b/advancedcontentfilter/vendor/symfony/expression-language/Token.php
index 4517335b..60dc32d7 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Token.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Token.php
@@ -54,7 +54,7 @@ class Token
     /**
      * Tests the current token for a type and/or a value.
      *
-     * @param array|int   $type  The type to test
+     * @param string      $type  The type to test
      * @param string|null $value The token value
      *
      * @return bool
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/TokenStream.php b/advancedcontentfilter/vendor/symfony/expression-language/TokenStream.php
index 9096b183..09d3854e 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/TokenStream.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/TokenStream.php
@@ -53,7 +53,7 @@ class TokenStream
         ++$this->position;
 
         if (!isset($this->tokens[$this->position])) {
-            throw new SyntaxError('Unexpected end of expression', $this->current->cursor, $this->expression);
+            throw new SyntaxError('Unexpected end of expression.', $this->current->cursor, $this->expression);
         }
 
         $this->current = $this->tokens[$this->position];
@@ -70,7 +70,7 @@ class TokenStream
     {
         $token = $this->current;
         if (!$token->test($type, $value)) {
-            throw new SyntaxError(sprintf('%sUnexpected token "%s" of value "%s" ("%s" expected%s)', $message ? $message.'. ' : '', $token->type, $token->value, $type, $value ? sprintf(' with value "%s"', $value) : ''), $token->cursor, $this->expression);
+            throw new SyntaxError(sprintf('%sUnexpected token "%s" of value "%s" ("%s" expected%s).', $message ? $message.'. ' : '', $token->type, $token->value, $type, $value ? sprintf(' with value "%s"', $value) : ''), $token->cursor, $this->expression);
         }
         $this->next();
     }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/composer.json b/advancedcontentfilter/vendor/symfony/expression-language/composer.json
index 5f662ffd..5d5825b9 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/composer.json
+++ b/advancedcontentfilter/vendor/symfony/expression-language/composer.json
@@ -17,7 +17,8 @@
     ],
     "require": {
         "php": "^5.5.9|>=7.0.8",
-        "symfony/cache": "~3.1|~4.0"
+        "symfony/cache": "~3.1|~4.0",
+        "symfony/polyfill-php70": "~1.6"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\ExpressionLanguage\\": "" },
@@ -25,10 +26,5 @@
             "/Tests/"
         ]
     },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.4-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/phpunit.xml.dist b/advancedcontentfilter/vendor/symfony/expression-language/phpunit.xml.dist
index 517322fb..ae84dcd9 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/phpunit.xml.dist
+++ b/advancedcontentfilter/vendor/symfony/expression-language/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.2/phpunit.xsd"
          backupGlobals="false"
          colors="true"
          bootstrap="vendor/autoload.php"
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-apcu/Apcu.php b/advancedcontentfilter/vendor/symfony/polyfill-apcu/Apcu.php
index 595f6010..4dc5bf9a 100644
--- a/advancedcontentfilter/vendor/symfony/polyfill-apcu/Apcu.php
+++ b/advancedcontentfilter/vendor/symfony/polyfill-apcu/Apcu.php
@@ -23,11 +23,11 @@ final class Apcu
 {
     public static function apcu_add($key, $var = null, $ttl = 0)
     {
-        if (!is_array($key)) {
+        if (!\is_array($key)) {
             return apc_add($key, $var, $ttl);
         }
 
-        $errors = array();
+        $errors = [];
         foreach ($key as $k => $v) {
             if (!apc_add($k, $v, $ttl)) {
                 $errors[$k] = -1;
@@ -39,11 +39,11 @@ final class Apcu
 
     public static function apcu_store($key, $var = null, $ttl = 0)
     {
-        if (!is_array($key)) {
+        if (!\is_array($key)) {
             return apc_store($key, $var, $ttl);
         }
 
-        $errors = array();
+        $errors = [];
         foreach ($key as $k => $v) {
             if (!apc_store($k, $v, $ttl)) {
                 $errors[$k] = -1;
@@ -55,11 +55,11 @@ final class Apcu
 
     public static function apcu_exists($keys)
     {
-        if (!is_array($keys)) {
+        if (!\is_array($keys)) {
             return apc_exists($keys);
         }
 
-        $existing = array();
+        $existing = [];
         foreach ($keys as $k) {
             if (apc_exists($k)) {
                 $existing[$k] = true;
@@ -71,12 +71,12 @@ final class Apcu
 
     public static function apcu_fetch($key, &$success = null)
     {
-        if (!is_array($key)) {
+        if (!\is_array($key)) {
             return apc_fetch($key, $success);
         }
 
         $succeeded = true;
-        $values = array();
+        $values = [];
         foreach ($key as $k) {
             $v = apc_fetch($k, $success);
             if ($success) {
@@ -92,7 +92,7 @@ final class Apcu
 
     public static function apcu_delete($key)
     {
-        if (!is_array($key)) {
+        if (!\is_array($key)) {
             return apc_delete($key);
         }
 
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-apcu/LICENSE b/advancedcontentfilter/vendor/symfony/polyfill-apcu/LICENSE
index 24fa32c2..6e3afce6 100644
--- a/advancedcontentfilter/vendor/symfony/polyfill-apcu/LICENSE
+++ b/advancedcontentfilter/vendor/symfony/polyfill-apcu/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2015-2018 Fabien Potencier
+Copyright (c) 2015-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-apcu/README.md b/advancedcontentfilter/vendor/symfony/polyfill-apcu/README.md
index e614bcab..57f4bf6b 100644
--- a/advancedcontentfilter/vendor/symfony/polyfill-apcu/README.md
+++ b/advancedcontentfilter/vendor/symfony/polyfill-apcu/README.md
@@ -1,10 +1,10 @@
 Symfony Polyfill / APCu
 ========================
 
-This component provides `apcu_*` functions and the `APCUIterator` class to users of the legacy APC extension.
+This component provides `apcu_*` functions and the `APCuIterator` class to users of the legacy APC extension.
 
 More information can be found in the
-[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
+[main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md).
 
 License
 =======
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-apcu/bootstrap.php b/advancedcontentfilter/vendor/symfony/polyfill-apcu/bootstrap.php
index 305183b6..96b2706a 100644
--- a/advancedcontentfilter/vendor/symfony/polyfill-apcu/bootstrap.php
+++ b/advancedcontentfilter/vendor/symfony/polyfill-apcu/bootstrap.php
@@ -15,32 +15,67 @@ if (!extension_loaded('apc') && !extension_loaded('apcu')) {
     return;
 }
 
-if (!function_exists('apcu_add')) {
-    if (extension_loaded('Zend Data Cache')) {
-        function apcu_add($key, $var = null, $ttl = 0) { return p\Apcu::apcu_add($key, $var, $ttl); }
-        function apcu_delete($key) { return p\Apcu::apcu_delete($key); }
-        function apcu_exists($keys) { return p\Apcu::apcu_exists($keys); }
-        function apcu_fetch($key, &$success = null) { return p\Apcu::apcu_fetch($key, $success); }
-        function apcu_store($key, $var = null, $ttl = 0) { return p\Apcu::apcu_store($key, $var, $ttl); }
-    } else {
-        function apcu_add($key, $var = null, $ttl = 0) { return apc_add($key, $var, $ttl); }
-        function apcu_delete($key) { return apc_delete($key); }
-        function apcu_exists($keys) { return apc_exists($keys); }
-        function apcu_fetch($key, &$success = null) { return apc_fetch($key, $success); }
-        function apcu_store($key, $var = null, $ttl = 0) { return apc_store($key, $var, $ttl); }
+if (\PHP_VERSION_ID >= 80000) {
+    return require __DIR__.'/bootstrap80.php';
+}
+
+if (extension_loaded('Zend Data Cache')) {
+    if (!function_exists('apcu_add')) {
+        function apcu_add($key, $value = null, $ttl = 0) { return p\Apcu::apcu_add($key, $value, $ttl); }
     }
+    if (!function_exists('apcu_delete')) {
+        function apcu_delete($key) { return p\Apcu::apcu_delete($key); }
+    }
+    if (!function_exists('apcu_exists')) {
+        function apcu_exists($key) { return p\Apcu::apcu_exists($key); }
+    }
+    if (!function_exists('apcu_fetch')) {
+        function apcu_fetch($key, &$success = null) { return p\Apcu::apcu_fetch($key, $success); }
+    }
+    if (!function_exists('apcu_store')) {
+        function apcu_store($key, $value = null, $ttl = 0) { return p\Apcu::apcu_store($key, $value, $ttl); }
+    }
+} else {
+    if (!function_exists('apcu_add')) {
+        function apcu_add($key, $value = null, $ttl = 0) { return apc_add($key, $value, $ttl); }
+    }
+    if (!function_exists('apcu_delete')) {
+        function apcu_delete($key) { return apc_delete($key); }
+    }
+    if (!function_exists('apcu_exists')) {
+        function apcu_exists($key) { return apc_exists($key); }
+    }
+    if (!function_exists('apcu_fetch')) {
+        function apcu_fetch($key, &$success = null) { return apc_fetch($key, $success); }
+    }
+    if (!function_exists('apcu_store')) {
+        function apcu_store($key, $value = null, $ttl = 0) { return apc_store($key, $value, $ttl); }
+    }
+}
+
+if (!function_exists('apcu_cache_info')) {
     function apcu_cache_info($limited = false) { return apc_cache_info('user', $limited); }
+}
+if (!function_exists('apcu_cas')) {
     function apcu_cas($key, $old, $new) { return apc_cas($key, $old, $new); }
+}
+if (!function_exists('apcu_clear_cache')) {
     function apcu_clear_cache() { return apc_clear_cache('user'); }
+}
+if (!function_exists('apcu_dec')) {
     function apcu_dec($key, $step = 1, &$success = false) { return apc_dec($key, $step, $success); }
+}
+if (!function_exists('apcu_inc')) {
     function apcu_inc($key, $step = 1, &$success = false) { return apc_inc($key, $step, $success); }
+}
+if (!function_exists('apcu_sma_info')) {
     function apcu_sma_info($limited = false) { return apc_sma_info($limited); }
 }
 
-if (!class_exists('APCUIterator', false) && class_exists('APCIterator', false)) {
-    class APCUIterator extends APCIterator
+if (!class_exists('APCuIterator', false) && class_exists('APCIterator', false)) {
+    class APCuIterator extends APCIterator
     {
-        public function __construct($search = null, $format = APC_ITER_ALL, $chunk_size = 100, $list = APC_LIST_ACTIVE)
+        public function __construct($search = null, $format = \APC_ITER_ALL, $chunk_size = 100, $list = \APC_LIST_ACTIVE)
         {
             parent::__construct('user', $search, $format, $chunk_size, $list);
         }
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-apcu/bootstrap80.php b/advancedcontentfilter/vendor/symfony/polyfill-apcu/bootstrap80.php
new file mode 100644
index 00000000..69e9f160
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/polyfill-apcu/bootstrap80.php
@@ -0,0 +1,75 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Polyfill\Apcu as p;
+
+if (extension_loaded('Zend Data Cache')) {
+    if (!function_exists('apcu_add')) {
+        function apcu_add($key, mixed $value, ?int $ttl = 0): array|bool { return p\Apcu::apcu_add($key, $value, (int) $ttl); }
+    }
+    if (!function_exists('apcu_delete')) {
+        function apcu_delete($key): array|bool { return p\Apcu::apcu_delete($key); }
+    }
+    if (!function_exists('apcu_exists')) {
+        function apcu_exists($key): array|bool { return p\Apcu::apcu_exists($key); }
+    }
+    if (!function_exists('apcu_fetch')) {
+        function apcu_fetch($key, &$success = null): mixed { return p\Apcu::apcu_fetch($key, $success); }
+    }
+    if (!function_exists('apcu_store')) {
+        function apcu_store($key, mixed $value, ?int $ttl = 0): array|bool { return p\Apcu::apcu_store($key, $value, (int) $ttl); }
+    }
+} else {
+    if (!function_exists('apcu_add')) {
+        function apcu_add($key, mixed $value, ?int $ttl = 0): array|bool { return apc_add($key, $value, (int) $ttl); }
+    }
+    if (!function_exists('apcu_delete')) {
+        function apcu_delete($key): array|bool { return apc_delete($key); }
+    }
+    if (!function_exists('apcu_exists')) {
+        function apcu_exists($key): array|bool { return apc_exists($key); }
+    }
+    if (!function_exists('apcu_fetch')) {
+        function apcu_fetch($key, &$success = null) { return apc_fetch($key, $success); }
+    }
+    if (!function_exists('apcu_store')) {
+        function apcu_store($key, mixed $value, ?int $ttl = 0): array|bool { return apc_store($key, $value, (int) $ttl); }
+    }
+}
+
+if (!function_exists('apcu_cache_info')) {
+    function apcu_cache_info($limited = false) { return apc_cache_info('user', $limited); }
+}
+if (!function_exists('apcu_cas')) {
+    function apcu_cas($key, $old, $new) { return apc_cas($key, $old, $new); }
+}
+if (!function_exists('apcu_clear_cache')) {
+    function apcu_clear_cache() { return apc_clear_cache('user'); }
+}
+if (!function_exists('apcu_dec')) {
+    function apcu_dec($key, $step = 1, &$success = false) { return apc_dec($key, $step, $success); }
+}
+if (!function_exists('apcu_inc')) {
+    function apcu_inc($key, $step = 1, &$success = false) { return apc_inc($key, $step, $success); }
+}
+if (!function_exists('apcu_sma_info')) {
+    function apcu_sma_info($limited = false) { return apc_sma_info($limited); }
+}
+
+if (!class_exists('APCuIterator', false) && class_exists('APCIterator', false)) {
+    class APCuIterator extends APCIterator
+    {
+        public function __construct($search = null, $format = APC_ITER_ALL, $chunk_size = 100, $list = APC_LIST_ACTIVE)
+        {
+            parent::__construct('user', $search, $format, $chunk_size, $list);
+        }
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-apcu/composer.json b/advancedcontentfilter/vendor/symfony/polyfill-apcu/composer.json
index 54ea2b85..e92524f3 100644
--- a/advancedcontentfilter/vendor/symfony/polyfill-apcu/composer.json
+++ b/advancedcontentfilter/vendor/symfony/polyfill-apcu/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.3"
+        "php": ">=7.1"
     },
     "autoload": {
         "psr-4": { "Symfony\\Polyfill\\Apcu\\": "" },
@@ -25,7 +25,11 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.7-dev"
+            "dev-main": "1.28-dev"
+        },
+        "thanks": {
+            "name": "symfony/polyfill",
+            "url": "https://github.com/symfony/polyfill"
         }
     }
 }

From 8b35c9fddba1cd7695a33ce4d9aa5e2d9dd312b2 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 22 Jan 2024 18:01:51 +0000
Subject: [PATCH 008/294] Tesseract: Improved detection

---
 tesseract/tesseract.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tesseract/tesseract.php b/tesseract/tesseract.php
index 3c61273f..b3e1feb6 100644
--- a/tesseract/tesseract.php
+++ b/tesseract/tesseract.php
@@ -24,6 +24,10 @@ function tesseract_ocr_detection(&$media)
 {
 	$ocr = new TesseractOCR();
 	try {
+		$languages = $ocr->availableLanguages();
+		if ($languages) {
+			$ocr->lang(implode('+', $languages));
+		}
 		$ocr->tempDir(System::getTempPath());
 		$ocr->imageData($media['img_str'], strlen($media['img_str']));
 		$media['description'] = $ocr->run();

From c9f985d8424c3410cf85b9636ad4d3df2ea2c8a7 Mon Sep 17 00:00:00 2001
From: Hannes Heute <haheute@posteo.de>
Date: Fri, 2 Feb 2024 14:08:06 +0100
Subject: [PATCH 009/294] remove .php from openstreetmap server in config to
 fix created links

---
 openstreetmap/config/openstreetmap.config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openstreetmap/config/openstreetmap.config.php b/openstreetmap/config/openstreetmap.config.php
index c649da5f..d633fd26 100644
--- a/openstreetmap/config/openstreetmap.config.php
+++ b/openstreetmap/config/openstreetmap.config.php
@@ -10,7 +10,7 @@ return [
 		'tmsserver' => 'https://www.openstreetmap.org',
 
 		// nomserver (String)
-		'nomserver' => 'https://nominatim.openstreetmap.org/search.php',
+		'nomserver' => 'https://nominatim.openstreetmap.org/search',
 
 		// zoom (Integer)
 		// The default zoom level on the map.

From 84fc5ba9220f393d75ad0cb110260e458082ae0b Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 10 Feb 2024 12:00:36 +0000
Subject: [PATCH 010/294] Markdown: Avoid problems with [*] BBCode element

---
 markdown/markdown.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/markdown/markdown.php b/markdown/markdown.php
index 236fb297..6f459244 100644
--- a/markdown/markdown.php
+++ b/markdown/markdown.php
@@ -64,6 +64,7 @@ function markdown_post_local_start(&$request) {
 				// (right chevrons are used for quoting in Markdown)
 				// See https://github.com/friendica/friendica/issues/10634
 				$text = strtr($text, ['<' => '&lt;']);
+				$text = str_replace('[*]', '[li]', $text);
 
 				return Markdown::toBBCode($text);
 			});

From f678468d429b597ce5ff42d6979fc8aa370d8fe8 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 16 Feb 2024 02:29:12 +0000
Subject: [PATCH 011/294] Bluesky/Twitter: New parameter added for rhe picture
 creation

---
 bluesky/bluesky.php | 2 +-
 twitter/twitter.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index a2c85ad3..fe1faab1 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -896,7 +896,7 @@ function bluesky_upload_blob(int $uid, array $photo): ?stdClass
 	$retrial = Worker::getRetrial();
 	$content = Photo::getImageForPhoto($photo);
 
-	$picture = new Image($content, $photo['type']);
+	$picture = new Image($content, $photo['type'], $photo['filename']);
 	$height  = $picture->getHeight();
 	$width   = $picture->getWidth();
 	$size    = strlen($content);
diff --git a/twitter/twitter.php b/twitter/twitter.php
index b01345b7..11c163ef 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -308,7 +308,7 @@ function twitter_upload_image(int $uid, array $image, int $retrial)
 
 	$picturedata = Photo::getImageForPhoto($photo);
 
-	$picture = new Image($picturedata, $photo['type']);
+	$picture = new Image($picturedata, $photo['type'], $photo['filename']);
 	$height  = $picture->getHeight();
 	$width   = $picture->getWidth();
 	$size    = strlen($picturedata);

From 9208fd46a4afefd9c2789bd866585e29f425705b Mon Sep 17 00:00:00 2001
From: Morgan McMillian <morgan@mcmillian.dev>
Date: Tue, 20 Feb 2024 17:53:21 -0800
Subject: [PATCH 012/294] Pnut: add connector for pnut.io

---
 pnut/LICENSE                          |  662 +++++++
 pnut/README.md                        |    5 +
 pnut/lib/LICENSE                      |   24 +
 pnut/lib/phpnut.php                   | 2504 +++++++++++++++++++++++++
 pnut/lib/phpnutException.php          |    5 +
 pnut/pnut.php                         |  293 +++
 pnut/pnut.svg                         |    1 +
 pnut/templates/connector_settings.tpl |   12 +
 8 files changed, 3506 insertions(+)
 create mode 100644 pnut/LICENSE
 create mode 100644 pnut/README.md
 create mode 100644 pnut/lib/LICENSE
 create mode 100644 pnut/lib/phpnut.php
 create mode 100644 pnut/lib/phpnutException.php
 create mode 100644 pnut/pnut.php
 create mode 100644 pnut/pnut.svg
 create mode 100644 pnut/templates/connector_settings.tpl

diff --git a/pnut/LICENSE b/pnut/LICENSE
new file mode 100644
index 00000000..fe6b9036
--- /dev/null
+++ b/pnut/LICENSE
@@ -0,0 +1,662 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.
+
diff --git a/pnut/README.md b/pnut/README.md
new file mode 100644
index 00000000..d935efe7
--- /dev/null
+++ b/pnut/README.md
@@ -0,0 +1,5 @@
+# Pnut connector
+
+With this addon to friendica you can give your users the possibility to post their *public* messages to pnut.io. 
+
+No setup is needed for the admins to make it work for their users.
diff --git a/pnut/lib/LICENSE b/pnut/lib/LICENSE
new file mode 100644
index 00000000..579599a8
--- /dev/null
+++ b/pnut/lib/LICENSE
@@ -0,0 +1,24 @@
+Copyright (c) 2013, Josh Dolitsky
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Josh Dolitsky nor the names of its 
+      contributors may be used to endorse or promote products derived 
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL TRAVIS RICHARDSON BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/pnut/lib/phpnut.php b/pnut/lib/phpnut.php
new file mode 100644
index 00000000..303a860b
--- /dev/null
+++ b/pnut/lib/phpnut.php
@@ -0,0 +1,2504 @@
+<?php
+
+namespace phpnut;
+
+/**
+ * phpnut.php
+ * pnut.io PHP library
+ * https://github.com/pnut-api/phpnut
+ *
+ * This class handles a lower level type of access to pnut.io. It's ideal
+ * for command line scripts and other places where you want full control
+ * over what's happening, and you're at least a little familiar with oAuth.
+ *
+ * Alternatively you can use the EZphpnut class which automatically takes
+ * care of a lot of the details like logging in, keeping track of tokens,
+ * etc. EZphpnut assumes you're accessing pnut.io via a browser, whereas
+ * this class tries to make no assumptions at all.
+ */
+class phpnut
+{
+    protected $_baseUrl = 'https://api.pnut.io/v1/';
+    protected $_authUrl = 'https://pnut.io/oauth/';
+
+    private $_authPostParams = [];
+
+    // stores the access token after login
+    private $_accessToken = null;
+
+    // stores the App access token if we have it
+    private $_appAccessToken = null;
+
+    // stores the user ID returned when fetching the auth token
+    private $_user_id = null;
+
+    // stores the username returned when fetching the auth token
+    private $_username = null;
+
+    // The total number of requests you're allowed within the alloted time period
+    private $_rateLimit = null;
+
+    // The number of requests you have remaining within the alloted time period
+    private $_rateLimitRemaining = null;
+
+    // The number of seconds remaining in the alloted time period
+    private $_rateLimitReset = null;
+
+    // The scope the user has
+    private $_scope = null;
+
+    // token scopes
+    private $_scopes = [];
+
+    // debug info
+    private $_last_request = null;
+    private $_last_response = null;
+
+    // ssl certification
+    private $_sslCA = null;
+
+    // the callback function to be called when an event is received from the stream
+    private $_streamCallback = null;
+
+    // the stream buffer
+    private $_streamBuffer = '';
+
+    // stores the curl handler for the current stream
+    private $_currentStream = null;
+
+    // stores the curl multi handler for the current stream
+    private $_multiStream = null;
+
+    // stores the number of failed connects, so we can back off multiple failures
+    private $_connectFailCounter = 0;
+
+    // stores the most recent stream url, so we can re-connect when needed
+    private $_streamUrl = null;
+
+    // keeps track of the last time we've received a packet from the api, if it's too long we'll reconnect
+    private $_lastStreamActivity = null;
+
+    // stores the headers received when connecting to the stream
+    private $_streamHeaders = null;
+
+    // response meta max_id data
+    private $_maxid = null;
+
+    // response meta min_id data
+    private $_minid = null;
+
+    // response meta more data
+    private $_more = null;
+
+    // response stream marker data
+    private $_last_marker = null;
+
+    // strip envelope response from returned value
+    private $_stripResponseEnvelope = true;
+
+    // if processing stream_markers or any fast stream, decrease $sleepFor
+    public $streamingSleepFor = 20000;
+
+    /**
+     * Constructs an phpnut PHP object with the specified client ID and
+     * client secret.
+     * @param string $client_id The client ID you received from pnut.io when
+     * creating your app.
+     * @param string $client_secret The client secret you received from
+     * pnut.io when creating your app.
+     */
+    public function __construct(?string $client_id_or_token=null, ?string $client_secret=null)
+    {
+        if (!$client_id_or_token) {
+            if (isset($_ENV['PNUT_ACCESS_TOKEN'])) {
+                $client_id_or_token = $_ENV['PNUT_ACCESS_TOKEN'];
+            } elseif (defined('PNUT_ACCESS_TOKEN')) {
+                $client_id_or_token = PNUT_ACCESS_TOKEN;
+            } elseif (defined('PNUT_CLIENT_ID') && defined('PNUT_CLIENT_SECRET')) {
+                $client_id_or_token = PNUT_CLIENT_ID;
+                $client_secret = PNUT_CLIENT_SECRET;
+            }
+        }
+
+        if (!$client_id_or_token) {
+            throw new phpnutException('You must specify your pnut access token or client ID and secret');
+        }
+
+        if ($client_id_or_token && $client_secret) {
+            $this->_clientId = $client_id_or_token;
+            $this->_clientSecret = $client_secret;
+        } else {
+            $this->_accessToken = $client_id_or_token;
+        }
+
+        // if the digicert certificate exists in the same folder as this file,
+        // remember that fact for later
+        if (file_exists(__DIR__ . '/DigiCertHighAssuranceEVRootCA.pem')) {
+            $this->_sslCA = __DIR__ . '/DigiCertHighAssuranceEVRootCA.pem';
+        }
+    }
+
+    /**
+     * Set whether or not to strip Envelope Response (meta) information
+     * This option will be deprecated in the future. Is it to allow
+     * a stepped migration path between code expecting the old behavior
+     * and new behavior. When not stripped, you still can use the proper
+     * method to pull the meta information. Please start converting your code ASAP
+     */
+    public function includeResponseEnvelope(): void
+    {
+        $this->_stripResponseEnvelope = false;
+    }
+
+    /**
+     * Construct the proper Auth URL for the user to visit and either grant
+     * or not access to your app. Usually you would place this as a link for
+     * the user to client, or a redirect to send them to the auth URL.
+     * Also can be called after authentication for additional scopes
+     * @param string $callbackUri Where you want the user to be directed
+     * after authenticating with pnut.io. This must be one of the URIs
+     * allowed by your pnut.io application settings.
+     * @param array $scope An array of scopes (permissions) you wish to obtain
+     * from the user. If you don't specify anything, you'll only receive
+     * access to the user's basic profile (the default).
+     */
+    public function getAuthUrl(?string $callback_uri=null, array|string|null $scope=null): string
+    {
+        if (empty($this->_clientId)) {
+            throw new phpnutException('You must specify your pnut client ID');
+        }
+
+        if (is_null($callback_uri)) {
+            if (defined('PNUT_REDIRECT_URI')) {
+                $callback_uri = PNUT_REDIRECT_URI;
+            } elseif (isset($_ENV['PNUT_REDIRECT_URI'])) {
+                $callback_uri = $_ENV['PNUT_REDIRECT_URI'];
+            } else {
+                throw new phpnutException('You must specify your pnut callback URI');
+            }
+        }
+
+        if (is_null($scope)) {
+            if (defined('PNUT_APP_SCOPE')) {
+                $scope = PNUT_APP_SCOPE;
+            } elseif (isset($_ENV['PNUT_APP_SCOPE'])) {
+                $scope = $_ENV['PNUT_APP_SCOPE'];
+            } else {
+                $scope = 'basic';
+            }
+        }
+
+        if (is_array($scope)) {
+            $scope = implode(',', $scope);
+        }
+
+        // construct an authorization url based on our client id and other data
+        $data = [
+            'client_id'=>$this->_clientId,
+            'response_type'=>'code',
+            'redirect_uri'=>$callback_uri,
+            'scope'=>$scope,
+        ];
+
+        $url = $this->_authUrl;
+        if ($this->_accessToken) {
+            $url .= 'authorize?';
+        } else {
+            $url .= 'authenticate?';
+        }
+        $url .= $this->buildQueryString($data);
+
+        // return the constructed url
+        return $url;
+    }
+
+    /**
+     * Call this after they return from the auth page, or anytime you need the
+     * token. For example, you could store it in a database and use
+     * setAccessToken() later on to return on behalf of the user.
+     */
+    public function getAccessToken(string $callback_uri)
+    {
+        // if there's no access token set, and they're returning from
+        // the auth page with a code, use the code to get a token
+        if (!$this->_accessToken && isset($_GET['code']) && $_GET['code'] !== '') {
+
+            if (empty($this->_clientId) || empty($this->_clientSecret)) {
+                throw new phpnutException('You must specify your Pnut client ID and client secret');
+            }
+
+            // construct the necessary elements to get a token
+            $data = [
+                'client_id'=>$this->_clientId,
+                'client_secret'=>$this->_clientSecret,
+                'grant_type'=>'authorization_code',
+                'redirect_uri'=>$callback_uri,
+                'code'=>$_GET['code'],
+            ];
+
+            // try and fetch the token with the above data
+            $res = $this->httpReq(
+                'post',
+                "{$this->_baseUrl}oauth/access_token",
+                $data
+            );
+
+            // store it for later
+            $this->_accessToken = $res['access_token'];
+            $this->_username = $res['username'];
+            $this->_user_id = $res['user_id'];
+        }
+
+        // return what we have (this may be a token, or it may be nothing)
+        return $this->_accessToken;
+    }
+
+    /**
+     * Check the scope of current token to see if it has required scopes
+     * has to be done after a check
+     */
+    public function checkScopes(array $app_scopes): int|array
+    {
+        if (count($this->_scopes) === 0) {
+            return -1; // _scope is empty
+        }
+        $missing = [];
+        foreach($app_scopes as $scope) {
+            if (!in_array($scope, $this->_scopes)) {
+                if ($scope === 'public_messages') {
+                    // messages works for public_messages
+                    if (in_array('messages', $this->_scopes)) {
+                        // if we have messages in our scopes
+                        continue;
+                    }
+                }
+                $missing[] = $scope;
+            }
+        }
+        // identify the ones missing
+        if (count($missing) !== 0) {
+            // do something
+            return $missing;
+        }
+        return 0; // 0 missing
+     }
+
+    /**
+     * Set the access token (eg: after retrieving it from offline storage)
+     * @param string $token A valid access token you're previously received
+     * from calling getAccessToken().
+     */
+    public function setAccessToken(?string $token=null): void
+    {
+        $this->_accessToken = $token;
+    }
+
+    /**
+     * Deauthorize the current token (delete your authorization from the API)
+     * Generally this is useful for logging users out from a web app, so they
+     * don't get automatically logged back in the next time you redirect them
+     * to the authorization URL.
+     */
+    public function deauthorizeToken()
+    {
+        return $this->httpReq('delete', "{$this->_baseUrl}token");
+    }
+    
+    /**
+     * Retrieve an app access token from the app.net API. This allows you
+     * to access the API without going through the user access flow if you
+     * just want to (eg) consume global. App access tokens are required for
+     * some actions (like streaming global). DO NOT share the return value
+     * of this function with any user (or save it in a cookie, etc). This
+     * is considered secret info for your app only.
+     * @return string The app access token
+     */
+    public function getAppAccessToken()
+    {    
+        if (empty($this->_clientId) || empty($this->_clientSecret)) {
+            throw new phpnutException('You must specify your Pnut client ID and client secret');
+        }
+
+        // construct the necessary elements to get a token
+        $data = [
+            'client_id'=>$this->_clientId,
+            'client_secret'=>$this->_clientSecret,
+            'grant_type'=>'client_credentials',
+        ];
+        // try and fetch the token with the above data
+        $res = $this->httpReq(
+            'post',
+            "{$this->_baseUrl}oauth/access_token",
+            $data
+        );
+        // store it for later
+        $this->_appAccessToken = $res['access_token'];
+        $this->_accessToken = $res['access_token'];
+        $this->_username = null;
+        $this->_user_id = null;
+        return $this->_accessToken;
+    }
+
+    /**
+     * Returns the total number of requests you're allowed within the
+     * alloted time period.
+     * @see getRateLimitReset()
+     */
+    public function getRateLimit()
+    {
+        return $this->_rateLimit;
+    }
+
+    /**
+     * The number of requests you have remaining within the alloted time period
+     * @see getRateLimitReset()
+     */
+    public function getRateLimitRemaining()
+    {
+        return $this->_rateLimitRemaining;
+    }
+
+    /**
+     * The number of seconds remaining in the alloted time period.
+     * When this time is up you'll have getRateLimit() available again.
+     */
+    public function getRateLimitReset()
+    {
+        return $this->_rateLimitReset;
+    }
+
+    /**
+     * The scope the user has
+     */
+    public function getScope()
+    {
+        return $this->_scope;
+    }
+
+    /**
+     * Internal function, parses out important information pnut.io adds
+     * to the headers.
+     */
+    protected function parseHeaders(string $response)
+    {
+        // take out the headers
+        // set internal variables
+        // return the body/content
+        $this->_rateLimit = null;
+        $this->_rateLimitRemaining = null;
+        $this->_rateLimitReset = null;
+        $this->_scope = null;
+
+        $response = explode("\r\n\r\n", $response, 2);
+        $headers = $response[0];
+
+        if ($headers === 'HTTP/1.1 100 Continue') {
+            $response = explode("\r\n\r\n", $response[1], 2);
+            $headers = $response[0];
+        }
+
+        // this is not a good way to parse http headers
+        // it will not (for example) take into account multiline headers
+        // but what we're looking for is pretty basic, so we can ignore those shortcomings
+        $headers = explode("\r\n", $headers);
+        foreach ($headers as $header) {
+            $header = explode(': ', $header, 2);
+            if (count($header) < 2) {
+                continue;
+            }
+            list($k, $v) = $header;
+            switch ($k) {
+                case 'X-RateLimit-Remaining':
+                    $this->_rateLimitRemaining = $v;
+                    break;
+                case 'X-RateLimit-Limit':
+                    $this->_rateLimit = $v;
+                    break;
+                case 'X-RateLimit-Reset':
+                    $this->_rateLimitReset = $v;
+                    break;
+                case 'X-OAuth-Scopes':
+                    $this->_scope = $v;
+                    $this->_scopes = explode(',', $v);
+                    break;
+            }
+        }
+        return $response[1] ?? null;
+    }
+
+    /**
+     * Internal function. Used to turn things like TRUE into 1, and then
+     * calls http_build_query.
+     */
+    protected function buildQueryString(array $array): string
+    {
+        foreach ($array as $k => &$v) {
+            if (is_array($v)) {
+                $v = implode(',', $v);
+            } elseif ($v === true) {
+                $v = '1';
+            }
+            elseif ($v === false) {
+                $v = '0';
+            }
+            unset($v);
+        }
+        return http_build_query($array);
+    }
+
+
+    /**
+     * Internal function to handle all
+     * HTTP requests (POST,PUT,GET,DELETE)
+     */
+    protected function httpReq(string $act, string $req, string|array $params=[], string $contentType='application/x-www-form-urlencoded')
+    {
+        $ch = curl_init($req);
+        $headers = [];
+        if($act !== 'get') {
+            curl_setopt($ch, CURLOPT_POST, true);
+            // if they passed an array, build a list of parameters from it
+            if (is_array($params) && $act !== 'post-raw') {
+                $params = $this->buildQueryString($params);
+            }
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
+            $headers[] = "Content-Type: {$contentType}";
+        }
+        if($act !== 'post' && $act !== 'post-raw') {
+            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, strtoupper($act));
+        }
+        if($act === 'get' && isset($params['access_token'])) {
+            $headers[] = "Authorization: Bearer {$params['access_token']}";
+        } elseif ($this->_accessToken) {
+            $headers[] = "Authorization: Bearer {$this->_accessToken}";
+        }
+        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLINFO_HEADER_OUT, true);
+        curl_setopt($ch, CURLOPT_HEADER, true);
+        if ($this->_sslCA) {
+            curl_setopt($ch, CURLOPT_CAINFO, $this->_sslCA);
+        }
+        $this->_last_response = curl_exec($ch);
+        $this->_last_request = curl_getinfo($ch, CURLINFO_HEADER_OUT);
+        $http_status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        curl_close($ch);
+
+        if ($http_status === 0) {
+            throw new phpnutException("Unable to connect to {$req}");
+        }
+        if ($this->_last_request === false) {
+            if (!curl_getinfo($ch, CURLINFO_SSL_VERIFYRESULT)) {
+                throw new phpnutException('SSL verification failed, connection terminated.');
+            }
+        }
+        if ($this->_last_response) {
+            $response = $this->parseHeaders($this->_last_response);
+            if ($response) {
+                $response = json_decode($response, true);
+
+                if (isset($response['meta'])) {
+                    if (isset($response['meta']['max_id'])) {
+                        $this->_maxid = $response['meta']['max_id'];
+                        $this->_minid = $response['meta']['min_id'];
+                    }
+                    if (isset($response['meta']['more'])) {
+                        $this->_more = $response['meta']['more'];
+                    }
+                    if (isset($response['meta']['marker'])) {
+                        $this->_last_marker = $response['meta']['marker'];
+                    }
+                }
+
+                // look for errors
+                if (isset($response['error'])) {
+                    if (is_array($response['error'])) {
+                        throw new phpnutException(
+                            $response['error']['message'],
+                            $response['error']['code']
+                        );
+                    } else {
+                        throw new phpnutException($response['error']);
+                    }
+                } 
+
+                // look for response migration errors
+                elseif (isset($response['meta'], $response['meta']['error_message'])) {
+                    throw new phpnutException(
+                        $response['meta']['error_message'],
+                        $response['meta']['code']
+                    );
+                }
+            }
+        }
+
+        if ($http_status < 200 || $http_status >= 300) {
+            throw new phpnutException("HTTP error {$http_status}");
+        }
+
+        // if we've received a migration response, handle it and return data only
+        elseif ($this->_stripResponseEnvelope && isset($response['meta'], $response['data'])) {
+            return $response['data'];
+        }
+
+        // else non response migration response, just return it
+        elseif (isset($response)) {
+            return $response;
+        }
+
+        else {
+            throw new phpnutException('No response');
+        }
+    }
+
+
+    /**
+     * Get max_id from last meta response data envelope
+     */
+    public function getResponseMaxID()
+    {
+        return $this->_maxid;
+    }
+
+    /**
+     * Get min_id from last meta response data envelope
+     */
+    public function getResponseMinID()
+    {
+        return $this->_minid;
+    }
+
+    /**
+     * Get more from last meta response data envelope
+     */
+    public function getResponseMore()
+    {
+        return $this->_more;
+    }
+
+    /**
+     * Get marker from last meta response data envelope
+     */
+    public function getResponseMarker()
+    {
+        return $this->_last_marker;
+    }
+
+    public function getLastRequest()
+    {
+        return $this->_last_request;
+    }
+    
+    public function getLastResponse()
+    {
+        return $this->_last_response;
+    }
+
+    /**
+     * Fetch API configuration object
+     * @return array
+     */
+    public function getConfig()
+    {
+        return $this->httpReq('get', "{$this->_baseUrl}sys/config");
+    }
+
+    /**
+     * Fetch basic API statistics
+     * @return array
+     */
+    public function getStats()
+    {
+        return $this->httpReq('get', "{$this->_baseUrl}sys/stats");
+    }
+
+    /**
+     * Process user content, message or post text.
+     * Mentions and hashtags will be parsed out of the
+     * text, as will bare URLs. To create a link in the text without using a
+     * bare URL, include the anchor text in the object text and include a link
+     * entity in the function call.
+     * @param string $text The text of the user/message/post
+     * @param array $data An associative array of optional post data. This
+     * will likely change as the API evolves, as of this writing allowed keys are:
+     * reply_to, and raw. "raw" may be a complex object represented
+     * by an associative array.
+     * @param array $params An associative array of optional data to be included
+     * in the URL (such as 'include_raw')
+     * @return array An associative array representing the post.
+     */
+    public function processText(string $text, array $data=[], array $params=[])
+    {
+        $data['text'] = $text;
+        $json = json_encode($data);
+        $qs = '';
+        if (!empty($params)) {
+            $qs = '?' . $this->buildQueryString($params);
+        }
+        return $this->httpReq(
+            'post',
+            $this->_baseUrl . 'text/process' . $qs,
+            $json,
+            'application/json'
+        );
+    }
+
+    /**
+     * Create a new Post object. Mentions and hashtags will be parsed out of the
+     * post text, as will bare URLs. To create a link in a post without using a
+     * bare URL, include the anchor text in the post's text and include a link
+     * entity in the post creation call.
+     * @param string $text The text of the post
+     * @param array $data An associative array of optional post data. This
+     * will likely change as the API evolves, as of this writing allowed keys are:
+     * reply_to, is_nsfw, and raw. "raw" may be a complex object represented
+     * by an associative array.
+     * @param array $params An associative array of optional data to be included
+     * in the URL (such as 'include_raw')
+     * @return array An associative array representing the post.
+     */
+    public function createPost(string $text, array $data=[], array $params=[])
+    {
+        $data['text'] = $text;
+        $json = json_encode($data);
+        $qs = '';
+        if (!empty($params)) {
+            $qs = '?' . $this->buildQueryString($params);
+        }
+        return $this->httpReq(
+            'post',
+            $this->_baseUrl . 'posts' . $qs,
+            $json,
+            'application/json'
+        );
+    }
+
+    /**
+     * Create a new Post object. Mentions and hashtags will be parsed out of the
+     * post text, as will bare URLs. To create a link in a post without using a
+     * bare URL, include the anchor text in the post's text and include a link
+     * entity in the post creation call.
+     * @param integer $post_id The ID of the post to revise
+     * @param string $text The new text of the post
+     * @param array $data An associative array of optional post data. This
+     * will likely change as the API evolves, as of this writing allowed keys are:
+     * is_nsfw.
+     * @param array $params An associative array of optional data to be included
+     * in the URL (such as 'include_raw')
+     * @return array An associative array representing the post.
+     */
+    public function revisePost(int $post_id, string $text, array $data=[], array $params=[])
+    {
+        $data['text'] = $text;
+        $json = json_encode($data);
+        $qs = '';
+        if (!empty($params)) {
+            $qs = '?' . $this->buildQueryString($params);
+        }
+        return $this->httpReq(
+            'put',
+            $this->_baseUrl . 'posts/' . urlencode($post_id) . $qs,
+            $json,
+            'application/json'
+        );
+    }
+
+    /**
+     * Returns a specific Post.
+     * @param integer $post_id The ID of the post to retrieve
+     * @param array $params An associative array of optional general parameters.
+     * @return array An associative array representing the post
+     */
+    public function getPost(int $post_id, array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'posts/' . urlencode($post_id) . '?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * Returns a list of Posts.
+     * @param array $post_ids The list of post IDs to retrieve
+     * @param array $params An associative array of optional general parameters.
+     * @return array An array of arrays representing the posts
+     */
+    public function getMultiplePosts(array $post_ids, array $params=[])
+    {
+        $params['ids'] = $post_ids;
+
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'posts?' . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * Delete a Post. The current user must be the same user who created the Post.
+     * It returns the deleted Post on success.
+     * @param integer $post_id The ID of the post to delete
+     * @param array An associative array representing the post that was deleted
+     */
+    public function deletePost(int $post_id)
+    {
+        return $this->httpReq(
+            'delete',
+            $this->_baseUrl . 'posts/' . urlencode($post_id)
+        );
+    }
+
+    /**
+     * Retrieve the Posts that are 'in reply to' a specific Post.
+     * @param integer $post_id The ID of the post you want to retrieve replies for.
+     * @param array $params An associative array of optional general parameters.
+     * @return An array of associative arrays, each representing a single post.
+     */
+    public function getPostThread(int $post_id, array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'posts/' . urlencode($post_id) . '/thread?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * Retrieve revisions of a post. Currently only one can be created.
+     * @param integer $post_id The ID of the post you want to retrieve previous revisions of.
+     * @param array $params An associative array of optional general parameters.
+     * @return An array of associative arrays, each representing a single post.
+     */
+    public function getPostRevisions(int $post_id, array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'posts/' . urlencode($post_id) . '/revisions?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * Get the most recent Posts created by a specific User in reverse
+     * chronological order (most recent first).
+     * @param mixed $user_id Either the ID of the user you wish to retrieve posts by,
+     * or the string "me", which will retrieve posts for the user you're authenticated
+     * as.
+     * @param array $params An associative array of optional general parameters.
+     * @return An array of associative arrays, each representing a single post.
+     */
+    public function getUserPosts(string|int $user_id='me', array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'users/' . urlencode($user_id) . '/posts?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * Get the most recent Posts mentioning by a specific User in reverse
+     * chronological order (newest first).
+     * @param mixed $user_id Either the ID of the user who is being mentioned, or
+     * the string "me", which will retrieve posts for the user you're authenticated
+     * as.
+     * @param array $params An associative array of optional general parameters.
+     * @return An array of associative arrays, each representing a single post.
+     */
+    public function getUserMentions(string|int $user_id='me', array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'users/' . urlencode($user_id) . '/mentions?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * Get the currently authenticated user's recent messages
+     * @param array $params An associative array of optional general parameters.
+     * @return An array of associative arrays, each representing a single post.
+     */
+    public function getUserMessages(array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'users/me/messages?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * Return the 20 most recent posts from the current User and
+     * the Users they follow.
+     * @param array $params An associative array of optional general parameters.
+     * @return An array of associative arrays, each representing a single post.
+     */
+    public function getUserStream(array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'posts/streams/me?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * Retrieve a list of all public Posts on pnut.io, often referred to as the
+     * global stream.
+     * @param array $params An associative array of optional general parameters.
+     * @return An array of associative arrays, each representing a single post.
+     */
+    public function getPublicPosts(array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'posts/streams/global?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * Retrieve a list of "explore" streams
+     * @return An array of associative arrays, each representing a single explore stream.
+     */
+    public function getPostExploreStreams()
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'posts/streams/explore'
+        );
+    }
+
+    /**
+     * Retrieve a list of posts from an "explore" stream on pnut.io.
+     * @param  string $slug [<description>]
+     * @param array $params An associative array of optional general parameters.
+     * @return An array of associative arrays, each representing a single post.
+     */
+    public function getPostExploreStream(string $slug, array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'posts/streams/explore/' . urlencode($slug) . '?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+    * Bookmark a post
+    * @param integer $post_id The post ID to bookmark
+    */
+    public function bookmarkPost(int $post_id)
+    {
+        return $this->httpReq(
+            'put',
+            $this->_baseUrl . 'posts/' . urlencode($post_id) . '/bookmark'
+        );
+    }
+
+    /**
+    * Unbookmark a post
+    * @param integer $post_id The post ID to unbookmark
+    */
+    public function unbookmarkPost(int $post_id)
+    {
+        return $this->httpReq(
+            'delete',
+            $this->_baseUrl . 'posts/' . urlencode($post_id) . '/bookmark'
+        );
+    }
+
+    /**
+    * List the posts bookmarked by the current user
+    * @param array $params An associative array of optional general parameters.
+    * This will likely change as the API evolves, as of this writing allowed keys
+    * are:    count, before_id, since_id, include_muted, include_deleted,
+    * and include_post_raw.
+    * See https://github.com/phpnut/api-spec/blob/master/resources/posts.md#general-parameters
+    * @return array An array of associative arrays, each representing a single
+    * user who has bookmarked a post
+    */
+    public function getBookmarked(string|int $user_id='me', array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'users/' . urlencode($user_id) . '/bookmarks?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+    * List the interactions with a post (bookmark, repost, reply)
+    * @param integer $post_id the post ID to get interactions from
+    * @param array $params optional parameters like filters or excludes
+    * @return array An array of associative arrays, each representing one post interaction.
+    */
+    public function getPostInteractions(int $post_id, array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'posts/' . urlencode($post_id) . '/interactions?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+    * List the bookmarks of a post
+    * @param integer $post_id the post ID to get stars from
+    * @return array An array of associative arrays, each representing one bookmark action.
+    */
+    public function getPostBookmarks(int $post_id)
+    {
+        return $this->getPostInteractions($post_id, ['filters'=>['bookmark']]);
+    }
+
+    /**
+     * Returns an array of User objects of users who reposted the specified post.
+     * @param integer $post_id the post ID to
+     * @return array An array of associative arrays, each representing a single
+     * user who reposted $post_id
+     */
+    public function getPostReposts(int $post_id)
+    {
+        return $this->getPostInteractions($post_id, ['filters'=>['repost']]);
+    }
+
+    /**
+     * Repost an existing Post object.
+     * @param integer $post_id The id of the post
+     * @return the reposted post
+     */
+    public function repost(int $post_id)
+    {
+        return $this->httpReq(
+            'put',
+            $this->_baseUrl . 'posts/' . urlencode($post_id) . '/repost'
+        );
+    }
+
+    /**
+     * Delete a post that the user has reposted.
+     * @param integer $post_id The id of the post
+     * @return the un-reposted post
+     */
+    public function deleteRepost(int $post_id)
+    {
+        return $this->httpReq(
+            'delete',
+            $this->_baseUrl . 'posts/' . urlencode($post_id) . '/repost'
+        );
+    }
+
+    /**
+     * Return Posts matching a specific #hashtag.
+     * @param string $hashtag The hashtag you're looking for.
+     * @param array $params An associative array of optional general parameters.
+     * This will likely change as the API evolves, as of this writing allowed keys
+     * are: count, before_id, since_id, include_muted, include_deleted,
+     * include_directed_posts, and include_raw.
+     * @return An array of associative arrays, each representing a single post.
+     */
+    public function searchHashtags(string $hashtag, array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'posts/tags/' . urlencode($hashtag) . '?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * List the posts who match a specific search term
+     * @param array $params a list of filter, search query, and general Post parameters
+     * see: https://docs.pnut.io/resources/posts/search
+     * @param string $query The search query. Supports
+     * normal search terms. Searches post text.
+     * @return array An array of associative arrays, each representing one post.
+     * or false on error
+     */
+    public function searchPosts(array $params=[], string $query='', string $order='default')
+    {
+        if (!is_array($params)) {
+            return false;
+        }
+        if (!empty($query)) {
+            $params['q'] = $query;
+        }
+        if ($order === 'default') {
+            if (!empty($query)) {
+                $params['order'] = 'relevance';
+            } else {
+                $params['order'] = 'id';
+            }
+        }
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'posts/search?' . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * Return the 20 most recent posts for a stream using a valid Token
+     * @param array $params An associative array of optional general parameters.
+     * This will likely change as the API evolves, as of this writing allowed keys
+     * are: count, before_id, since_id, include_muted, include_deleted,
+     * and include_post_raw.
+     * @return An array of associative arrays, each representing a single post.
+     */
+    public function getUserPersonalStream(array $params=[])
+    {
+        if ($params['access_token']) {
+            return $this->httpReq(
+                'get',
+                $this->_baseUrl . 'posts/streams/me?'
+                    . $this->buildQueryString($params),
+                $params
+            );
+        } else {
+            return $this->httpReq(
+                'get',
+                $this->_baseUrl . 'posts/streams/me?'
+                    . $this->buildQueryString($params)
+            );
+        }
+    }
+    
+    /**
+    * Return the 20 most recent Posts from the current User's personalized stream
+    * and mentions stream merged into one stream.
+    * @param array $params An associative array of optional general parameters.
+    * This will likely change as the API evolves, as of this writing allowed keys
+    * are: count, before_id, since_id, include_muted, include_deleted,
+    * include_directed_posts, and include_raw.
+    * @return An array of associative arrays, each representing a single post.
+    */
+    public function getUserUnifiedStream(array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'posts/streams/unified?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * List User interactions
+     */
+    public function getMyActions(array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'users/me/interactions?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * Returns a specific user object.
+     * @param mixed $user_id The ID of the user you want to retrieve, or the string "@-username", or the string
+     * "me" to retrieve data for the users you're currently authenticated as.
+     * @param array $params An associative array of optional general parameters.
+     * This will likely change as the API evolves, as of this writing allowed keys
+     * are: include_raw|include_user_raw.
+     * @return array An associative array representing the user data.
+     */
+    public function getUser(string|int $user_id='me', array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'users/' . urlencode($user_id) . '?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * Returns multiple users request by an array of user ids
+     * @param array $params An associative array of optional general parameters.
+     * This will likely change as the API evolves, as of this writing allowed keys
+     * are: include_raw|include_user_raw.
+     * @return array An associative array representing the users data.
+     */
+    public function getUsers(array $user_arr, array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'users?ids=' . implode(',', $user_arr)
+                    . '&' . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * Add the specified user ID to the list of users followed.
+     * Returns the User object of the user being followed.
+     * @param integer $user_id The user ID of the user to follow.
+     * @return array An associative array representing the user you just followed.
+     */
+    public function followUser(string|int $user_id)
+    {
+        return $this->httpReq(
+            'put',
+            $this->_baseUrl . 'users/' . urlencode($user_id) . '/follow'
+        );
+    }
+
+    /**
+     * Removes the specified user ID to the list of users followed.
+     * Returns the User object of the user being unfollowed.
+     * @param integer $user_id The user ID of the user to unfollow.
+     * @return array An associative array representing the user you just unfollowed.
+     */
+    public function unfollowUser(string|int $user_id)
+    {
+        return $this->httpReq(
+            'delete',
+            $this->_baseUrl . 'users/' . urlencode($user_id) . '/follow'
+        );
+    }
+
+    /**
+     * Returns an array of User objects the specified user is following.
+     * @param mixed $user_id Either the ID of the user being followed, or
+     * the string "me", which will retrieve posts for the user you're authenticated
+     * as.
+     * @return array An array of associative arrays, each representing a single
+     * user following $user_id
+     */
+    public function getFollowing(string|int $user_id='me', array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'users/' . urlencode($user_id) . '/following?'
+                . $this->buildQueryString($params)
+        );
+    }
+    
+    /**
+     * Returns an array of User ids the specified user is following.
+     * @param mixed $user_id Either the ID of the user being followed, or
+     * the string "me", which will retrieve posts for the user you're authenticated
+     * as.
+     * @return array user ids the specified user is following.
+     */
+    public function getFollowingIDs(string|int $user_id='me')
+    {
+        return $this->httpReq(
+            'get',
+            "{$this->_baseUrl}users/{$user_id}/following?include_user=0"
+        );
+    }
+    
+    /**
+     * Returns an array of User objects for users following the specified user.
+     * @param mixed $user_id Either the ID of the user being followed, or
+     * the string "me", which will retrieve posts for the user you're authenticated
+     * as.
+     * @return array An array of associative arrays, each representing a single
+     * user following $user_id
+     */
+    public function getFollowers(string|int $user_id='me', array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'users/' . urlencode($user_id) . '/followers?'
+                . $this->buildQueryString($params)
+        );
+    }
+    
+    /**
+     * Returns an array of User ids for users following the specified user.
+     * @param mixed $user_id Either the ID of the user being followed, or
+     * the string "me", which will retrieve posts for the user you're authenticated
+     * as.
+     * @return array user ids for users following the specified user
+     */
+    public function getFollowersIDs(string|int $user_id='me')
+    {
+        return $this->httpReq(
+            'get',
+            "{$this->_baseUrl}users/{$user_id}/followers?include_user=0"
+        );
+    }
+
+    /**
+     * Retrieve a user's user ID by specifying their username.
+     * @param string $username The username of the user you want the ID of, without
+     * an @ symbol at the beginning.
+     * @return integer The user's user ID
+     */
+    public function getIdByUsername(string $username)
+    {
+        return $this->httpReq(
+            'get',
+            "{$this->_baseUrl}users/@{$username}?include_user=0"
+        );
+    }
+
+    /**
+     * Mute a user
+     * @param integer $user_id The user ID to mute
+     */
+    public function muteUser(string|int $user_id)
+    {
+         return $this->httpReq(
+            'put',
+            $this->_baseUrl . 'users/' . urlencode($user_id) . '/mute'
+        );
+    }
+
+    /**
+     * Unmute a user
+     * @param integer $user_id The user ID to unmute
+     */
+    public function unmuteUser(string|int $user_id)
+    {
+        return $this->httpReq(
+            'delete',
+            $this->_baseUrl . 'users/' . urlencode($user_id) . '/mute'
+        );
+    }
+
+    /**
+     * List the users muted by the current user
+     * @return array An array of associative arrays, each representing one muted user.
+     */
+    public function getMuted()
+    {
+        return $this->httpReq(
+            'get',
+            "{$this->_baseUrl}users/me/muted"
+        );
+    }
+
+    /**
+     * Get a user object by username
+     * @param string $name the @name to get
+     * @return array representing one user
+     */
+    public function getUserByName(string $name)
+    {
+        return $this->httpReq(
+            'get',
+            "{$this->_baseUrl}users/@{$name}"
+        );
+    }
+
+    /**
+     * List the users who match a specific search term
+     * @param string $search The search query. Supports @username or #tag searches as
+     * well as normal search terms. Searches username, display name, bio information.
+     * Does not search posts.
+     * @return array An array of associative arrays, each representing one user.
+     */
+    public function searchUsers(array $params=[], string $query='')
+    {
+        if (!is_array($params)) {
+            return false;
+        }
+        if ($query === '') {
+            return false;
+        }
+        $params['q'] = $query;
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'users/search?q=' . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * Update Profile Data via JSON
+     * @data array containing user descriptors
+     */
+    public function updateUserData(array $data=[], array $params=[])
+    {
+        $json = json_encode($data);
+        return $this->httpReq(
+            'put',
+            $this->_baseUrl . 'users/me?'
+                . $this->buildQueryString($params),
+            $json,
+            'application/json'
+        );
+    }
+
+    /**
+     * Update a user image
+     * @image path reference to image
+     * @which avatar|cover
+     */
+    protected function updateUserImage(string $image, string $which='avatar')
+    {
+        $test = @getimagesize($image);
+        if ($test && array_key_exists('mime', $test)) {
+            $mimeType = $test['mime'];
+        }
+        $data = [
+            $which => new CurlFile($image, $mimeType)
+        ];
+        return $this->httpReq(
+            'post-raw',
+            "{$this->_baseUrl}users/me/{$which}",
+            $data,
+            'multipart/form-data'
+        );
+    }
+
+    public function updateUserAvatar($avatar)
+    {
+        return $this->updateUserImage('avatar', $avatar);
+    }
+
+    public function updateUserCover($cover)
+    {
+        return $this->updateUserImage('cover', $cover);
+    }
+
+    /**
+     * Returns a Client object
+     * @param string $client_id
+     * @return array An array representing the client
+     */
+    public function getClient(string $client_id, array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'clients/' . urlencode($client_id) . '?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * Returns a list of truncated client details made by a user
+     * @param string $user_id
+     * @return array A list of arrays representing clients
+     */
+    public function getUserClients(string $user_id)
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'users/' . urlencode($user_id) . '/clients'
+        );
+    }
+
+    /**
+     * update stream marker
+     */
+    public function updateStreamMarker(array $data=[])
+    {
+        $json = json_encode($data);
+        return $this->httpReq(
+            'post',
+            "{$this->_baseUrl}markers",
+            $json,
+            'application/json'
+        );
+    }
+
+    /**
+     * get a page of current user subscribed channels
+     */
+    public function getMyChannelSubscriptions(array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'users/me/channels/subscribed?' . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * get user channels
+     */
+    public function getMyChannels(array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'users/me/channels?' . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * create a channel
+     * note: you cannot create a channel with type=io.pnut.core.pm (see createMessage)
+     */
+    public function createChannel(array $data=[])
+    {
+        $json = json_encode($data);
+        return $this->httpReq(
+            'post',
+            "{$this->_baseUrl}channels",
+            $json,
+            'application/json'
+        );
+    }
+
+    /**
+     * get channelid info
+     */
+    public function getChannel(int $channelid, array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'channels/' . $channelid . '?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * get an existing private message channel between multiple users
+     * @param mixed $users Can be a comma- or space-separated string, or an array.
+     * Usernames with @-symbol, or user ids.
+     */
+    public function getExistingPM(string|array $users, array $params=[])
+    {
+        if (is_string($users)) {
+            $users = explode(',', str_replace(' ', ',', $users));
+        }
+        foreach($users as $key=>$user) {
+            if (!is_numeric($user) && substr($user, 0, 1) !== '@') {
+                $users[$key] = "@{$user}";
+            }
+        }
+        $params['ids'] = $users;
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'users/me/channels/existing_pm?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * get multiple channels' info by an array of channelids
+     */
+    public function getChannels(array $channels, array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'channels?ids=' . implode(',', $channels) . '&'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * update channelid
+     */
+    public function updateChannel(int $channelid, array $data=[])
+    {
+        $json = json_encode($data);
+        return $this->httpReq(
+            'put',
+            "{$this->_baseUrl}channels/{$channelid}",
+            $json,
+            'application/json'
+        );
+    }
+
+    /**
+     * subscribe from channelid
+     */
+    public function channelSubscribe(int $channelid)
+    {
+        return $this->httpReq(
+            'put',
+            $this->_baseUrl.'channels/'.$channelid.'/subscribe'
+        );
+    }
+
+    /**
+     * unsubscribe from channelid
+     */
+    public function channelUnsubscribe(int $channelid)
+    {
+        return $this->httpReq(
+            'delete',
+            $this->_baseUrl.'channels/'.$channelid.'/subscribe'
+        );
+    }
+
+    /**
+     * mute channelid
+     */
+    public function channelMute(int $channelid)
+    {
+        return $this->httpReq(
+            'put',
+            $this->_baseUrl.'channels/'.$channelid.'/mute'
+        );
+    }
+
+    /**
+     * unmute channelid
+     */
+    public function channelUnmute(int $channelid)
+    {
+        return $this->httpReq(
+            'delete',
+            $this->_baseUrl.'channels/'.$channelid.'/mute'
+        );
+    }
+
+    /**
+     * get all user objects subscribed to channelid
+     */
+    public function getChannelSubscriptions(int $channelid, array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl.'channels/'.$channelid.'/subscribers?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * get all user IDs subscribed to channelid
+     */
+    public function getChannelSubscriptionsById(int $channelid)
+    {
+        return $this->httpReq(
+            'get',
+            "{$this->_baseUrl}channels/{$channelid}/subscribers?include_user=0"
+        );
+    }
+
+    /**
+     * Retrieve a list of "explore" streams
+     * @return An array of associative arrays, each representing a single explore stream.
+     */
+    public function getChannelExploreStreams()
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'channels/streams/explore'
+        );
+    }
+
+    /**
+     * Retrieve a list of channels from an "explore" stream on pnut.io.
+     * @param  string $slug [<description>]
+     * @param array $params An associative array of optional general parameters.
+     * @return An array of associative arrays, each representing a single channel.
+     */
+    public function getChannelExploreStream(string $slug, array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'channels/streams/explore/' . urlencode($slug) . '?'
+                . $this->buildQueryString($params)
+        );
+    }
+    
+    /**
+     * mark channel inactive
+     */
+    public function deleteChannel(int $channelid)
+    {
+        return $this->httpReq(
+            'delete',
+            $this->_baseUrl.'channels/'.$channelid
+        );
+    }
+
+    /**
+     * List the channels that match a specific search term
+     * @param array $params a list of filter, search query, and general Channel parameters
+     * see: https://docs.pnut.io/resources/channels/search
+     * @param string $query The search query. Supports
+     * normal search terms. Searches common channel raw.
+     * @return array An array of associative arrays, each representing one channel.
+     * or false on error
+     */
+    public function searchChannels(array $params=[], string $query='', string $order='default')
+    {
+        if (!empty($query)) {
+            $params['q'] = $query;
+        }
+        if ($order === 'default') {
+            if (!empty($query)) {
+                $params['order'] = 'id';
+            } else {
+                $params['order'] = 'activity';
+            }
+        }
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'channels/search?' . $this->buildQueryString($params)
+        );
+    }
+
+
+    /**
+     * get a page of messages in channelid
+     */
+    public function getMessages(int $channelid, array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl.'channels/'.$channelid.'/messages?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * get a page of messages in channelid in a thread
+     */
+    public function getMessageThread(int $channelid, int $messageid, array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl.'channels/'.$channelid.'/messages/'.$messageid.'/thread?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * get a page of sticky messages in channelid
+     */
+    public function getStickyMessages(int $channelid, array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl.'channels/'.$channelid.'/sticky_messages?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * sticky messsage
+     */
+    public function stickyMessage(int $channelid, int $messageid)
+    {
+        return $this->httpReq(
+            'put',
+            $this->_baseUrl.'channels/'.$channelid.'/messages/'.$messageid.'/sticky'
+        );
+    }
+
+    /**
+     * unsticky messsage
+     */
+    public function unstickyMessage(int $channelid, int $messageid)
+    {
+        return $this->httpReq(
+            'delete',
+            $this->_baseUrl.'channels/'.$channelid.'/messages/'.$messageid.'/sticky'
+        );
+    }
+
+    /**
+     * create message
+     * @param $channelid numeric or "pm" for auto-channel (type=io.pnut.core.pm)
+     * @param array $data array('text'=>'YOUR_MESSAGE') If a type=io.pnut.core.pm, then "destinations" key can be set to address as an array of people to send this PM too
+     * @param array $params query parameters
+     */
+    public function createMessage(string|int $channelid, array $data, array $params=[])
+    {
+        if (isset($data['destinations'])) {
+            if (is_string($data['destinations'])) {
+                $data['destinations'] = explode(',', str_replace(' ', ',', $data['destinations']));
+            }
+            foreach($data['destinations'] as $key=>$user) {
+                if (!is_numeric($user) && substr($user, 0,1 ) !== '@') {
+                    $data['destinations'][$key] = "@{$user}";
+                }
+            }
+        }
+        $json = json_encode($data);
+        return $this->httpReq(
+            'post',
+            $this->_baseUrl.'channels/'.$channelid.'/messages?'
+                . $this->buildQueryString($params),
+            $json,
+            'application/json'
+        );
+    }
+
+    /**
+     * get message
+     */
+    public function getMessage(int $channelid, int $messageid, array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl.'channels/'.$channelid.'/messages/'.$messageid.'?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * Returns a list of Messages.
+     * @param array $message_ids The list of message IDs to retrieve
+     * @param array $params An associative array of optional general parameters.
+     * @return array An array of arrays representing the messages
+     */
+    public function getMultipleMessages(array $message_ids, array $params=[])
+    {
+        $params['ids'] = $message_ids;
+
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'channels/messages?' . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * delete messsage
+     */
+    public function deleteMessage(int $channelid, int $messageid)
+    {
+        return $this->httpReq(
+            'delete',
+            $this->_baseUrl.'channels/'.$channelid.'/messages/'.$messageid
+        );
+    }
+
+    /**
+     * List the messages that match a specific search term
+     * @param array $params a list of filter, search query, and general Message parameters
+     * see: https://docs.pnut.io/resources/messages/search
+     * @param string $query The search query. Supports
+     * normal search terms. Searches common channel raw.
+     * @return array An array of associative arrays, each representing one channel.
+     * or false on error
+     */
+    public function searchMessages(array $params=[], string $query='', string $order='default')
+    {
+        if (!is_array($params)) {
+            return false;
+        }
+        if (!empty($query)) {
+            $params['q'] = $query;
+        }
+        if ($order === 'default') {
+            if (!empty($query)) {
+                $params['order'] = 'id';
+            } else {
+                $params['order'] = 'relevance';
+            }
+        }
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'channels/messages/search?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * Upload a file to a user's file store
+     * @param string $file A string containing the path of the file to upload.
+     * @param array $data Additional data about the file you're uploading. At the
+     * moment accepted keys are: mime-type, kind, type, name, public and raw.
+     * - If you don't specify mime-type, phpnut will attempt to guess the mime type
+     * based on the file, however this isn't always reliable.
+     * - If you don't specify kind phpnut will attempt to determine if the file is
+     * an image or not.
+     * - If you don't specify name, phpnut will use the filename of the first
+     * parameter.
+     * - If you don't specify is_public, your file will be uploaded as a private file.
+     * - Type is REQUIRED.
+     * @param array $params An associative array of optional general parameters.
+     * This will likely change as the API evolves, as of this writing allowed keys
+     * are: include_raw|include_file_raw.
+     * @return array An associative array representing the file
+     */
+    public function createFile($file, array $data, array $params=[])
+    {
+        if (!$file) {
+            throw new PhpnutException('You must specify a path to a file');
+        }
+        if (!file_exists($file)) {
+            throw new PhpnutException('File path specified does not exist');
+        }
+        if (!is_readable($file)) {
+            throw new PhpnutException('File path specified is not readable');
+        }
+        if (!array_key_exists('type', $data) || !$data['type']) {
+            throw new PhpnutException('Type is required when creating a file');
+        }
+        if (!array_key_exists('name', $data)) {
+            $data['name'] = basename($file);
+        }
+        if (array_key_exists('mime-type', $data)) {
+            $mimeType = $data['mime-type'];
+            unset($data['mime-type']);
+        } else {
+            $mimeType = null;
+        }
+        if (!array_key_exists('kind', $data)) {
+            $test = @getimagesize($path);
+            if ($test && array_key_exists('mime', $test)) {
+                $data['kind'] = 'image';
+                if (!$mimeType) {
+                    $mimeType = $test['mime'];
+                }
+            }
+            else {
+                $data['kind'] = 'other';
+            }
+        }
+        if (!$mimeType) {
+            $finfo = finfo_open(FILEINFO_MIME_TYPE);
+            $mimeType = finfo_file($finfo, $file);
+            finfo_close($finfo);
+        }
+        if (!$mimeType) {
+            throw new PhpnutException('Unable to determine mime type of file, try specifying it explicitly');
+        }
+        $data['content'] = new \CurlFile($file, $mimeType);
+        return $this->httpReq(
+            'post-raw',
+            "{$this->_baseUrl}files",
+            $data,
+            'multipart/form-data'
+        );
+    }
+
+    public function createFilePlaceholder($file, array $params=[])
+    {
+        $name = basename($file);
+        $data = [
+            'raw' => $params['raw'],
+            'kind' => $params['kind'],
+            'name' => $name,
+            'type' => $params['metadata']
+        ];
+        $json = json_encode($data);
+        return $this->httpReq(
+            'post',
+            $this->_baseUrl.'files',
+            $json,
+            'application/json'
+        );
+    }
+
+    public function updateFileContent(int $fileid, string $file)
+    {
+        $data = file_get_contents($file);
+        $finfo = finfo_open(FILEINFO_MIME_TYPE);
+        $mime = finfo_file($finfo, $file);
+        finfo_close($finfo);
+        return $this->httpReq(
+            'put',
+            $this->_baseUrl.'files/'.$fileid.'/content',
+            $data,
+            $mime
+        );
+    }
+
+    /**
+     * Allows for file rename and annotation changes.
+     * @param integer $file_id The ID of the file to update
+     * @param array $params An associative array of file parameters.
+     * @return array An associative array representing the updated file
+    */
+    public function updateFile(int $file_id, array $params=[])
+    {
+        $data = [
+            'raw' => $params['raw'],
+            'name' => $params['name'],
+        ];
+        $json = json_encode($data);
+        return $this->httpReq(
+            'put',
+            $this->_baseUrl.'files/'.urlencode($file_id),
+            $json,
+            'application/json'
+        );
+    }
+
+    /**
+     * Returns a specific File.
+     * @param integer $file_id The ID of the file to retrieve
+     * @param array $params An associative array of optional general parameters.
+     * This will likely change as the API evolves, as of this writing allowed keys
+     * are: include_raw|include_file_raw.
+     * @return array An associative array representing the file
+     */
+    public function getFile(int $file_id, array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl.'files/'.urlencode($file_id).'?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    public function getFileContent(int $file_id, array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl.'files/'.urlencode($file_id).'/content?'
+                . $this->buildQueryString($params)
+        );
+    }
+
+    /** $file_key : derived_file_key */
+    public function getDerivedFileContent(int $file_id, string $file_key, array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl.'files/'.urlencode($file_id).'/content/'.urlencode($file_key).'?'.$this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * Returns file objects.
+     * @param array $file_ids The IDs of the files to retrieve
+     * @param array $params An associative array of optional general parameters.
+     * This will likely change as the API evolves, as of this writing allowed keys
+     * are: include_raw|include_file_raw.
+     * @return array An associative array representing the file data.
+     */
+    public function getFiles(array $file_ids, array $params=[])
+    {
+        $ids = '';
+        foreach($file_ids as $id) {
+            $ids .= $id . ',';
+        }
+        $params['ids'] = substr($ids, 0, -1);
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl.'files?'.$this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * Returns a user's file objects.
+     * @param array $params An associative array of optional general parameters.
+     * This will likely change as the API evolves, as of this writing allowed keys
+     * are: include_raw|include_file_raw|include_user_raw.
+     * @return array An associative array representing the file data.
+     */
+    public function getUserFiles(array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl.'users/me/files?'.$this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * Delete a File. The current user must be the same user who created the File.
+     * It returns the deleted File on success.
+     * @param integer $file_id The ID of the file to delete
+     * @return array An associative array representing the file that was deleted
+     */
+    public function deleteFile(int $file_id)
+    {
+        return $this->httpReq(
+            'delete',
+            $this->_baseUrl.'files/'.urlencode($file_id)
+        );
+    }
+
+    /**
+     * Create a poll
+     * @param array $data An associative array of the required parameters.
+     * @param array $params An associative array of optional general parameters.
+     * Allowed keys: include_raw,include_poll_raw, ...
+     * @return array An associative array representing the poll
+     */
+    public function createPoll(array $data, array $params=[])
+    {
+        $json = json_encode($data);
+        return $this->httpReq(
+            'post',
+            $this->_baseUrl.'polls?'.$this->buildQueryString($params), 
+            $json,
+            'application/json'
+        );
+    }
+
+    /**
+     * Responds to a poll.
+     * @param integer $poll_id The ID of the poll to respond to
+     * @param array list of positions for the poll response
+     * @param array $params An associative array of optional general parameters.
+     */
+    public function respondToPoll(int $poll_id, array $positions, array $params=[])
+    {
+        $json = json_encode(['positions' => $positions]);
+        return $this->httpReq(
+            'put',
+            $this->_baseUrl.'polls/'.urlencode($poll_id).'/response?'.$this->buildQueryString($params),
+            $json, 
+            'application/json'
+        );
+    }
+
+    /**
+     * Returns a specific Poll.
+     * @param integer $poll_id The ID of the poll to retrieve
+     * @param array $params An associative array of optional general parameters.
+     * @return array An associative array representing the poll
+     */
+    public function getPoll(int $poll_id, array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl.'polls/'.urlencode($poll_id).'?'.$this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * Returns a list of Polls.
+     * @param array $poll_ids The list of poll IDs to retrieve
+     * @param array $params An associative array of optional general parameters.
+     * @return array An array of arrays representing the polls
+     */
+    public function getMultiplePolls(array $poll_ids, array $params=[])
+    {
+        $params['ids'] = $poll_ids;
+
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'polls?' . $this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * Returns a user's poll objects.
+     * @param array $params An associative array of optional general parameters.
+     * @return array An associative array representing the poll data.
+     */
+    public function getUserPolls(array $params=[])
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl.'users/me/polls?'.$this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * Delete a Poll. The current user must be the same user who created the Poll.
+     * @param integer $poll_id The ID of the poll to delete
+     * @param array $params An associative array of optional general parameters.
+     * @return array An associative array representing the poll that was deleted
+     */
+    public function deletePoll(int $poll_id, array $params=[])
+    {
+        return $this->httpReq(
+            'delete',
+            $this->_baseUrl.'polls/'.urlencode($poll_id).'?'.$this->buildQueryString($params)
+        );
+    }
+
+    /**
+     * List the polls that match a specific search term
+     * @param array $params a list of filter, search query, and general Poll parameters
+     * see: https://docs.pnut.io/resources/channels/search
+     * @param string $query The search query. Supports
+     * normal search terms.
+     * @return array An array of associative arrays, each representing one poll.
+     * or false on error
+     */
+    public function searchPolls(array $params=[], string $order='id')
+    {
+        $params['order'] = $order;
+
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl . 'polls/search?' . $this->buildQueryString($params)
+        );
+    }
+
+
+    /**
+     * Get Application Information
+     */
+    public function getAppTokenInfo()
+    {
+        // requires appAccessToken
+        if (!$this->_appAccessToken) {
+            $this->getAppAccessToken();
+        }
+        // ensure request is made with our appAccessToken
+        $params['access_token'] = $this->_appAccessToken;
+        return $this->httpReq(
+            'get',
+            "{$this->_baseUrl}token",
+            $params
+        );
+    }
+    
+    /**
+     * Get User Information
+     */
+    public function getUserTokenInfo()
+    {
+        return $this->httpReq(
+            'get',
+            "{$this->_baseUrl}token"
+        );
+    }
+    
+    /**
+     * Get Application Authorized User IDs
+     */
+    public function getAppUserIDs()
+    {
+        // requires appAccessToken
+        if (!$this->_appAccessToken) {
+            $this->getAppAccessToken();
+        }
+        // ensure request is made with our appAccessToken
+        $params['access_token'] = $this->_appAccessToken;
+        return $this->httpReq(
+            'get',
+            "{$this->_baseUrl}apps/me/users/ids",
+            $params
+        );
+    }
+    
+    /**
+     * Get Application Authorized User Tokens
+     */
+    public function getAppUserTokens()
+    {
+        // requires appAccessToken
+        if (!$this->_appAccessToken) {
+            $this->getAppAccessToken();
+        }
+        // ensure request is made with our appAccessToken
+        $params['access_token'] = $this->_appAccessToken;
+        return $this->httpReq(
+            'get',
+            "{$this->_baseUrl}apps/me/users/tokens",
+            $params
+        );
+    }
+
+
+
+    /**
+     * Registers your function (or an array of object and method) to be called
+     * whenever an event is received via an open pnut.io stream. Your function
+     * will receive a single parameter, which is the object wrapper containing
+     * the meta and data.
+     * @param mixed A PHP callback (either a string containing the function name,
+     * or an array where the first element is the class/object and the second
+     * is the method).
+     */
+    public function registerStreamFunction($function): void
+    {
+        $this->_streamCallback = $function;
+    }
+    
+    /**
+     * Opens a stream that's been created for this user/app and starts sending
+     * events/objects to your defined callback functions. You must define at
+     * least one callback function before opening a stream.
+     * @param mixed $stream Either a stream ID or the endpoint of a stream
+     * you've already created. This stream must exist and must be valid for
+     * your current access token. If you pass a stream ID, the library will
+     * make an API call to get the endpoint.
+     *
+     * This function will return immediately, but your callback functions
+     * will continue to receive events until you call closeStream() or until
+     * pnut.io terminates the stream from their end with an error.
+     *
+     * If you're disconnected due to a network error, the library will
+     * automatically attempt to reconnect you to the same stream, no action
+     * on your part is necessary for this. However if the pnut.io API returns
+     * an error, a reconnection attempt will not be made.
+     *
+     * Note there is no closeStream, because once you open a stream you
+     * can't stop it (unless you exit() or die() or throw an uncaught
+     * exception, or something else that terminates the script).
+     * @return boolean True
+     * @see createStream()
+     */
+    public function openStream($stream): bool
+    {
+        // if there's already a stream running, don't allow another
+        if ($this->_currentStream) {
+            throw new phpnutException('There is already a stream being consumed, only one stream can be consumed per phpnutStream instance');
+        }
+        // must register a callback (or the exercise is pointless)
+        if (!$this->_streamCallback) {
+            throw new phpnutException('You must define your callback function using registerStreamFunction() before calling openStream');
+        }
+        // if the stream is a numeric value, get the stream info from the api
+        if (is_numeric($stream)) {
+            $stream = $this->getStream($stream);
+            $this->_streamUrl = $stream['endpoint'];
+        }
+        else {
+            $this->_streamUrl = $stream;
+        }
+        // continue doing this until we get an error back or something...?
+        $this->httpStream(
+            'get',
+            $this->_streamUrl
+        );
+        return true;
+    }
+    
+    /**
+     * Close the currently open stream.
+     * @return true;
+     */
+    public function closeStream(): void
+    {
+        if (!$this->_lastStreamActivity) {
+            // never opened
+            return;
+        }
+        if (!$this->_multiStream) {
+            throw new phpnutException('You must open a stream before calling closeStream()');
+        }
+        curl_close($this->_currentStream);
+        curl_multi_remove_handle($this->_multiStream, $this->_currentStream);
+        curl_multi_close($this->_multiStream);
+        $this->_currentStream = null;
+        $this->_multiStream = null;
+    }
+    
+    /**
+     * Retrieve all streams for the current access token.
+     * @return array An array of stream definitions.
+     */
+    public function getAllStreams()
+    {
+        return $this->httpReq(
+            'get',
+            "{$this->_baseUrl}streams"
+        );
+    }
+    
+    /**
+     * Returns a single stream specified by a stream ID. The stream must have been
+     * created with the current access token.
+     * @return array A stream definition
+     */
+    public function getStream(string $streamId)
+    {
+        return $this->httpReq(
+            'get',
+            $this->_baseUrl.'streams/'.urlencode($streamId)
+        );
+    }
+    
+    /**
+     * Creates a stream for the current app access token.
+     *
+     * @param array $objectTypes The objects you want to retrieve data for from the
+     * stream. At time of writing these can be 'post', 'bookmark', 'user_follow', 'mute', 'block', 'stream_marker', 'message', 'channel', 'channel_subscription', 'token', and/or 'user'.
+     * If you don't specify, a few standard events will be retrieved.
+     */
+    public function createStream(?array $objectTypes=null)
+    {
+        // default object types to everything
+        if (is_null($objectTypes)) {
+            $objectTypes = [
+                'post',
+                'bookmark',
+                'user_follow',
+            ];
+        }
+        $data = [
+            'object_types'=>$objectTypes,
+            'type'=>'long_poll',
+        ];
+        $data = json_encode($data);
+        $response = $this->httpReq(
+            'post',
+            "{$this->_baseUrl}streams",
+            $data,
+            'application/json'
+        );
+        return $response;
+    }
+    
+    /**
+     * Update stream for the current app access token
+     *
+     * @param string $streamId The stream ID to update. This stream must have been
+     * created by the current access token.
+     * @param array $data allows object_types, type, filter_id and key to be updated. filter_id/key can be omitted
+     */
+    public function updateStream(string $streamId, array $data)
+    {
+        // objectTypes is likely required
+        if (is_null($data['object_types'])) {
+            $data['object_types'] = [
+                'post',
+                'bookmark',
+                'user_follow',
+            ];
+        }
+        // type can still only be long_poll
+        if (is_null($data['type'])) {
+            $data['type'] = 'long_poll';
+        }
+        $data = json_encode($data);
+        $response = $this->httpReq(
+            'put',
+            $this->_baseUrl.'streams/'.urlencode($streamId),
+            $data,
+            'application/json'
+        );
+        return $response;
+    }
+     
+    /**
+     * Deletes a stream if you no longer need it.
+     *
+     * @param string $streamId The stream ID to delete. This stream must have been
+     * created by the current access token.
+     */
+    public function deleteStream(string $streamId)
+    {
+        return $this->httpReq(
+            'delete',
+            $this->_baseUrl.'streams/'.urlencode($streamId)
+        );
+    }
+    
+    /**
+     * Deletes all streams created by the current access token.
+     */
+    public function deleteAllStreams()
+    {
+        return $this->httpReq(
+            'delete',
+            "{$this->_baseUrl}streams"
+        );
+    }
+    
+    /**
+     * Internal function used to process incoming chunks from the stream. This is only
+     * public because it needs to be accessed by CURL. Do not call or use this function
+     * in your own code.
+     * @ignore
+     */
+    public function httpStreamReceive($ch, $data)
+    {
+        $this->_lastStreamActivity = time();
+        $this->_streamBuffer .= $data;
+        if (!$this->_streamHeaders) {
+            $pos = strpos($this->_streamBuffer, "\r\n\r\n");
+            if ($pos !== false) {
+                $this->_streamHeaders = substr($this->_streamBuffer, 0, $pos);
+                $this->_streamBuffer = substr($this->_streamBuffer, $pos+4);
+            }
+        } else {
+            $pos = strpos($this->_streamBuffer, "\r\n");
+            while ($pos !== false) {
+                $command = substr($this->_streamBuffer, 0, $pos);
+                $this->_streamBuffer = substr($this->_streamBuffer, $pos+2);
+                $command = json_decode($command, true);
+                if ($command) {
+                    call_user_func($this->_streamCallback, $command);
+                }
+                $pos = strpos($this->_streamBuffer, "\r\n");
+            }
+        }
+        return strlen($data);
+    }
+    
+    /**
+     * Opens a long lived HTTP connection to the pnut.io servers, and sends data
+     * received to the httpStreamReceive function. As a general rule you should not
+     * directly call this method, it's used by openStream().
+     */
+    protected function httpStream(string $act, $req, array $params=[], string $contentType='application/x-www-form-urlencoded'): void
+    {
+        if ($this->_currentStream) {
+            throw new phpnutException('There is already an open stream, you must close the existing one before opening a new one');
+        }
+        $headers = [];
+        $this->_streamBuffer = '';
+        if ($this->_accessToken) {
+            $headers[] = "Authorization: Bearer {$this->_accessToken}";
+        }
+        $this->_currentStream = curl_init($req);
+        curl_setopt($this->_currentStream, CURLOPT_HTTPHEADER, $headers);
+        curl_setopt($this->_currentStream, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($this->_currentStream, CURLINFO_HEADER_OUT, true);
+        curl_setopt($this->_currentStream, CURLOPT_HEADER, true);
+        if ($this->_sslCA) {
+            curl_setopt($this->_currentStream, CURLOPT_CAINFO, $this->_sslCA);
+        }
+        // every time we receive a chunk of data, forward it to httpStreamReceive
+        curl_setopt($this->_currentStream, CURLOPT_WRITEFUNCTION, array($this, 'httpStreamReceive'));
+        // curl_exec($ch);
+        // return;
+        $this->_multiStream = curl_multi_init();
+        $this->_lastStreamActivity = time();
+        curl_multi_add_handle($this->_multiStream, $this->_currentStream);
+    }
+    
+    public function reconnectStream(): void
+    {
+        $this->closeStream();
+        $this->_connectFailCounter++;
+        // if we've failed a few times, back off
+        if ($this->_connectFailCounter > 1) {
+            $sleepTime = pow(2, $this->_connectFailCounter);
+            // don't sleep more than 60 seconds
+            if ($sleepTime > 60) {
+                $sleepTime = 60;
+            }
+            sleep($sleepTime);
+        }
+        $this->httpStream('get', $this->_streamUrl);
+    }
+    
+    /**
+     * Process an open stream for x microseconds, then return. This is useful if you want
+     * to be doing other things while processing the stream. If you just want to
+     * consume the stream without other actions, you can call processForever() instead.
+     * @param float @microseconds The number of microseconds to process for before
+     * returning. There are 1,000,000 microseconds in a second.
+     *
+     * @return void
+     */
+    public function processStream($microseconds=null): void
+    {
+        if (!$this->_multiStream) {
+            throw new phpnutException('You must open a stream before calling processStream()');
+        }
+        $start = microtime(true);
+        $active = null;
+        $inQueue = null;
+        $sleepFor = 0;
+        do {
+            // if we haven't received anything within 5.5 minutes, reconnect
+            // keepalives are sent every 5 minutes (measured on 2013-3-12 by @ryantharp)
+            if (time()-$this->_lastStreamActivity >= 330) {
+                $this->reconnectStream();
+            }
+            curl_multi_exec($this->_multiStream, $active);
+            if (!$active) {
+                $httpCode = curl_getinfo($this->_currentStream, CURLINFO_HTTP_CODE);
+                // don't reconnect on 400 errors
+                if ($httpCode >= 400 && $httpCode <= 499) {
+                    throw new phpnutException("Received HTTP error {$httpCode} check your URL and credentials before reconnecting");
+                }
+                $this->reconnectStream();
+            }
+            // sleep for a max of 2/10 of a second
+            $timeSoFar = (microtime(true)-$start)*1000000;
+            $sleepFor = $this->streamingSleepFor;
+            if ($timeSoFar+$sleepFor > $microseconds) {
+                $sleepFor = $microseconds - $timeSoFar;
+            }
+            if ($sleepFor > 0) {
+                usleep($sleepFor);
+            }
+        } while ($timeSoFar+$sleepFor < $microseconds);
+    }
+    
+    /**
+     * Process an open stream forever. This function will never return, if you
+     * want to perform other actions while consuming the stream, you should use
+     * processFor() instead.
+     * @return void This function will never return
+     * @see processFor();
+     */
+    public function processStreamForever(): void
+    {
+        while (true) {
+            $this->processStream(600);
+        }
+    }
+}
diff --git a/pnut/lib/phpnutException.php b/pnut/lib/phpnutException.php
new file mode 100644
index 00000000..77e768fe
--- /dev/null
+++ b/pnut/lib/phpnutException.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace phpnut;
+
+class phpnutException extends \Exception {}
diff --git a/pnut/pnut.php b/pnut/pnut.php
new file mode 100644
index 00000000..f278fb55
--- /dev/null
+++ b/pnut/pnut.php
@@ -0,0 +1,293 @@
+<?php
+/**
+ * Name: Pnut Connector
+ * Description: Post to pnut.io
+ * Version: 0.1.1
+ * Author: Morgan McMillian <https://social.clacks.network/profile/spacenerdmo>
+ * Status: In Development
+ */
+
+require_once 'addon/pnut/lib/phpnut.php';
+require_once 'addon/pnut/lib/phpnutException.php';
+
+use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\Plaintext;
+use Friendica\Core\Config\Util\ConfigFileManager;
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
+use Friendica\Core\System;
+use Friendica\DI;
+use Friendica\Model\Item;
+use Friendica\Model\Photo;
+use Friendica\Object\Image;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
+use Friendica\Util\DateTimeFormat;
+
+function pnut_install()
+{
+	Hook::register('load_config',             __FILE__, 'pnut_load_config');
+	Hook::register('hook_fork',               __FILE__, 'pnut_hook_fork');
+	Hook::register('post_local',              __FILE__, 'pnut_post_local');
+	Hook::register('notifier_normal',         __FILE__, 'pnut_post_hook');
+	Hook::register('jot_networks',            __FILE__, 'pnut_jot_nets');
+	Hook::register('connector_settings',      __FILE__, 'pnut_settings');
+	Hook::register('connector_settings_post', __FILE__, 'pnut_settings_post');
+}
+
+function pnut_module() {}
+
+function pnut_content()
+{
+	if (!DI::userSession()->getLocalUserId()) {
+		DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
+		return '';
+	}
+
+	if (isset(DI::args()->getArgv()[1])) {
+		switch (DI::args()->getArgv()[1]) {
+			case 'connect':
+				$o = pnut_connect();
+				break;
+
+			default:
+				$o = print_r(DI::args()->getArgv(), true);
+				break;
+		}
+	} else {
+		$o = pnut_connect();
+	}
+	return $o;
+}
+
+function pnut_connect()
+{
+	$client_id     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'client_id');
+	$client_secret = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'client_secret');
+	$callback_url = DI::baseUrl() . '/pnut/connect';
+
+	$nut = new phpnut\phpnut($client_id, $client_secret);
+
+	try {
+		$token = $nut->getAccessToken($callback_url);
+		Logger::debug('TOKEN', [$token]);
+		$o = DI::l10n()->t('You are now authenticated with pnut.io.');
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pnut', 'access_token', $token);
+	} catch (phpnutException $e) {
+		$o = DI::l10n()->t('Error fetching token. Please try again.');
+	}
+
+	$o .= '<br /><a href="' . DI::baseUrl() . '/settings/connectors">' . DI::l10n()->t("return to the connector page").'</a>';
+
+	return $o;
+}
+
+function pnut_load_config(ConfigFileManager $loader)
+{
+	DI::app()->getConfigCache()->load($loader->loadAddonConfig('pnut'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+}
+
+function pnut_settings(array &$data)
+{
+	if (!DI::userSession()->getLocalUserId()) {
+		return;
+	}
+
+	$redirectUri  = DI::baseUrl() . '/pnut/connect';
+	$scope        = ['write_post','files'];
+
+	$enabled       = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post') ?? false;
+	$def_enabled   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post_by_default') ?? false;
+	$client_id     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'client_id');
+	$client_secret = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'client_secret');
+	$token         = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'access_token');
+
+	Logger::debug('CLIENT_ID', [$client_id]);
+	Logger::debug('CLIENT_SECRET', [$client_secret]);
+
+	if (!empty($client_id) && !empty($client_secret) && empty($token)) {
+		$nut = new phpnut\phpnut($client_id, $client_secret);
+		$authorize_url = $nut->getAuthUrl($redirectUri, $scope);
+		$authorize_text = DI::l10n()->t('Authenticate with pnut.io');
+	}
+
+	if (!empty($token)) {
+		$disconn_btn = DI::l10n()->t('Disconnect');
+	}
+
+	$t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/pnut/');
+	$html = Renderer::replaceMacros($t, [
+		'$enable'        => ['pnut', DI::l10n()->t('Enable Pnut Post Addon'), $enabled],
+		'$bydefault'     => ['pnut_bydefault', DI::l10n()->t('Post to Pnut by default'), $def_enabled],
+		'$client_id'     => ['pnut_client_id', DI::l10n()->t('Client ID'), $client_id],
+		'$client_secret' => ['pnut_client_secret', DI::l10n()->t('Client Secret'), $client_secret],
+		'$access_token'  => ['pnut_access_token', DI::l10n()->t('Access Token'), $token, '', '', 'readonly'],
+		'$authorize_url' => $authorize_url ?? '',
+		'$authorize_text' => $authorize_text ?? '',
+		'$disconn_btn' => $disconn_btn ?? '',
+	]);
+
+	$data = [
+		'connector' => 'pnut',
+		'title'     => DI::l10n()->t('Pnut Import/Export'),
+		'image'     => 'addon/pnut/pnut.svg',
+		'enabled'   => $enabled,
+		'html'      => $html,
+	];
+}
+
+function pnut_settings_post(array &$b)
+{
+	if (empty($_POST['pnut-submit']) && empty($_POST['pnut-disconnect'])) {
+		return;
+	}
+
+	if (!empty($_POST['pnut-disconnect'])) {
+		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'pnut', 'post');
+		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'pnut', 'post_by_default');
+		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'pnut', 'client_id');
+		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'pnut', 'client_secret');
+		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'pnut', 'access_token');
+	} else {
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pnut', 'post',            intval($_POST['pnut']));
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pnut', 'post_by_default', intval($_POST['pnut_bydefault']));
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pnut', 'client_id',       $_POST['pnut_client_id']);
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pnut', 'client_secret',   $_POST['pnut_client_secret']);
+	}
+}
+
+function pnut_jot_nets(array &$jotnets_fields)
+{
+	if (!DI::userSession()->getLocalUserId()) {
+		return;
+	}
+
+	if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post')) {
+		$jotnets_fields[] = [
+			'type'  => 'checkbox',
+			'field' => [
+				'pnut_enable',
+				DI::l10n()->t('Post to Pnut'),
+				DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post_by_default')
+			]
+		];
+	}
+}
+
+function pnut_hook_fork(array &$b)
+{
+	if ($b['name'] != 'notifier_normal') {
+		return;
+	}
+
+	$post = $b['data'];
+
+	if (($post['created'] !== $post['edited']) && !$post['deleted']) {
+		DI::logger()->info('Editing is not supported by the addon');
+		$b['execute'] = false;
+		return;
+	}
+
+	if (!strstr($post['postopts'] ?? '', 'pnut') || ($post['parent'] != $post['id']) || $post['private']) {
+		$b['execute'] = false;
+		return;
+	}
+}
+
+function pnut_post_local(array &$b)
+{
+	if ($b['edit']) {
+		return;
+	}
+
+	if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
+		return;
+	}
+
+	if ($b['private'] || $b['parent']) {
+		return;
+	}
+
+	$pnut_post   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post'));
+	$pnut_enable = (($pnut_post && !empty($_REQUEST['pnut_enable'])) ? intval($_REQUEST['pnut_enable']) : 0);
+
+	// if API is used, default to the chosen settings
+	if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post_by_default'))) {
+		$pnut_enable = 1;
+	}
+
+	if (!$pnut_enable) {
+		return;
+	}
+
+	if (strlen($b['postopts'])) {
+		$b['postopts'] .= ',';
+	}
+
+	$b['postopts'] .= 'pnut';
+}
+
+function pnut_post_hook(array &$b)
+{
+	/**
+	 * Post to pnut.io
+	 */
+	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
+		return;
+	}
+
+	Logger::notice('PNUT post invoked', ['id' => $b['id'], 'guid' => $b['guid'], 'plink' => $b['plink']]);
+	Logger::debug('PNUT array', $b);
+
+	$token = DI::pConfig()->get($b['uid'], 'pnut', 'access_token');
+	$nut = new phpnut\phpnut($token);
+
+	$msgarr = Plaintext::getPost($b, 256, true, BBCode::EXTERNAL);
+	$text = $msgarr['text'];
+	$raw = [];
+
+	Logger::debug('PNUT msgarr', $msgarr);
+
+	if (count($msgarr['parts']) > 1) {
+		$tstamp = time();
+		$raw['nl.chimpnut.blog.post'][] = ['body' => $b['body'], 'tstamp' => $tstamp];
+		$text = Plaintext::shorten($text, 252 - strlen($b['plink']), $b['uid']);
+		$text .= "\n" . $b['plink'];
+	}
+
+	if ($msgarr['type'] == 'link') {
+		$text .= "\n[" . $msgarr['title'] . "](" . $msgarr['url'] . ")";
+	}
+
+	if ($msgarr['type'] == 'photo') {
+		$fileraw = ['type' => 'dev.mcmillian.friendica.image', 'kind' => 'image', 'is_public' => true];
+		foreach ($msgarr['images'] as $image) {
+			Logger::debug('PNUT image', $image);
+
+			if (!empty($image['id'])) {
+				$photo = Photo::selectFirst([], ['id' => $image['id']]);
+				Logger::debug('PNUT selectFirst');
+			} else {
+				$photo = Photo::createPhotoForExternalResource($image['url']);
+				Logger::debug('PNUT createPhotoForExternalResource');
+			}
+			$picturedata = Photo::getImageForPhoto($photo);
+
+			Logger::debug('PNUT photo', $photo);
+			$picurefile = System::getTempPath() . DIRECTORY_SEPARATOR . $photo['filename'];
+			file_put_contents($picurefile, $picturedata);
+			Logger::debug('PNUT got file?', ['filename' => $picurefile]);
+			$imagefile = $nut->createFile($picurefile, $fileraw);
+			Logger::debug('PNUT file', ['pnutimagefile' => $imagefile]);
+			unlink($picurefile);
+
+			$raw['io.pnut.core.oembed'][] = ['+io.pnut.core.file' => ['file_id' => $imagefile['id'], 'file_token' => $imagefile['file_token'], 'format' => 'oembed']];
+		}
+	}
+
+	$raw['io.pnut.core.crosspost'][] = ['canonical_url' => $b['plink']];
+	$nut->createPost($text, ['raw' => $raw]);
+
+	Logger::debug('PNUT post complete', ['id' => $b['id'], 'text' => $text, 'raw' => $raw]);
+}
diff --git a/pnut/pnut.svg b/pnut/pnut.svg
new file mode 100644
index 00000000..6cc64b01
--- /dev/null
+++ b/pnut/pnut.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 662 577" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"><g><g><path d="M80.265,421.001l0,-20.71l49.893,0l1.647,14.827c3.766,-5.492 8.277,-9.728 13.533,-12.709c5.256,-2.981 11.375,-4.471 18.356,-4.471c15.768,0 28.006,6.158 36.714,18.474c8.708,12.316 13.062,28.516 13.062,48.599l0,2.471c0,18.827 -4.354,33.968 -13.062,45.421c-8.708,11.453 -20.867,17.18 -36.478,17.18c-6.668,0 -12.591,-1.235 -17.769,-3.707c-5.177,-2.471 -9.61,-6.099 -13.297,-10.884l0,36.831l16.592,3.53l0,20.71l-67.426,0l0,-20.71l16.592,-3.53l0,-127.792l-18.357,-3.53Zm98.844,44.01c0,-12.003 -2,-21.731 -6.001,-29.183c-4.001,-7.453 -10.12,-11.179 -18.357,-11.179c-5.177,0 -9.59,1.059 -13.238,3.177c-3.648,2.118 -6.53,5.139 -8.649,9.061l0,55.776c2.119,3.609 5.001,6.355 8.649,8.237c3.648,1.883 8.139,2.825 13.474,2.825c8.315,0 14.415,-3.256 18.298,-9.767c3.883,-6.511 5.824,-15.337 5.824,-26.476l0,-2.471Z" style="fill:#008c99;fill-rule:nonzero;"/><path d="M248.573,507.019l16.475,-3.53l0,-78.958l-18.24,-3.53l0,-20.71l50.246,0l1.53,18.239c4.236,-6.511 9.453,-11.571 15.65,-15.179c6.198,-3.609 13.14,-5.413 20.828,-5.413c12.866,0 22.907,4.04 30.124,12.12c7.217,8.08 10.826,20.749 10.826,38.008l0,55.423l16.474,3.53l0,20.593l-65.661,0l0,-20.593l14.709,-3.53l0,-55.306c0,-8.55 -1.726,-14.61 -5.177,-18.18c-3.452,-3.569 -8.669,-5.354 -15.651,-5.354c-4.55,0 -8.629,0.922 -12.238,2.765c-3.608,1.844 -6.628,4.452 -9.06,7.826l0,68.249l13.885,3.53l0,20.593l-64.72,0l0,-20.593Z" style="fill:#008c99;fill-rule:nonzero;"/><path d="M475.638,511.491c-4.08,5.962 -9.12,10.551 -15.121,13.768c-6.001,3.216 -12.846,4.824 -20.534,4.824c-13.414,0 -23.926,-4.295 -31.536,-12.885c-7.609,-8.59 -11.414,-21.946 -11.414,-40.067l0,-52.6l-14.003,-3.53l0,-20.71l48.363,0l0,77.075c0,9.257 1.549,15.905 4.648,19.945c3.099,4.041 7.708,6.061 13.827,6.061c5.413,0 10.1,-0.883 14.061,-2.648c3.962,-1.765 7.198,-4.295 9.708,-7.59l0,-68.603l-15.062,-3.53l0,-20.71l49.423,0l0,103.198l15.415,3.53l0,20.593l-45.539,0l-2.236,-16.121Z" style="fill:#008c99;fill-rule:nonzero;"/><path d="M570.792,369.108l0,31.183l22.358,0l0,24.123l-22.358,0l0,64.837c0,4.942 1.02,8.472 3.059,10.59c2.04,2.119 4.786,3.178 8.237,3.178c2.354,0 4.413,-0.098 6.178,-0.295c1.765,-0.196 3.746,-0.529 5.943,-1l2.941,24.829c-3.844,1.177 -7.648,2.059 -11.414,2.648c-3.765,0.588 -7.845,0.882 -12.238,0.882c-11.845,0 -20.965,-3.256 -27.358,-9.767c-6.394,-6.511 -9.591,-16.827 -9.591,-30.947l0,-64.955l-18.709,0l0,-24.123l18.709,0l0,-31.183l34.243,0Z" style="fill:#008c99;fill-rule:nonzero;"/></g><path d="M443.348,0.858c2.329,0.009 4.657,0.043 6.984,0.111c4.608,0.135 9.211,0.391 13.805,0.77c14.091,1.162 28.088,3.482 41.789,6.977c24.76,6.315 48.578,16.481 70.015,30.421c3.101,2.016 6.15,4.111 9.144,6.283c3.296,2.392 6.525,4.878 9.677,7.456c3.591,2.937 7.084,5.994 10.467,9.168c6.53,6.126 12.651,12.689 18.274,19.658c6.401,7.932 12.154,16.391 17.12,25.294c5.592,10.027 10.181,20.615 13.596,31.578c2.211,7.098 3.929,14.348 5.128,21.684c0.991,6.061 1.627,12.179 1.906,18.314c0.399,8.774 0.07,17.582 -0.989,26.302c-0.898,7.404 -2.324,14.742 -4.254,21.945c-2.722,10.153 -6.448,20.03 -11.058,29.475c-4.026,8.248 -8.724,16.163 -13.993,23.677c-1.806,2.576 -3.68,5.105 -5.617,7.584c-12.75,16.324 -28.197,30.468 -45.288,42.141c-3.069,2.096 -6.191,4.113 -9.363,6.051c-22.127,13.521 -46.566,23.142 -71.853,28.809c-18.425,4.129 -37.312,6.164 -56.192,6.161c-18.665,-0.002 -37.332,-1.985 -55.558,-6.02c-26.059,-5.769 -51.233,-15.733 -73.918,-29.832c-3.256,-2.023 -6.459,-4.131 -9.604,-6.323c-6.208,-4.325 -12.189,-8.977 -17.896,-13.945c-1.826,-1.59 -3.624,-3.212 -5.393,-4.866c-0.64,-0.599 -1.277,-1.203 -1.91,-1.811c-0.224,-0.215 -0.445,-0.438 -0.675,-0.647c-0.068,-0.062 -0.138,-0.121 -0.21,-0.179c-0.277,-0.216 -0.578,-0.4 -0.9,-0.543c-0.854,-0.376 -1.828,-0.459 -2.732,-0.229c-0.405,0.102 -0.789,0.267 -1.146,0.482c-0.17,0.105 -0.338,0.212 -0.507,0.318c-0.363,0.227 -0.727,0.452 -1.092,0.677c-3.555,2.18 -7.182,4.24 -10.881,6.167c-3.862,2.011 -7.798,3.875 -11.794,5.603c-0.046,0.289 -0.095,0.578 -0.146,0.866c-0.38,2.093 -0.885,4.16 -1.446,6.211c-0.58,2.118 -1.22,4.22 -1.888,6.311c-1.638,5.125 -3.444,10.195 -5.264,15.257c-1.325,3.674 -2.663,7.344 -3.991,11.018c-1.058,2.933 -2.111,5.868 -3.132,8.815c-0.743,2.141 -1.47,4.287 -2.164,6.445c-0.595,1.848 -1.168,3.704 -1.688,5.575c-0.407,1.462 -0.789,2.934 -1.077,4.424c-0.085,0.44 -0.155,0.882 -0.223,1.325l-0.041,0.237c-0.104,0.542 -0.233,1.078 -0.402,1.605c-0.354,1.107 -0.861,2.164 -1.5,3.134c-1.141,1.73 -2.703,3.171 -4.52,4.167c-1.725,0.946 -3.664,1.485 -5.629,1.565c-1.232,0.05 -2.471,-0.08 -3.666,-0.384c-1.411,-0.359 -2.758,-0.961 -3.967,-1.772c-0.844,-0.566 -1.619,-1.233 -2.306,-1.982c-0.318,-0.348 -0.61,-0.716 -0.898,-1.088c-0.292,-0.377 -0.579,-0.757 -0.862,-1.14c-1.209,-1.637 -2.35,-3.323 -3.455,-5.031c-1.985,-3.063 -3.859,-6.197 -5.691,-9.353c-2.217,-3.819 -4.368,-7.677 -6.501,-11.544c-2.228,-4.041 -4.433,-8.095 -6.652,-12.14c-0.572,-1.04 -1.144,-2.08 -1.718,-3.119c-1.471,-2.653 -2.95,-5.302 -4.476,-7.923c-1.153,-1.98 -2.33,-3.948 -3.592,-5.86l-0.058,-0.088c-0.499,-0.002 -0.997,-0.006 -1.496,-0.01c-0.547,-0.007 -1.095,-0.015 -1.642,-0.025c-2.902,-0.059 -5.801,-0.174 -8.698,-0.356c-6.056,-0.381 -12.095,-1.041 -18.09,-1.981c-16.809,-2.638 -33.276,-7.495 -48.768,-14.542c-8.731,-3.972 -17.147,-8.637 -25.119,-13.971c-9.506,-6.36 -18.379,-13.674 -26.367,-21.862c-6.067,-6.22 -11.621,-12.944 -16.538,-20.108c-5.049,-7.356 -9.424,-15.177 -13.001,-23.352c-3.016,-6.894 -5.461,-14.039 -7.28,-21.342c-1.765,-7.088 -2.939,-14.321 -3.503,-21.604c-0.953,-12.314 -0.165,-24.757 2.345,-36.851c2.104,-10.14 5.415,-20.02 9.789,-29.406c3.839,-8.236 8.493,-16.087 13.824,-23.443c4.642,-6.404 9.795,-12.435 15.368,-18.046c4.976,-5.01 10.286,-9.686 15.87,-14.007c11.334,-8.773 23.786,-16.079 36.909,-21.832c10.483,-4.595 21.397,-8.2 32.542,-10.802c17.274,-4.033 35.099,-5.65 52.819,-4.917c10.221,0.422 20.41,1.634 30.44,3.65c11.709,2.353 23.201,5.801 34.251,10.336c5.382,2.209 10.658,4.675 15.802,7.394c1.659,0.877 3.305,1.781 4.935,2.711c0.542,0.309 1.082,0.621 1.62,0.936c0.283,0.165 0.565,0.334 0.85,0.497c0.102,0.056 0.204,0.112 0.307,0.167c0.912,0.471 1.878,0.826 2.882,1.041c1.312,0.28 2.672,0.325 3.999,0.134c1.107,-0.16 2.19,-0.484 3.203,-0.959c0.65,-0.304 1.27,-0.672 1.85,-1.094c0.314,-0.229 0.614,-0.474 0.904,-0.732c0.34,-0.308 0.678,-0.619 1.017,-0.929c1.905,-1.723 3.836,-3.416 5.802,-5.07c3.964,-3.335 8.053,-6.522 12.253,-9.556c2.827,-2.043 5.705,-4.018 8.627,-5.922c21.205,-13.817 44.749,-23.938 69.231,-30.286c13.586,-3.523 27.468,-5.888 41.449,-7.112c4.623,-0.405 9.256,-0.685 13.894,-0.842c2.467,-0.083 4.934,-0.129 7.403,-0.146c0.729,-0.003 1.459,-0.004 2.188,-0.003Zm-1.386,20.833c-1.594,0.007 -3.188,0.025 -4.781,0.061c-3.161,0.071 -6.32,0.204 -9.475,0.4c-9.918,0.616 -19.799,1.85 -29.56,3.715c-23.779,4.543 -46.883,12.841 -67.895,24.902c-2.942,1.689 -5.842,3.451 -8.695,5.286c-6.263,4.027 -12.3,8.407 -18.056,13.129c-1.789,1.467 -3.55,2.968 -5.282,4.501c-0.574,0.508 -1.146,1.02 -1.714,1.536c-0.369,0.336 -0.737,0.674 -1.107,1.01l-0.247,0.219c-0.742,0.646 -1.506,1.265 -2.302,1.845c-1.566,1.141 -3.236,2.139 -4.982,2.98c-3.332,1.604 -6.939,2.625 -10.618,3.01c-3.678,0.384 -7.418,0.13 -11.01,-0.751c-2.199,-0.54 -4.34,-1.312 -6.377,-2.301c-0.591,-0.287 -1.174,-0.592 -1.747,-0.915c-0.287,-0.161 -0.571,-0.329 -0.855,-0.496c-0.379,-0.223 -0.759,-0.443 -1.139,-0.663c-0.477,-0.274 -0.955,-0.546 -1.434,-0.816c-2.027,-1.136 -4.077,-2.23 -6.152,-3.277c-4.206,-2.123 -8.507,-4.057 -12.885,-5.8c-10.988,-4.375 -22.449,-7.547 -34.11,-9.517c-9.207,-1.554 -18.538,-2.36 -27.874,-2.437c-9.349,-0.077 -18.704,0.573 -27.949,1.972c-10.535,1.594 -20.926,4.161 -30.976,7.702c-13.981,4.926 -27.312,11.743 -39.372,20.374c-6.059,4.336 -11.793,9.128 -17.107,14.35c-4.787,4.704 -9.231,9.758 -13.255,15.129c-4.501,6.007 -8.473,12.413 -11.806,19.14c-2.471,4.987 -4.587,10.15 -6.313,15.442c-1.687,5.174 -2.997,10.47 -3.909,15.834c-1.497,8.799 -1.918,17.78 -1.262,26.681c0.53,7.189 1.767,14.323 3.684,21.272c1.514,5.49 3.45,10.862 5.767,16.064c1.896,4.256 4.048,8.397 6.43,12.402c1.993,3.351 4.146,6.606 6.444,9.756c1.922,2.635 3.946,5.196 6.061,7.678c1.87,2.196 3.812,4.33 5.819,6.4c1.738,1.792 3.524,3.537 5.356,5.233c13.022,12.052 28.282,21.599 44.633,28.447c15.085,6.317 31.106,10.339 47.363,12.077c4.65,0.498 9.321,0.809 13.996,0.936c1.471,0.041 2.943,0.063 4.415,0.067c0.797,0.002 1.594,-0.007 2.39,-0.008c0.23,0.003 0.23,0.003 0.459,0.009c0.383,0.016 0.765,0.04 1.147,0.081c0.904,0.096 1.799,0.27 2.674,0.519c2.466,0.703 4.75,2.006 6.611,3.772c0.444,0.421 0.863,0.868 1.256,1.338c0.355,0.425 0.689,0.868 1.018,1.313c0.405,0.549 0.798,1.108 1.182,1.672c1.293,1.899 2.496,3.859 3.67,5.834c0.994,1.671 1.965,3.356 2.922,5.048c1.343,2.373 2.665,4.758 3.981,7.146c2.21,4.022 4.405,8.052 6.615,12.074c1.883,3.421 3.779,6.835 5.717,10.225l0.293,0.512l0.236,0.41c0.27,-0.802 0.545,-1.601 0.82,-2.401c0.975,-2.817 1.975,-5.625 2.983,-8.431c1.471,-4.077 2.957,-8.149 4.427,-12.227c0.977,-2.716 1.948,-5.435 2.891,-8.163c0.731,-2.118 1.447,-4.241 2.129,-6.375c0.536,-1.677 1.052,-3.361 1.524,-5.057c0.405,-1.454 0.786,-2.918 1.074,-4.401c0.09,-0.468 0.163,-0.937 0.235,-1.408l0.055,-0.321c0.079,-0.423 0.165,-0.845 0.267,-1.263c0.231,-0.936 0.529,-1.855 0.892,-2.747c0.677,-1.663 1.58,-3.233 2.676,-4.654c1.031,-1.337 2.233,-2.542 3.567,-3.577c0.845,-0.655 1.742,-1.241 2.681,-1.753c0.475,-0.258 0.961,-0.492 1.453,-0.715c0.563,-0.244 1.127,-0.486 1.689,-0.733c1.533,-0.676 3.058,-1.373 4.57,-2.096c3.11,-1.487 6.171,-3.075 9.177,-4.764c1.542,-0.867 3.07,-1.761 4.582,-2.681c0.431,-0.261 0.859,-0.525 1.287,-0.791c0.346,-0.215 0.69,-0.433 1.037,-0.647c0.233,-0.14 0.232,-0.139 0.466,-0.277c0.624,-0.357 1.258,-0.693 1.908,-0.999c1.44,-0.676 2.944,-1.215 4.486,-1.605c2.855,-0.724 5.835,-0.937 8.764,-0.63c3.015,0.316 5.968,1.184 8.675,2.551c1.662,0.839 3.229,1.865 4.663,3.052c0.347,0.287 0.686,0.583 1.016,0.888c0.18,0.165 0.355,0.334 0.53,0.503c0.281,0.271 0.562,0.541 0.844,0.81c0.285,0.271 0.57,0.542 0.856,0.812c1.439,1.35 2.896,2.681 4.376,3.987c3.14,2.77 6.375,5.432 9.694,7.984c2.883,2.217 5.829,4.352 8.831,6.403c2.701,1.844 5.447,3.622 8.235,5.331c20.228,12.399 42.593,21.201 65.725,26.393c16.956,3.805 34.333,5.671 51.708,5.673c17.348,0.002 34.703,-1.863 51.634,-5.657c22.696,-5.086 44.653,-13.646 64.582,-25.671c2.884,-1.74 5.725,-3.553 8.517,-5.437c15.397,-10.389 29.357,-22.982 40.893,-37.561c1.624,-2.053 3.2,-4.144 4.724,-6.273c5.008,-6.996 9.457,-14.396 13.232,-22.129c3.801,-7.788 6.917,-15.911 9.253,-24.258c1.883,-6.728 3.258,-13.598 4.1,-20.534c0.877,-7.229 1.177,-14.528 0.901,-21.806c-0.233,-6.186 -0.887,-12.356 -1.954,-18.454c-0.967,-5.526 -2.273,-10.993 -3.902,-16.362c-2.916,-9.61 -6.87,-18.896 -11.702,-27.698c-4.249,-7.74 -9.174,-15.104 -14.652,-22.027c-4.951,-6.258 -10.355,-12.156 -16.124,-17.667c-5.125,-4.896 -10.54,-9.487 -16.191,-13.764c-2.951,-2.233 -5.967,-4.381 -9.041,-6.442c-2.8,-1.878 -5.647,-3.684 -8.538,-5.417c-20.324,-12.187 -42.737,-20.78 -65.885,-25.773c-10.53,-2.271 -21.219,-3.801 -31.962,-4.601c-3.598,-0.268 -7.202,-0.454 -10.809,-0.56c-1.714,-0.05 -3.427,-0.079 -5.141,-0.095c-0.874,-0.006 -1.748,-0.008 -2.621,-0.007Z" style="fill:#767676;fill-rule:nonzero;"/><path d="M267.017,298.075c5.743,-3.668 13.259,-2.88 18.116,1.9c38.217,36.942 94.631,60.326 157.514,60.326c114.993,0 208.353,-78.197 208.353,-174.514c0,-96.317 -93.36,-174.513 -208.353,-174.513c-61.005,0 -115.922,22.007 -154.04,57.053c-7.063,6.468 -17.522,7.56 -25.769,2.692c-25.816,-15.241 -57.044,-24.13 -90.661,-24.13c-88.956,0 -161.177,62.238 -161.177,138.898c0,76.66 72.221,138.898 161.177,138.898c0.587,0 1.174,-0.003 1.759,-0.008c1.712,-0.015 3.334,0.763 4.393,2.107c7.296,9.258 24.677,45.814 34.622,58.435c0.584,0.74 1.552,1.062 2.462,0.818c0.91,-0.244 1.588,-1.007 1.723,-1.94c2.059,-14.22 19.017,-52.406 21.062,-66.532c0.477,-3.287 2.636,-6.087 5.694,-7.383c8.123,-3.478 15.854,-7.537 23.125,-12.107Z" style="fill:#fffefb;"/><g><path d="M412.356,310.721c-3.895,-0.398 -7.532,1.999 -8.703,5.735c-1.115,3.542 -2.29,7.066 -3.525,10.568c-0.297,0.836 -0.198,1.761 0.268,2.515c0.466,0.754 1.249,1.256 2.128,1.365c0,0.001 0.001,0.001 0.001,0.001c11.339,1.407 22.753,2.201 34.177,2.405c0.837,0.014 1.596,-0.49 1.907,-1.267c0.001,0 0.001,-0.001 0.001,-0.001c1.852,-4.626 3.586,-9.3 5.204,-14.013c0.001,-0.001 0.001,-0.001 0.001,-0.002c0.459,-1.337 0.248,-2.813 -0.568,-3.968c-0.816,-1.155 -2.137,-1.848 -3.551,-1.862c-0.438,-0.004 -0.877,-0.009 -1.315,-0.015c-8.691,-0.119 -17.377,-0.602 -26.025,-1.461Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M463.661,321.235c-0.874,2.638 -0.359,5.539 1.369,7.716c1.728,2.177 4.437,3.336 7.205,3.083c2.84,-0.257 5.677,-0.551 8.509,-0.884c6.407,-0.754 12.792,-1.702 19.14,-2.851c2.88,-0.527 5.264,-2.543 6.264,-5.295c0.601,-1.653 1.186,-3.312 1.758,-4.975c0.126,-0.369 0.252,-0.737 0.377,-1.106c0.886,-2.607 0.317,-5.489 -1.493,-7.565c-1.81,-2.075 -4.587,-3.03 -7.291,-2.507c0,0 0,0 0,0c-10.11,1.957 -20.325,3.362 -30.584,4.242c0,0 0,0 0,0c-1.282,0.11 -2.367,0.99 -2.739,2.221c-0.805,2.651 -1.643,5.291 -2.515,7.921Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M345.36,295.717c-0.889,-0.325 -1.874,-0.257 -2.711,0.186c-0.837,0.442 -1.447,1.219 -1.678,2.137c-0.573,2.265 -1.169,4.523 -1.788,6.776c-0.247,0.899 -0.498,1.797 -0.753,2.694c-1.196,4.223 1.127,8.643 5.283,10.053c0.454,0.154 0.909,0.308 1.364,0.46c7.815,2.612 15.748,4.872 23.761,6.794c1.011,0.242 2.024,0.48 3.037,0.712c4.09,0.938 8.233,-1.345 9.623,-5.304c0.258,-0.731 0.512,-1.463 0.764,-2.196c0.268,-0.783 0.534,-1.567 0.796,-2.352c0.741,-2.208 0.512,-4.626 -0.628,-6.657c-1.14,-2.03 -3.085,-3.484 -5.356,-4.001c-1.102,-0.25 -2.203,-0.507 -3.302,-0.771c-9.62,-2.308 -19.117,-5.138 -28.411,-8.531c0,0 -0.001,0 -0.001,0Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M532.071,307.161c-0.832,2.954 0.046,6.125 2.278,8.231c2.231,2.106 5.448,2.798 8.348,1.796c5.319,-1.842 10.582,-3.844 15.773,-6.019c3.188,-1.336 6.35,-2.737 9.48,-4.205c2.017,-0.949 3.563,-2.674 4.287,-4.783c2.056,-6.043 3.888,-12.16 5.504,-18.334c0.307,-1.186 -0.125,-2.439 -1.096,-3.185c-0.971,-0.745 -2.294,-0.837 -3.359,-0.234c-0.002,-0.001 -0.002,0 -0.003,0c-9.836,5.569 -20.134,10.307 -30.703,14.305c-1.283,0.486 -2.569,0.96 -3.859,1.423c-2.55,0.916 -4.487,3.026 -5.181,5.644c-0.267,1.007 -0.539,2.012 -0.815,3.016c-0.215,0.782 -0.433,1.564 -0.654,2.345Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M301.19,273.826c-0.376,-0.246 -0.855,-0.269 -1.253,-0.06c-0.397,0.209 -0.649,0.618 -0.658,1.067c-0.007,0.324 -0.013,0.648 -0.02,0.972c-0.112,5.474 -0.245,10.948 -0.407,16.421c-0.092,3.073 1.533,5.942 4.215,7.443c1.911,1.059 3.835,2.093 5.774,3.099c2.216,1.15 4.833,1.233 7.117,0.227c2.284,-1.006 3.989,-2.994 4.636,-5.404c0.736,-2.735 1.433,-5.481 2.094,-8.235c0.409,-1.714 -0.413,-3.485 -1.986,-4.279c0,-0.001 0,-0.001 -0.001,-0.001c-6.705,-3.384 -13.233,-7.124 -19.511,-11.249c0,0 0,0 0,-0.001Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M177.105,303.349c0.367,1.265 1.552,2.115 2.868,2.057c0.001,0 0.001,0 0.001,0c1.592,-0.071 3.184,-0.164 4.775,-0.271c1.87,-0.126 3.739,-0.272 5.606,-0.435c2.531,-0.222 5.061,-0.476 7.585,-0.765c2.404,-0.276 4.805,-0.584 7.199,-0.934c1.328,-0.193 2.653,-0.402 3.978,-0.62c1.646,-0.27 3.291,-0.554 4.933,-0.852c0,0 0,0 0,0c0.617,-0.112 1.161,-0.475 1.5,-1.004c0.339,-0.528 0.442,-1.174 0.286,-1.782c-1.183,-4.634 -2.269,-9.293 -3.26,-13.972c-0.502,-2.389 -2.802,-3.953 -5.207,-3.543c-0.001,0 -0.001,0 -0.001,0c-1.866,0.318 -3.736,0.62 -5.61,0.89c-2.071,0.299 -4.148,0.564 -6.227,0.802c-2.337,0.268 -4.678,0.503 -7.021,0.708c-2.404,0.211 -4.811,0.391 -7.221,0.53c-1.017,0.059 -2.035,0.11 -3.054,0.15c-0.769,0.029 -1.537,0.053 -2.306,0.058c-0.003,0 -0.006,0 -0.008,0c0,0 0,0 0,0c-0.003,-0.001 -0.005,-0.002 -0.008,-0.002c-0.284,-0.057 -0.361,-0.076 -0.646,-0.121c-0.282,-0.044 -0.567,-0.078 -0.852,-0.102c-0.631,-0.052 -1.267,-0.052 -1.898,-0.006c0,0 0,0 0,0c-0.078,0.006 -0.149,0.045 -0.196,0.108c-0.046,0.062 -0.063,0.142 -0.046,0.218c1.421,6.343 3.028,12.643 4.83,18.888Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M123.759,278.988c-2.546,-0.572 -5.207,0.208 -7.041,2.063c-1.835,1.855 -2.585,4.525 -1.985,7.064c0.496,2.09 1.009,4.175 1.544,6.256c0.785,3.03 3.219,5.355 6.283,5.999c4.186,0.872 8.396,1.628 12.623,2.27c3.322,0.504 6.653,0.939 9.993,1.304c2.666,0.292 5.308,-0.731 7.082,-2.743c1.773,-2.012 2.457,-4.761 1.832,-7.369c-0.374,-1.566 -0.738,-3.135 -1.092,-4.705c-0.767,-3.43 -3.623,-5.996 -7.114,-6.392c-7.434,-0.864 -14.823,-2.108 -22.124,-3.747c-0.001,0 -0.001,0 -0.001,0Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M471.336,294.34c-0.188,0.776 0.005,1.597 0.521,2.207c0.516,0.611 1.292,0.939 2.09,0.883c0,0 0,0 0.001,0c10.231,-0.721 20.439,-1.803 30.59,-3.273c1.837,-0.266 3.672,-0.545 5.505,-0.836c3.306,-0.526 5.966,-2.999 6.73,-6.258c0.719,-3.098 1.394,-6.206 2.026,-9.323c0.538,-2.664 -0.272,-5.422 -2.165,-7.372c-1.893,-1.951 -4.626,-2.842 -7.305,-2.383c-9.829,1.656 -19.727,2.907 -29.654,3.791c0,0 0,0 0,0c-2.196,0.196 -3.991,1.832 -4.389,4c-1.151,6.221 -2.466,12.413 -3.95,18.564Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M234.696,292.438c0.296,1.172 1.05,2.175 2.094,2.785c1.043,0.61 2.288,0.774 3.453,0.456c0,0.001 0.001,0.001 0.001,0.001c1.512,-0.413 3.019,-0.842 4.515,-1.31c0.534,-0.167 1.065,-0.341 1.592,-0.527c0.462,-0.162 0.922,-0.334 1.373,-0.525c0.216,-0.092 0.431,-0.187 0.643,-0.289c0.058,-0.028 0.116,-0.057 0.174,-0.086c0.064,-0.031 0.127,-0.064 0.19,-0.097c0.24,-0.127 0.48,-0.255 0.72,-0.381c0.007,-0.004 0.014,-0.007 0.021,-0.011c2.62,-1.351 5.378,-2.408 8.141,-3.425l0.007,-0.002c1.006,-0.369 1.684,-1.313 1.713,-2.383c0.005,-0.174 0.009,-0.347 0.014,-0.521c0.149,-5.635 0.27,-11.271 0.371,-16.907c0,0 0,0 0,0c0.014,-0.795 -0.367,-1.545 -1.016,-2.003c-0.65,-0.459 -1.485,-0.566 -2.229,-0.286c-0.209,0.079 -0.418,0.157 -0.628,0.235c-1.705,0.634 -3.42,1.244 -5.129,1.867c-0.004,0.001 -0.007,0.003 -0.01,0.004c-0.384,0.141 -0.768,0.282 -1.152,0.424c-0.006,0.002 -0.011,0.004 -0.016,0.006c-1.827,0.681 -3.645,1.385 -5.436,2.156c-1.474,0.634 -2.928,1.314 -4.354,2.051c-0.306,0.159 -0.625,0.293 -0.954,0.4c0,0 0,0 0,0c-0.003,0.001 -0.006,0.002 -0.009,0.003c-1.357,0.438 -2.731,0.825 -4.107,1.2c0,0 0,0 0,0c-2.033,0.554 -3.284,2.595 -2.855,4.659c0.877,4.187 1.834,8.357 2.873,12.506Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M389.106,295.278c9.436,1.167 20.099,1.996 20.099,1.996c10.874,0.82 21.779,1.23 32.684,1.248c0.516,0.001 1.033,0.001 1.549,0c3.773,-0.005 7.061,-2.57 7.983,-6.229c0.736,-2.952 1.432,-5.913 2.088,-8.884c0.538,-2.447 -0.067,-5.006 -1.644,-6.954c-1.576,-1.948 -3.953,-3.073 -6.458,-3.057c-3.297,0.02 -6.593,0.002 -9.889,-0.053c-7.034,-0.117 -14.065,-0.408 -21.084,-0.879c-0.069,-0.005 -0.137,-0.01 -0.205,-0.017l-19.61,-1.81c-0.068,-0.008 -0.137,-0.015 -0.206,-0.021c-1.823,-0.215 -3.645,-0.443 -5.464,-0.684c-7.909,-1.046 -15.785,-2.34 -23.609,-3.901c-3.827,-0.764 -7.641,-1.592 -11.439,-2.489c-1.49,-0.354 -3.06,-0.072 -4.334,0.778c-1.273,0.849 -2.137,2.19 -2.383,3.702c0,0 0,0 0,0c-0.617,3.789 -1.294,7.568 -2.031,11.336c-0.834,4.249 1.862,8.391 6.085,9.347c0,0.002 0,0.002 0.001,0.002c9.54,2.162 19.169,3.932 28.847,5.35c3.002,0.44 6.009,0.846 9.02,1.219Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M179.538,285.843c0.05,0.029 0.099,0.06 0.147,0.093c0.061,0.043 0.139,0.097 0.139,0.097c0,0 -0.002,-0.001 -0.006,-0.004c-0.072,-0.05 -0.145,-0.098 -0.22,-0.144c-0.026,-0.017 -0.053,-0.034 -0.075,-0.048c-0.001,0 -0.001,-0.001 -0.001,-0.002c0.001,0 0.001,0 0.002,0c0.005,0.003 0.009,0.005 0.014,0.008Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M170.873,277.894c0.022,0.106 0.115,0.182 0.223,0.183c0,0 0,0 0,0c0.18,0 0.36,0.001 0.54,0.001c0.198,0 0.647,0.003 0.899,-0.003c0.097,-0.002 0.193,-0.007 0.289,-0.01c0.018,-0.001 0.035,-0.002 0.053,-0.003c0,0 0,0 0,0c0.04,-0.002 0.08,-0.001 0.12,0.003l0.16,0.014c0.195,0.016 0.203,0.016 0.383,0.029c0.032,0.002 0.063,0.004 0.095,0.006c0.977,0.054 1.956,0.055 2.935,0.044c1.114,-0.012 2.228,-0.041 3.342,-0.077c3.225,-0.105 6.449,-0.272 9.67,-0.472c2.736,-0.171 5.471,-0.369 8.203,-0.598c2.389,-0.201 4.776,-0.425 7.159,-0.679c0,0 0.001,0 0.001,0c1.504,-0.161 2.875,-0.936 3.788,-2.142c0.913,-1.206 1.287,-2.735 1.033,-4.226c-0.805,-4.776 -1.514,-9.568 -2.131,-14.371c-0.335,-2.635 -2.716,-4.519 -5.357,-4.237c0,0 0,0 0,0c-4.335,0.462 -8.681,0.819 -13.031,1.105c-2.624,0.172 -5.25,0.318 -7.878,0.429c-1.026,0.043 -2.053,0.082 -3.081,0.11c-0.823,0.024 -1.647,0.041 -2.472,0.045c-0.004,0 -0.008,0 -0.012,0c0,0 0,0 0,0c-0.02,0 -0.041,-0.002 -0.061,-0.005c-0.002,-0.001 -0.004,-0.001 -0.006,-0.002c-0.062,-0.01 -0.124,-0.02 -0.186,-0.029c-0.04,-0.006 -0.087,-0.013 -0.126,-0.019c-0.068,-0.01 -0.137,-0.019 -0.205,-0.027c-0.38,-0.046 -0.76,-0.083 -1.142,-0.099c-0.488,-0.022 -0.975,-0.017 -1.462,0.009c-0.3,0.016 -0.598,0.043 -0.897,0.074c-0.004,0 -0.009,0.001 -0.014,0.001c-0.01,0.001 -0.028,0.003 -0.046,0.005c-0.037,0.005 -0.075,0.007 -0.112,0.006c-0.001,0.001 -0.001,0.001 -0.001,0.001c-1.21,-0.004 -2.362,0.519 -3.157,1.431c-0.795,0.912 -1.156,2.124 -0.988,3.322c0.96,6.759 2.114,13.491 3.472,20.181Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M109.865,208.992c-1.133,-0.14 -2.272,0.22 -3.12,0.985c-0.848,0.765 -1.321,1.861 -1.298,3.003c0,0.001 0,0.001 0,0.002c0.097,4.715 0.279,9.429 0.549,14.138c0.231,4.033 0.526,8.062 0.887,12.086c0.98,10.907 2.443,21.778 4.424,32.552c0.077,0.421 0.405,0.75 0.825,0.83c0,0 0.001,0 0.001,0c6.532,1.241 13.107,2.258 19.707,3.066c2.654,0.326 5.312,0.617 7.973,0.875c2.543,0.249 5.058,-0.697 6.808,-2.559c1.75,-1.863 2.537,-4.431 2.131,-6.955c-0.458,-2.86 -0.882,-5.726 -1.273,-8.596c-0.508,-3.771 -3.53,-6.704 -7.315,-7.099c-2.068,-0.216 -4.134,-0.453 -6.198,-0.713c-8.511,-1.07 -16.978,-2.517 -25.35,-4.391c-0.001,-0.001 -0.002,-0.001 -0.003,-0.001c-0.023,-0.006 -0.038,-0.029 -0.033,-0.053c0.004,-0.023 0.026,-0.039 0.05,-0.037c6.968,0.811 13.954,1.467 20.949,1.987c2.365,0.176 4.731,0.336 7.098,0.481c2.394,0.148 4.734,-0.755 6.408,-2.472c1.675,-1.718 2.519,-4.079 2.312,-6.469c-0.342,-3.946 -0.623,-7.897 -0.845,-11.851c-0.269,-4.8 -0.452,-9.605 -0.551,-14.412c0,0 0,0 0,0c-0.017,-0.822 -0.665,-1.492 -1.485,-1.537c-0.263,-0.014 -0.526,-0.028 -0.788,-0.043c-8.878,-0.496 -17.745,-1.216 -26.582,-2.198c-1.762,-0.196 -3.522,-0.402 -5.281,-0.619Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M253.15,165.338c1.702,0.194 3.406,-0.354 4.676,-1.503c1.27,-1.15 1.985,-2.79 1.962,-4.503c-0.083,-6.178 -0.181,-12.355 -0.295,-18.532c-0.152,-8.255 -0.332,-16.509 -0.549,-24.763c-0.182,-6.951 -0.391,-13.901 -0.639,-20.85c-0.141,-3.926 -0.293,-7.852 -0.466,-11.777c-0.038,-0.865 -0.582,-1.626 -1.388,-1.942c0,0 0,0 0,0c-1.202,-0.471 -2.409,-0.93 -3.619,-1.379c-2.022,-0.751 -4.263,-0.643 -6.204,0.297c-1.941,0.941 -3.414,2.634 -4.077,4.686c-0.001,0 -0.001,0 -0.001,0.001c-0.951,2.942 -1.859,5.899 -2.727,8.867c-0.589,2.022 0.507,4.151 2.495,4.846c0,0 0,0 0,0c3.667,1.281 7.293,2.677 10.87,4.192c1.167,0.495 2.33,1.002 3.487,1.523c0,0 0.001,0.001 0.002,0.001c0.071,0.034 0.105,0.116 0.077,0.19c-0.028,0.074 -0.107,0.114 -0.183,0.092c-0.285,-0.082 -0.57,-0.164 -0.855,-0.245c-4.579,-1.306 -9.195,-2.481 -13.839,-3.534c-2.133,-0.481 -4.264,0.817 -4.816,2.933c0,0 0,0.001 0,0.001c-1.601,6.14 -3.042,12.322 -4.331,18.536c-0.245,1.183 0.509,2.344 1.689,2.602c0.001,0 0.003,0 0.004,0.001c0.057,0.015 0.093,0.071 0.083,0.13c-0.011,0.058 -0.065,0.098 -0.124,0.091c-0.001,0 -0.001,0 -0.001,0c-1.233,-0.14 -2.366,0.691 -2.603,1.908c-0.395,2.029 -0.775,4.061 -1.138,6.095c-1.193,6.674 -2.218,13.378 -3.075,20.103c-0.274,2.171 0.327,4.361 1.67,6.089c1.342,1.727 3.317,2.85 5.488,3.121c2.181,0.272 4.359,0.56 6.536,0.866c3.927,0.552 7.846,1.162 11.754,1.838c0.045,0.008 0.09,0.014 0.136,0.019c0,0 0.001,0 0.001,0Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M427.59,224.129c-4.412,-0.09 -8.113,3.311 -8.396,7.715c-0.442,6.692 -1.055,13.372 -1.844,20.031c-0.279,2.309 0.43,4.629 1.953,6.386c1.523,1.758 3.717,2.791 6.042,2.844c5.996,0.134 11.994,0.196 17.991,0.191c2.406,-0.002 4.811,-0.015 7.216,-0.039c4.103,-0.041 7.551,-3.092 8.09,-7.159c0.65,-4.95 1.196,-9.913 1.643,-14.884c0.361,-4.024 0.656,-8.053 0.887,-12.086c0,-0.001 0,-0.001 0,-0.001c0.046,-0.793 -0.242,-1.568 -0.793,-2.14c-0.552,-0.571 -1.316,-0.886 -2.11,-0.869c-5.925,0.123 -11.851,0.176 -17.777,0.159c-4.301,-0.013 -8.602,-0.061 -12.902,-0.148Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M478.639,254.048c-0.203,1.604 0.316,3.216 1.418,4.4c1.102,1.185 2.673,1.818 4.288,1.731c0,0.001 0,0.001 0,0.001c10.51,-0.57 21.009,-1.363 31.482,-2.41c3.832,-0.388 6.884,-3.378 7.352,-7.201c0.458,-3.779 0.856,-7.565 1.197,-11.355c0.361,-4.024 0.656,-8.053 0.887,-12.086c0,-0.001 0,-0.001 0,-0.001c0.109,-1.903 -0.625,-3.757 -2.007,-5.07c-1.382,-1.312 -3.272,-1.95 -5.167,-1.742c-1.314,0.144 -2.628,0.284 -3.942,0.419c-8.518,0.879 -17.054,1.58 -25.601,2.12c-4.154,0.258 -7.464,3.572 -7.717,7.726c-0.493,7.843 -1.22,15.67 -2.19,23.468Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M360.797,219.576c-2.267,-0.276 -4.547,0.402 -6.296,1.871c-1.749,1.468 -2.811,3.597 -2.931,5.878c-0.366,6.686 -0.9,13.363 -1.609,20.021c-0.489,4.49 2.728,8.538 7.213,9.075c3.421,0.411 6.847,0.791 10.275,1.144c7.031,0.725 14.073,1.334 21.123,1.838c4.364,0.308 8.208,-2.845 8.759,-7.185c0.545,-4.326 1.011,-8.662 1.401,-13.004c0.361,-4.024 0.656,-8.053 0.887,-12.086c0,0 0,0 0,-0.001c0.129,-2.255 -1.586,-4.192 -3.841,-4.336c-7.129,-0.461 -14.251,-1.034 -21.362,-1.729c-4.545,-0.444 -9.085,-0.938 -13.619,-1.486Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M179.126,254.072c0.066,0.028 0.131,0.058 0.195,0.09c0.068,0.035 0.148,0.076 0.148,0.076c0,0 0,0 0,0c-0.085,-0.043 -0.17,-0.084 -0.257,-0.123c-0.03,-0.014 -0.061,-0.028 -0.087,-0.04c-0.001,-0.001 -0.001,-0.001 -0.001,-0.002c0.001,-0.001 0.001,-0.001 0.002,-0.001c0,0 0,0 0,0Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M178.967,213.337c0.065,0.017 0.129,0.035 0.192,0.055c0.014,0.005 0.028,0.009 0.04,0.013c0.001,0 0.001,0.001 0.001,0.001c0,0 -0.001,0 -0.001,0c-0.06,-0.017 -0.174,-0.049 -0.259,-0.074c-0.001,0 -0.001,0 -0.001,-0.001c0,-0.001 0.001,-0.001 0.001,-0.001c0.009,0.002 0.018,0.005 0.027,0.007Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M177.904,213.065c0.05,0.01 0.099,0.021 0.147,0.033c0.018,0.005 0.038,0.01 0.059,0.016c0.001,0 0.002,0.001 0.001,0.002c0,0.001 -0.001,0.001 -0.002,0.001c-0.072,-0.017 -0.149,-0.035 -0.193,-0.046c-0.026,-0.006 -0.051,-0.012 -0.077,-0.017c-0.014,-0.003 -0.026,-0.005 -0.026,-0.005c0.03,0.005 0.061,0.011 0.091,0.016Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M459.924,166.022c-0.202,-2.093 -1.957,-3.693 -4.06,-3.701c-3.505,-0.011 -7.01,-0.018 -10.515,-0.022c-0.002,0 -0.004,0 -0.006,0c-1.376,-0.001 -2.752,-0.001 -4.128,-0.001c-0.001,0 -0.002,0 -0.003,0c-4.765,0.003 -9.529,0.014 -14.294,0.034c-2.293,0.009 -4.479,0.974 -6.032,2.662c-1.553,1.687 -2.332,3.946 -2.151,6.232c0.128,1.606 0.247,3.212 0.356,4.82c0.697,10.201 1.03,20.427 0.986,30.653c-0.002,0.604 -0.006,1.208 -0.012,1.813c-0.001,0.184 0.071,0.362 0.2,0.494c0.13,0.131 0.306,0.206 0.491,0.207c0,0 0,0 0,0c11.768,0.068 23.537,0.081 35.305,0.039c0,0 0,0 0.001,0c3.18,-0.011 5.749,-2.597 5.74,-5.777c-0.013,-3.447 -0.07,-6.894 -0.172,-10.34c-0.267,-9.053 -0.838,-18.097 -1.706,-27.112c0,0 0,-0.001 0,-0.001Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M398.371,166.022c-0.188,-1.955 -1.844,-3.44 -3.808,-3.414c-9.284,0.121 -18.568,0.281 -27.851,0.482c-2.595,0.057 -5.19,0.116 -7.784,0.18c-2.261,0.055 -4.4,1.036 -5.916,2.714c-1.517,1.678 -2.277,3.905 -2.104,6.159c0.101,1.301 0.196,2.601 0.285,3.903c0.697,10.201 1.03,20.427 0.986,30.653c0,0 0,0 0,0c-0.004,0.797 0.63,1.45 1.426,1.471c9.366,0.246 18.733,0.444 28.101,0.603c3.388,0.058 6.776,0.11 10.164,0.157c2.222,0.031 4.362,-0.836 5.936,-2.405c1.573,-1.569 2.447,-3.707 2.422,-5.929c-0.027,-2.487 -0.077,-4.975 -0.151,-7.461c-0.267,-9.053 -0.838,-18.097 -1.706,-27.112c0,0 0,-0.001 0,-0.001Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M553.013,164.05c-2.341,-0.08 -4.606,0.839 -6.229,2.529c-1.623,1.69 -2.45,3.991 -2.275,6.327c0.079,1.046 0.155,2.093 0.226,3.14c0.697,10.201 1.03,20.427 0.986,30.653c0,0 0,0 0,0c-0.001,0.279 0.111,0.547 0.311,0.741c0.2,0.195 0.471,0.3 0.75,0.291c6.997,-0.224 13.993,-0.478 20.988,-0.769c4.721,-0.197 9.443,-0.41 14.163,-0.645c3.117,-0.156 5.552,-2.749 5.513,-5.87c0,0 0,0 0,0c-0.1,-7.832 -0.46,-15.66 -1.072,-23.469c-0.126,-1.607 -0.262,-3.214 -0.41,-4.82c-0.353,-3.865 -3.501,-6.879 -7.378,-7.064c0,0 -0.001,0 -0.001,0c-8.521,-0.406 -17.045,-0.749 -25.572,-1.044Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M299.79,198.32c0.017,4.39 3.47,7.997 7.855,8.204c3.695,0.174 7.391,0.336 11.087,0.488c1.671,0.068 3.342,0.135 5.013,0.199c2.263,0.088 4.461,-0.759 6.081,-2.342c1.619,-1.582 2.516,-3.761 2.481,-6.025c-0.03,-1.903 -0.072,-3.806 -0.128,-5.709c-0.267,-9.053 -0.838,-18.097 -1.706,-27.112c0,0 0,0 0,0c-0.103,-1.069 -1.021,-1.872 -2.094,-1.834c-6.754,0.246 -13.507,0.522 -20.258,0.838c-0.741,0.035 -1.483,0.07 -2.224,0.106c-3.552,0.17 -6.334,3.119 -6.297,6.675c0,0.001 0,0.001 0,0.001c0.091,8.837 0.155,17.674 0.19,26.511Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M163.749,206.794c0,0.058 0.047,0.104 0.104,0.104c0,0 0.001,0 0.001,0c2.077,0.007 4.155,0.01 6.233,0.012c0.747,0 1.495,0.002 2.242,0c0.014,0 0.028,0 0.041,0c0.293,-0.002 0.586,-0.007 0.879,-0.011c0.157,-0.001 0.156,-0.001 0.314,0.006l0.193,0.005c0.032,0.001 0.064,0.001 0.097,0.002c0.191,0.002 0.382,0.004 0.573,0.006c0.01,0 0.02,0 0.029,0c0.665,0.002 1.329,0.002 1.993,0.002c0.002,0 0.005,0 0.007,0c4.355,-0.007 8.71,-0.034 13.065,-0.066c4.517,-0.033 9.033,-0.075 13.549,-0.13c0,0 0.214,-0.003 0.472,-0.006c0.502,-0.006 0.905,-0.415 0.904,-0.917c0,0 0,0 0,0c-0.01,-4.42 0.051,-8.84 0.182,-13.258c0.185,-6.308 0.512,-12.611 0.978,-18.905c0.171,-2.273 -0.608,-4.516 -2.151,-6.195c-1.542,-1.679 -3.712,-2.644 -5.992,-2.665c-9.819,-0.091 -19.64,-0.126 -29.46,-0.111c0,0 -0.421,0 -0.899,0.001c-0.766,0.002 -1.406,0.584 -1.479,1.346c0,0 0,0.001 0,0.001c-0.868,9.015 -1.439,18.059 -1.706,27.112c-0.134,4.554 -0.191,9.111 -0.169,13.667Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M105.426,197.891c-0.082,4.537 3.518,8.287 8.054,8.391c7.377,0.165 14.755,0.294 22.133,0.391c4.544,0.058 8.279,-3.571 8.35,-8.115c0.025,-1.713 0.062,-3.425 0.108,-5.137c0.18,-6.565 0.513,-13.125 0.995,-19.674c0.173,-2.305 -0.63,-4.577 -2.213,-6.262c-1.582,-1.684 -3.8,-2.627 -6.111,-2.597c-4.228,0.053 -8.456,0.117 -12.684,0.192c-5.393,0.097 -10.786,0.21 -16.179,0.344c-0.33,0.008 -0.603,0.261 -0.635,0.591c0,0 0,0 0,0c-0.868,9.015 -1.439,18.059 -1.706,27.112c-0.047,1.588 -0.084,3.176 -0.112,4.764Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M108.323,156.08c-0.195,1.631 0.367,3.262 1.526,4.428c1.159,1.165 2.786,1.737 4.419,1.553c0,0 0,0 0,0c5.699,-0.644 11.411,-1.179 17.129,-1.615c2.685,-0.204 5.371,-0.387 8.058,-0.55c3.973,-0.239 7.208,-3.282 7.688,-7.234c0.975,-7.909 2.17,-15.792 3.587,-23.634c0,-0.001 0,-0.001 0,-0.002c0.299,-1.653 -0.172,-3.353 -1.279,-4.617c-1.107,-1.264 -2.729,-1.955 -4.408,-1.877c-2.133,0.099 -4.265,0.209 -6.397,0.332c-6.4,0.369 -12.794,0.848 -19.176,1.448c-3.668,0.349 -6.659,3.09 -7.326,6.713c-0.141,0.759 -0.279,1.518 -0.414,2.277c-1.351,7.558 -2.486,15.155 -3.407,22.778Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M179.162,121.951c-3.993,-0.045 -7.445,2.777 -8.193,6.7c-0.296,1.549 -0.582,3.099 -0.859,4.651c-1.297,7.256 -2.395,14.548 -3.296,21.864c-0.116,0.956 0.184,1.917 0.824,2.637c0.64,0.72 1.559,1.131 2.523,1.128c0,0 0,0 0,0c9.653,-0.035 19.307,0.175 28.948,0.65c4.321,0.22 8.077,-2.937 8.603,-7.232c0.968,-7.804 2.15,-15.582 3.548,-23.321c0,-0.001 0,-0.001 0,-0.001c0.265,-1.464 -0.11,-2.971 -1.029,-4.14c-0.919,-1.169 -2.294,-1.89 -3.779,-1.979c-6.063,-0.358 -12.132,-0.616 -18.203,-0.781c-3.028,-0.082 -6.058,-0.14 -9.087,-0.176Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M391.079,119.103c-0.879,-4.028 -4.599,-6.788 -8.709,-6.46c-5.795,0.465 -11.584,1.005 -17.365,1.622c-4.42,0.472 -8.835,0.99 -13.244,1.557c-2.251,0.292 -4.282,1.498 -5.615,3.336c-1.333,1.837 -1.849,4.143 -1.427,6.373c0.023,0.125 0.046,0.25 0.07,0.375c1.504,7.977 2.776,15.998 3.821,24.047c0,0.001 0,0.001 0,0.001c0.123,0.947 0.619,1.806 1.378,2.386c0.758,0.58 1.717,0.833 2.663,0.704c7.46,-1.015 14.94,-1.873 22.434,-2.597c4.131,-0.4 8.267,-0.758 12.405,-1.077c2.3,-0.177 4.421,-1.31 5.848,-3.123c1.426,-1.813 2.027,-4.141 1.658,-6.418c-0.312,-1.925 -0.638,-3.848 -0.977,-5.768c-0.884,-5.004 -1.863,-9.992 -2.94,-14.958Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M481.8,111.259c-2.538,-0.126 -4.993,0.925 -6.653,2.85c-1.659,1.925 -2.338,4.508 -1.84,7c0.32,1.597 0.632,3.196 0.933,4.797c1.226,6.502 2.298,13.033 3.218,19.586c0.213,1.525 1.479,2.686 3.017,2.765c0,0 0,0 0,0c11.822,0.61 23.63,1.516 35.402,2.764c0.001,0 0.001,0 0.001,0c1.571,0.167 3.131,-0.403 4.225,-1.543c1.094,-1.139 1.599,-2.721 1.369,-4.284c-0.552,-3.719 -1.155,-7.431 -1.809,-11.133c-0.851,-4.813 -1.789,-9.611 -2.817,-14.389c-0.764,-3.523 -3.728,-6.142 -7.318,-6.465c-0.291,-0.028 -0.583,-0.054 -0.874,-0.08c-8.938,-0.794 -17.892,-1.413 -26.854,-1.868Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M451.812,115.41c-0.685,-2.99 -3.34,-5.115 -6.407,-5.126c-0.001,-0.001 -0.001,-0.001 -0.001,-0.001c-0.001,0 -0.002,0 -0.004,0c-1.16,-0.004 -2.321,-0.005 -3.481,-0.005c-0.003,0 -0.005,0 -0.007,0c-4.116,0.006 -8.231,0.04 -12.346,0.108c-3.367,0.056 -6.734,0.133 -10.1,0.233c-2.429,0.072 -4.702,1.212 -6.212,3.114c-1.511,1.903 -2.106,4.375 -1.625,6.757c0.365,1.803 0.718,3.608 1.058,5.416c0.917,4.86 1.747,9.735 2.492,14.624c0.623,4.112 4.211,7.116 8.368,7.006c6.585,-0.167 13.171,-0.247 19.757,-0.241c1.57,0.001 3.139,0.007 4.709,0.018c2.435,0.017 4.753,-1.044 6.332,-2.898c1.579,-1.854 2.257,-4.311 1.854,-6.713c-0.204,-1.214 -0.413,-2.428 -0.627,-3.641c-1.104,-6.246 -2.355,-12.466 -3.76,-18.651Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M531.669,82.333c-0.914,-0.2 -1.866,0.098 -2.502,0.785c-0.636,0.687 -0.861,1.659 -0.591,2.556c0,0 0,0.001 0,0.001c1.97,6.547 3.753,13.151 5.362,19.796c0,0.001 0,0.001 0,0.001c0.501,2.066 2.1,3.688 4.159,4.218c5.757,1.49 11.471,3.145 17.127,4.983c6.852,2.226 13.619,4.721 20.252,7.534c0,0 0,0 0,0c0.495,0.21 1.066,0.123 1.476,-0.225c0.409,-0.348 0.588,-0.897 0.461,-1.419c-0.961,-3.931 -1.995,-7.843 -3.107,-11.734c-1.095,-3.829 -2.266,-7.637 -3.521,-11.417c-0.071,-0.213 -0.143,-0.427 -0.214,-0.641c-0.821,-2.453 -2.746,-4.379 -5.199,-5.201c-2.426,-0.811 -4.863,-1.59 -7.31,-2.34c-6.008,-1.84 -12.071,-3.498 -18.174,-4.991c-2.732,-0.668 -5.472,-1.303 -8.219,-1.906Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M185.89,93.769c-3.829,-0.144 -7.253,2.369 -8.262,6.066c-0.375,1.366 -0.74,2.734 -1.097,4.104c-1.085,4.161 -2.097,8.342 -3.037,12.538c-0.117,0.52 0.009,1.065 0.34,1.483c0.331,0.417 0.834,0.663 1.367,0.668c0.001,0 0.001,0 0.001,0c8.368,0.08 16.734,0.488 25.068,1.245c1.691,0.154 3.38,0.322 5.068,0.504c4.187,0.452 8.04,-2.325 8.937,-6.439c0.954,-4.35 1.98,-8.684 3.081,-12.999c0.277,-1.079 0.077,-2.226 -0.549,-3.148c-0.626,-0.922 -1.617,-1.531 -2.723,-1.673c0,0 0,0 0,0c-9.358,-1.195 -18.768,-1.97 -28.194,-2.349Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M472.608,74.051c-2.699,-0.177 -5.313,0.982 -6.994,3.101c-1.682,2.119 -2.216,4.928 -1.431,7.517c0.1,0.336 0.201,0.671 0.302,1.006c0.764,2.538 1.499,5.085 2.207,7.639c0.93,3.356 3.868,5.766 7.341,6.021c6.992,0.524 13.971,1.229 20.925,2.124c1.889,0.243 3.775,0.499 5.66,0.771c2.787,0.398 5.583,-0.653 7.418,-2.787c1.835,-2.135 2.454,-5.058 1.642,-7.753c-0.475,-1.583 -0.962,-3.163 -1.461,-4.739c-0.561,-1.773 -1.137,-3.542 -1.729,-5.305c-0.859,-2.555 -3.094,-4.402 -5.766,-4.762c0,-0.001 0,-0.001 0,-0.001c-9.336,-1.261 -18.715,-2.199 -28.114,-2.832Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M298.125,99.187c0.004,0.121 0.074,0.231 0.183,0.286c0.108,0.055 0.238,0.047 0.338,-0.022c0,0 0,0 0,0c1.754,-1.196 3.53,-2.36 5.325,-3.495c3.054,-1.93 6.163,-3.772 9.32,-5.529c1.229,-0.682 1.808,-2.135 1.384,-3.476c0,0 0,0 0,0c-1.894,-5.987 -3.96,-11.919 -6.232,-17.773c0,0 0,0 0,0c-0.013,-0.035 -0.041,-0.062 -0.076,-0.075c-0.034,-0.013 -0.073,-0.011 -0.105,0.007c-2.252,1.176 -4.484,2.39 -6.695,3.642c-2.696,1.53 -4.306,4.443 -4.166,7.54c0.075,1.697 0.148,3.394 0.217,5.091c0.189,4.6 0.356,9.202 0.507,13.804Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M440.007,74.803c-0.381,-1.045 -1.38,-1.735 -2.492,-1.723c0,0 -0.001,0 -0.001,0c-3.393,0.039 -6.787,0.115 -10.178,0.231c-5.798,0.197 -11.591,0.507 -17.376,0.933c-2.495,0.186 -4.77,1.495 -6.184,3.559c-1.415,2.063 -1.816,4.657 -1.09,7.051c0.081,0.274 0.164,0.547 0.246,0.821c0.747,2.483 1.467,4.974 2.161,7.472c1.049,3.776 4.611,6.292 8.52,6.018c4.401,-0.305 8.806,-0.538 13.214,-0.702c3.196,-0.119 6.393,-0.202 9.591,-0.248c1.612,-0.024 3.223,-0.037 4.834,-0.043c0.005,0 0.009,0 0.014,0c0.677,-0.002 1.355,-0.003 2.032,-0.002l0.007,0c0.986,0.002 1.916,-0.461 2.509,-1.249c0.593,-0.788 0.78,-1.81 0.504,-2.757c-0.704,-2.413 -1.434,-4.817 -2.192,-7.213c-1.29,-4.077 -2.659,-8.129 -4.119,-12.148Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M121.51,91.92c-0.078,0.263 -0.011,0.548 0.177,0.748c0.188,0.2 0.468,0.285 0.735,0.223c0.001,0 0.001,0 0.001,0c12.127,-2.807 24.503,-4.518 36.929,-5.212c0,0 0,0 0,0c0.678,-0.038 1.258,-0.497 1.452,-1.147c1.081,-3.626 2.219,-7.234 3.42,-10.822c0,0 0,-0.001 0,-0.001c0.729,-2.18 0.328,-4.58 -1.072,-6.403c-1.399,-1.824 -3.613,-2.834 -5.907,-2.694c-1.285,0.078 -2.569,0.164 -3.852,0.261c-6.587,0.496 -13.156,1.256 -19.68,2.289c-2.945,0.473 -5.404,2.501 -6.43,5.302c-1.282,3.513 -2.494,7.051 -3.643,10.609c-0.735,2.274 -1.445,4.557 -2.13,6.847Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M190.073,66.808c-0.865,-0.061 -1.669,0.447 -1.986,1.253c0,0 0,0 0,0.001c-2.204,5.603 -4.216,11.281 -6.067,17.011c0,0 -0.001,0 -0.001,0c-0.186,0.576 -0.093,1.206 0.252,1.705c0.344,0.498 0.901,0.807 1.506,0.836c7.007,0.354 13.998,1.031 20.941,2.044c2.555,0.373 5.103,0.791 7.642,1.256c4.126,0.756 8.162,-1.707 9.375,-5.723c0.962,-3.174 1.967,-6.336 3.019,-9.481c0,0 0,-0.001 0,-0.001c0.308,-0.92 0.208,-1.927 -0.273,-2.769c-0.482,-0.842 -1.3,-1.438 -2.249,-1.639c-2.504,-0.528 -5.017,-1.014 -7.538,-1.458c-8.147,-1.437 -16.369,-2.444 -24.621,-3.035Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M522.68,48.323c-1.658,-0.433 -3.417,0.113 -4.537,1.409c-1.12,1.295 -1.407,3.115 -0.739,4.692c-0.002,0.002 -0.002,0.002 -0.002,0.003c1.994,4.712 3.849,9.483 5.584,14.297c0,0 0,0 0,0c0.409,1.134 1.332,2.005 2.487,2.348c2.524,0.753 5.037,1.543 7.536,2.373c8.082,2.683 16.03,5.774 23.778,9.307c2.864,1.306 5.7,2.672 8.505,4.101c0.34,0.174 0.751,0.119 1.035,-0.137c0.283,-0.255 0.378,-0.66 0.239,-1.015c0,-0.001 0,-0.002 -0.001,-0.002c-1.067,-2.732 -2.189,-5.442 -3.378,-8.123c-1.14,-2.572 -2.341,-5.117 -3.623,-7.622c-0.998,-1.948 -2.044,-3.873 -3.161,-5.757c-0.97,-1.635 -1.992,-3.243 -3.113,-4.78c-0.001,-0.002 -0.003,-0.004 -0.004,-0.006c0,0 0,0 0,0c-0.182,-0.247 -0.403,-0.463 -0.654,-0.638c-0.527,-0.367 -1.059,-0.726 -1.589,-1.089c-0.553,-0.381 -1.15,-0.692 -1.778,-0.928c-2.022,-0.757 -4.053,-1.49 -6.093,-2.198c-6.747,-2.342 -13.586,-4.417 -20.492,-6.235Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M369.378,53c-1.597,-3.344 -5.356,-5.068 -8.932,-4.097c-0.001,0 -0.001,0 -0.001,0c-9.079,2.467 -18.038,5.379 -26.816,8.765c0,0 -0.001,0.001 -0.001,0.001c-3.996,1.541 -6.023,5.999 -4.558,10.024c0.125,0.343 0.25,0.687 0.374,1.031c0.433,1.2 0.858,2.403 1.276,3.609c0.734,2.109 2.292,3.83 4.318,4.77c2.026,0.94 4.346,1.017 6.43,0.215c2.894,-1.115 5.809,-2.172 8.743,-3.174c5.297,-1.81 10.654,-3.443 16.058,-4.904c2.331,-0.628 4.27,-2.246 5.305,-4.427c1.034,-2.181 1.06,-4.706 0.071,-6.908c-0.492,-1.106 -0.995,-2.206 -1.508,-3.302c-0.251,-0.535 -0.504,-1.07 -0.759,-1.603Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M449.58,38.283c-0.812,-0.017 -1.574,0.392 -2.01,1.078c-0.435,0.686 -0.48,1.549 -0.119,2.277c0.067,0.135 0.134,0.269 0.201,0.404c2.012,4.069 3.89,8.204 5.659,12.385c0.381,0.899 0.756,1.8 1.126,2.703c0.622,1.517 2.064,2.537 3.701,2.619c0,0 0,0 0.001,0c13.879,0.696 27.715,2.333 41.36,4.974c0,0 0,0 0.001,0c0.153,0.03 0.31,-0.027 0.408,-0.148c0.099,-0.12 0.124,-0.285 0.064,-0.429c-1.325,-3.212 -2.718,-6.396 -4.191,-9.543c-1.969,-4.206 -4.078,-8.349 -6.381,-12.383c0,0 0,0 0,0c-0.258,-0.452 -0.711,-0.76 -1.226,-0.833c-9.159,-1.299 -18.376,-2.191 -27.612,-2.692c-3.658,-0.199 -7.319,-0.336 -10.982,-0.412c0,0 0,0 0,0Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M424.207,40.324c-0.564,-0.952 -1.616,-1.508 -2.721,-1.437c0,0 0,0 0,0c-10.846,0.698 -21.658,1.937 -32.376,3.742c-0.001,0 -0.001,0 -0.001,0c-0.593,0.1 -1.105,0.472 -1.382,1.006c-0.278,0.533 -0.29,1.165 -0.032,1.708c1.42,2.999 2.771,6.029 4.063,9.084c0.375,0.885 0.744,1.772 1.109,2.661c1.431,3.479 5.035,5.549 8.761,5.03c8.384,-1.145 16.819,-1.925 25.27,-2.356c0.574,-0.029 1.149,-0.057 1.724,-0.083c1.19,-0.054 2.274,-0.699 2.89,-1.718c0.616,-1.019 0.683,-2.279 0.178,-3.357c0,0 0,0 0,-0.001c-1.969,-4.206 -4.078,-8.349 -6.381,-12.383c-0.362,-0.635 -0.729,-1.267 -1.102,-1.896Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M557.252,61.478c0.023,0.012 0.039,0.035 0.043,0.061c0.003,0.026 -0.005,0.052 -0.024,0.071c-0.562,-0.38 -1.144,-0.724 -1.716,-1.084c-0.002,-0.002 -0.005,-0.004 -0.008,-0.006c0,0 0,0 0,0c0.568,0.319 1.137,0.639 1.705,0.958Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/></g></g></svg>
\ No newline at end of file
diff --git a/pnut/templates/connector_settings.tpl b/pnut/templates/connector_settings.tpl
new file mode 100644
index 00000000..7d1ad3f2
--- /dev/null
+++ b/pnut/templates/connector_settings.tpl
@@ -0,0 +1,12 @@
+<p>{{$status}}</p>
+{{include file="field_checkbox.tpl" field=$enable}}
+{{include file="field_checkbox.tpl" field=$bydefault}}
+{{include file="field_input.tpl" field=$client_id}}
+{{include file="field_input.tpl" field=$client_secret}}
+{{include file="field_input.tpl" field=$access_token}}
+{{if $authorize_url}}
+	<a href="{{$authorize_url}}">{{$authorize_text}}</a>
+{{/if}}
+{{if $disconn_btn}}
+	<div class="submit"><input type="submit" name="pnut-disconnect" value="{{$disconn_btn}}" /></div>
+{{/if}}

From e4bb463b5b36b90018672b8c8fc9c23192ddde4c Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 23 Feb 2024 13:32:24 +0000
Subject: [PATCH 013/294] Bluesky: Several improvements and fixes

---
 bluesky/bluesky.php | 171 ++++++++++++++++++++------------------------
 1 file changed, 79 insertions(+), 92 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index fe1faab1..b651238b 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -141,7 +141,7 @@ function bluesky_probe_detect(array &$hookData)
 		return;
 	}
 
-	$hookData['result'] = bluesky_get_contact_fields($data, 0, false);
+	$hookData['result'] = bluesky_get_contact_fields($data, 0, $pconfig['uid'], false);
 
 	$hookData['result']['baseurl'] = bluesky_get_pds($did);
 
@@ -942,7 +942,7 @@ function bluesky_fetch_timeline(int $uid, int $last_poll)
 	}
 
 	foreach (array_reverse($data->feed) as $entry) {
-		bluesky_process_post($entry->post, $uid, Item::PR_NONE, 0, $last_poll);
+		bluesky_process_post($entry->post, $uid, $uid, Item::PR_NONE, 0, 0, $last_poll);
 		if (!empty($entry->reason)) {
 			bluesky_process_reason($entry->reason, bluesky_get_uri($entry->post), $uid);
 		}
@@ -1041,18 +1041,21 @@ function bluesky_fetch_notifications(int $uid, int $last_poll)
 				break;
 
 			case 'mention':
-				$data = bluesky_process_post($notification, $uid, Item::PR_PUSHED, 0, $last_poll);
-				Logger::debug('Got mention', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
+				$contact = bluesky_get_contact($notification->author, 0, $uid);
+				$result  = bluesky_fetch_missing_post($uri, $uid, $uid, $contact['id'], 0, $last_poll);
+				Logger::debug('Got mention', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
 			case 'reply':
-				$data = bluesky_process_post($notification, $uid, Item::PR_PUSHED, 0, $last_poll);
-				Logger::debug('Got reply', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
+				$contact = bluesky_get_contact($notification->author, 0, $uid);
+				$result  = bluesky_fetch_missing_post($uri, $uid, $uid, $contact['id'], 0, $last_poll);
+				Logger::debug('Got reply', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
 			case 'quote':
-				$data = bluesky_process_post($notification, $uid, Item::PR_PUSHED, 0, $last_poll);
-				Logger::debug('Got quote', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
+				$contact = bluesky_get_contact($notification->author, 0, $uid);
+				$result  = bluesky_fetch_missing_post($uri, $uid, $uid, $contact['id'], 0, $last_poll);
+				Logger::debug('Got quote', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
 			default:
@@ -1090,15 +1093,12 @@ function bluesky_fetch_feed(int $uid, string $feed, int $last_poll)
 			Logger::debug('Unwanted language detected', ['text' => $entry->post->record->text]);
 			continue;
 		}
-		$id = bluesky_process_post($entry->post, $uid, Item::PR_TAG, 0, $last_poll);
-		if (!empty($id)) {
-			$post = Post::selectFirst(['uri-id'], ['id' => $id]);
-			if (!empty($post['uri-id'])) {
-				$stored = Post\Category::storeFileByURIId($post['uri-id'], $uid, Post\Category::SUBCRIPTION, $feedname, $feedurl);
-				Logger::debug('Stored tag subscription for user', ['uri-id' => $post['uri-id'], 'uid' => $uid, 'name' => $feedname, 'url' => $feedurl, 'stored' => $stored]);
-			} else {
-				Logger::notice('Post not found', ['id' => $id, 'entry' => $entry]);
-			}
+		$uri_id = bluesky_process_post($entry->post, $uid, $uid, Item::PR_TAG, 0, 0, $last_poll);
+		if (!empty($uri_id)) {
+			$stored = Post\Category::storeFileByURIId($uri_id, $uid, Post\Category::SUBCRIPTION, $feedname, $feedurl);
+			Logger::debug('Stored tag subscription for user', ['uri-id' => $uri_id, 'uid' => $uid, 'name' => $feedname, 'url' => $feedurl, 'stored' => $stored]);
+		} else {
+			Logger::notice('Post not found', ['entry' => $entry]);
 		}
 		if (!empty($entry->reason)) {
 			bluesky_process_reason($entry->reason, bluesky_get_uri($entry->post), $uid);
@@ -1106,22 +1106,23 @@ function bluesky_fetch_feed(int $uid, string $feed, int $last_poll)
 	}
 }
 
-function bluesky_process_post(stdClass $post, int $uid, int $post_reason, int $level, int $last_poll): int
+function bluesky_process_post(stdClass $post, int $uid, int $fetch_uid, int $post_reason, int $causer, int $level, int $last_poll): int
 {
 	$uri = bluesky_get_uri($post);
 
-	if ($id = Post::selectFirst(['id'], ['uri' => $uri, 'uid' => $uid])) {
-		return $id['id'];
+	if ($uri_id = bluesky_fetch_uri_id($uri, $uid)) {
+		return $uri_id;
 	}
 
-	if ($id = Post::selectFirst(['id'], ['extid' => $uri, 'uid' => $uid])) {
-		return $id['id'];
+	if (empty($post->record)) {
+		Logger::debug('Invalid post', ['uri' => $uri]);
+		return 0;
 	}
 
 	Logger::debug('Importing post', ['uid' => $uid, 'indexedAt' => $post->indexedAt, 'uri' => $post->uri, 'cid' => $post->cid, 'root' => $post->record->reply->root ?? '']);
 
-	$item = bluesky_get_header($post, $uri, $uid, $uid);
-	$item = bluesky_get_content($item, $post->record, $uri, $uid, $uid, $level, $last_poll);
+	$item = bluesky_get_header($post, $uri, $uid, $fetch_uid);
+	$item = bluesky_get_content($item, $post->record, $uri, $uid, $fetch_uid, $level, $last_poll);
 	if (empty($item)) {
 		return 0;
 	}
@@ -1134,13 +1135,18 @@ function bluesky_process_post(stdClass $post, int $uid, int $post_reason, int $l
 		$item['post-reason'] = $post_reason;
 	}
 
-	return Item::insert($item);
+	if ($causer != 0) {
+		$item['causer-id'] = $causer;
+	}
+
+	Item::insert($item);
+	return bluesky_fetch_uri_id($uri, $uid);
 }
 
 function bluesky_get_header(stdClass $post, string $uri, int $uid, int $fetch_uid): array
 {
 	$parts = bluesky_get_uri_parts($uri);
-	if (empty($post->author)) {
+	if (empty($post->author) || empty($post->cid) || empty($parts->rkey)) {
 		return [];
 	}
 	$contact = bluesky_get_contact($post->author, $uid, $fetch_uid);
@@ -1293,55 +1299,35 @@ function bluesky_add_media(stdClass $embed, array $item, int $fetch_uid, int $le
 			break;
 
 		case 'app.bsky.embed.record#view':
-			$uri = bluesky_get_uri($embed->record);
-			$shared = Post::selectFirst(['uri-id'], ['uri' => $uri, 'uid' => $item['uid']]);
-			if (empty($shared)) {
-				if (empty($embed->record->value)) {
-					Logger::info('Record has got no value', ['record' => $embed->record]);
-					break;
-				}
-				$shared = bluesky_get_header($embed->record, $uri, 0, $fetch_uid);
-				$shared = bluesky_get_content($shared, $embed->record->value, $uri, $item['uid'], $fetch_uid, $level, $last_poll);
-				if (!empty($shared)) {
-					if (!empty($embed->record->embeds)) {
-						foreach ($embed->record->embeds as $single) {
-							$shared = bluesky_add_media($single, $shared, $fetch_uid, $level, $last_poll);
-						}
-					}
-					Item::insert($shared);
-				}
+			$original_uri = $uri = bluesky_get_uri($embed->record);
+			$uri = bluesky_fetch_missing_post($uri, $item['uid'], $fetch_uid, $item['contact-id'], $level, $last_poll);
+			if ($uri) {
+				$shared = Post::selectFirst(['uri-id'], ['uri' => $uri, 'uid' => [$item['uid'], 0]]);
+				$uri_id = $shared['uri-id'] ?? 0;
 			}
-			if (!empty($shared['uri-id'])) {
-				$item['quote-uri-id'] = $shared['uri-id'];
+			if (!empty($uri_id)) {
+				$item['quote-uri-id'] = $uri_id;
+			} else {
+				Logger::debug('Quoted post could not be fetched', ['original-uri' => $original_uri, 'uri' => $uri]);
 			}
 			break;
 
 		case 'app.bsky.embed.recordWithMedia#view':
-			$uri = bluesky_get_uri($embed->record->record);
-			$shared = Post::selectFirst(['uri-id'], ['uri' => $uri, 'uid' => $item['uid']]);
-			if (empty($shared)) {
-				$shared = bluesky_get_header($embed->record->record, $uri, 0, $fetch_uid);
-				$shared = bluesky_get_content($shared, $embed->record->record->value, $uri, $item['uid'], $fetch_uid, $level, $last_poll);
-				if (!empty($shared)) {
-					if (!empty($embed->record->record->embeds)) {
-						foreach ($embed->record->record->embeds as $single) {
-							$shared = bluesky_add_media($single, $shared, $fetch_uid, $level, $last_poll);
-						}
-					}
-					Item::insert($shared);
-				}
+			$original_uri = $uri = bluesky_get_uri($embed->record->record);
+			$uri = bluesky_fetch_missing_post($uri, $item['uid'], $fetch_uid, $item['contact-id'], $level, $last_poll);
+			if ($uri) {
+				$shared = Post::selectFirst(['uri-id'], ['uri' => $uri, 'uid' => [$item['uid'], 0]]);
+				$uri_id = $shared['uri-id'] ?? 0;
 			}
-			if (!empty($shared['uri-id'])) {
-				$item['quote-uri-id'] = $shared['uri-id'];
-			}
-
-			if (!empty($embed->media)) {
-				$item = bluesky_add_media($embed->media, $item, $fetch_uid, $level, $last_poll);
+			if (!empty($uri_id)) {
+				$item['quote-uri-id'] = $uri_id;
+			} else {
+				Logger::debug('Quoted post could not be fetched', ['original-uri' => $original_uri, 'uri' => $uri]);
 			}
 			break;
 
 		default:
-			Logger::notice('Unhandled embed type', ['type' => $embed->$type, 'embed' => $embed]);
+			Logger::notice('Unhandled embed type', ['uri-id' => $item['uri-id'], 'type' => $embed->$type, 'embed' => $embed]);
 			break;
 	}
 	return $item;
@@ -1449,6 +1435,21 @@ function bluesky_fetch_post(string $uri, int $uid): string
 	return '';
 }
 
+function bluesky_fetch_uri_id(string $uri, int $uid): string
+{
+	$reply = Post::selectFirst(['uri-id'], ['uri' => $uri, 'uid' => [$uid, 0]]);
+	if (!empty($reply['uri-id'])) {
+		Logger::debug('Post with extid exists', ['uri' => $uri]);
+		return $reply['uri-id'];
+	}
+	$reply = Post::selectFirst(['uri-id'], ['extid' => $uri, 'uid' => [$uid, 0]]);
+	if (!empty($reply['uri-id'])) {
+		Logger::debug('Post with extid exists', ['uri' => $uri]);
+		return $reply['uri-id'];
+	}
+	return 0;
+}
+
 function bluesky_process_thread(stdClass $thread, int $uid, int $fetch_uid, array $cdata, int $level, int $last_poll): string
 {
 	if (empty($thread->post)) {
@@ -1459,27 +1460,12 @@ function bluesky_process_thread(stdClass $thread, int $uid, int $fetch_uid, arra
 
 	$fetched_uri = bluesky_fetch_post($uri, $uid);
 	if (empty($fetched_uri)) {
-		Logger::debug('Process missing post', ['uri' => $uri]);
-		$item = bluesky_get_header($thread->post, $uri, $uid, $uid);
-		$item = bluesky_get_content($item, $thread->post->record, $uri, $uid, $fetch_uid, $level, $last_poll);
-		if (!empty($item)) {
-			$item['post-reason'] = Item::PR_FETCHED;
-
-			if (!empty($cdata['public'])) {
-				$item['causer-id']   = $cdata['public'];
-			}
-
-			if (!empty($thread->post->embed)) {
-				$item = bluesky_add_media($thread->post->embed, $item, $uid, $level, $last_poll);
-			}
-			$id = Item::insert($item);
-			if (!$id) {
-				Logger::info('Item has not not been stored', ['uri' => $uri]);
-				return '';
-			}
-			Logger::debug('Stored item', ['id' => $id, 'uri' => $uri]);
+		$uri_id = bluesky_process_post($thread->post, $uid, $fetch_uid, Item::PR_FETCHED, $cdata['public'], $level, $last_poll);
+		if ($uri_id) {
+			Logger::debug('Post has been processed and stored', ['uri-id' => $uri_id, 'uri' => $uri]);
+			return $uri;
 		} else {
-			Logger::info('Post has not not been fetched', ['uri' => $uri]);
+			Logger::info('Post has not not been stored', ['uri' => $uri]);
 			return '';
 		}
 	} else {
@@ -1502,7 +1488,7 @@ function bluesky_get_contact(stdClass $author, int $uid, int $fetch_uid): array
 
 	$update = empty($contact) || $contact['updated'] < DateTimeFormat::utc('now -24 hours');
 
-	$public_fields = $fields = bluesky_get_contact_fields($author, $fetch_uid, $update);
+	$public_fields = $fields = bluesky_get_contact_fields($author, $uid, $fetch_uid, $update);
 
 	$public_fields['uid'] = 0;
 	$public_fields['rel'] = Contact::NOTHING;
@@ -1543,8 +1529,9 @@ function bluesky_get_contact(stdClass $author, int $uid, int $fetch_uid): array
 	return Contact::getById($cid);
 }
 
-function bluesky_get_contact_fields(stdClass $author, int $uid, bool $update): array
+function bluesky_get_contact_fields(stdClass $author, int $uid, int $fetch_uid, bool $update): array
 {
+	$nick = $author->handle ?? $author->did;
 	$fields = [
 		'uid'      => $uid,
 		'network'  => Protocol::BLUESKY,
@@ -1555,10 +1542,10 @@ function bluesky_get_contact_fields(stdClass $author, int $uid, bool $update): a
 		'pending'  => false,
 		'url'      => $author->did,
 		'nurl'     => $author->did,
-		'alias'    => BLUESKY_WEB . '/profile/' . $author->handle,
-		'name'     => $author->displayName ?? $author->handle,
-		'nick'     => $author->handle,
-		'addr'     => $author->handle,
+		'alias'    => BLUESKY_WEB . '/profile/' . $nick,
+		'name'     => $author->displayName ?? $nick,
+		'nick'     => $nick,
+		'addr'     => $nick,
 	];
 
 	if (!$update) {
@@ -1572,7 +1559,7 @@ function bluesky_get_contact_fields(stdClass $author, int $uid, bool $update): a
 		$fields['gsid'] = GServer::getID($fields['baseurl'], true);
 	}
 
-	$data = bluesky_xrpc_get($uid, 'app.bsky.actor.getProfile', ['actor' => $author->did]);
+	$data = bluesky_xrpc_get($fetch_uid, 'app.bsky.actor.getProfile', ['actor' => $author->did]);
 	if (empty($data)) {
 		Logger::debug('Error fetching contact fields', ['uid' => $uid, 'url' => $fields['url']]);
 		return $fields;

From 2b5f8e9c82c2bae768b5b38a18a4587ce34020e8 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 23 Feb 2024 14:04:06 +0000
Subject: [PATCH 014/294] Fix coding standards

---
 bluesky/bluesky.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index b651238b..5fa2f32f 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1019,7 +1019,7 @@ function bluesky_fetch_notifications(int $uid, int $last_poll)
 				} else {
 					Logger::info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
 				}
-			break;
+				break;
 
 			case 'repost':
 				$item = bluesky_get_header($notification, $uri, $uid, $uid);
@@ -1033,7 +1033,7 @@ function bluesky_fetch_notifications(int $uid, int $last_poll)
 				} else {
 					Logger::info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
 				}
-			break;
+				break;
 
 			case 'follow':
 				$contact = bluesky_get_contact($notification->author, $uid, $uid);
@@ -1531,7 +1531,7 @@ function bluesky_get_contact(stdClass $author, int $uid, int $fetch_uid): array
 
 function bluesky_get_contact_fields(stdClass $author, int $uid, int $fetch_uid, bool $update): array
 {
-	$nick = $author->handle ?? $author->did;
+	$nick = $author->handle ?: $author->did;
 	$fields = [
 		'uid'      => $uid,
 		'network'  => Protocol::BLUESKY,
@@ -1543,7 +1543,7 @@ function bluesky_get_contact_fields(stdClass $author, int $uid, int $fetch_uid,
 		'url'      => $author->did,
 		'nurl'     => $author->did,
 		'alias'    => BLUESKY_WEB . '/profile/' . $nick,
-		'name'     => $author->displayName ?? $nick,
+		'name'     => $author->displayName ?: $nick,
 		'nick'     => $nick,
 		'addr'     => $nick,
 	];
@@ -1741,7 +1741,6 @@ function bluesky_xrpc_get(int $uid, string $url, array $parameters = []): ?stdCl
 	$data = bluesky_get(bluesky_get_user_pds($uid) . '/xrpc/' . $url, HttpClientAccept::JSON, [HttpClientOptions::HEADERS => ['Authorization' => ['Bearer ' . bluesky_get_token($uid)]]]);
 	DI::pConfig()->set($uid, 'bluesky', 'status', is_null($data) ? BLUEKSY_STATUS_API_FAIL : BLUEKSY_STATUS_SUCCESS);
 	return $data;
-
 }
 
 function bluesky_get(string $url, string $accept_content = HttpClientAccept::DEFAULT, array $opts = []): ?stdClass

From bcef83e14852d4bcab31fcc533a05ec96ebfcfb8 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 24 Feb 2024 06:48:19 +0000
Subject: [PATCH 015/294] Set post reasons

---
 bluesky/bluesky.php | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 5fa2f32f..7da7d6b5 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -183,7 +183,7 @@ function bluesky_item_by_link(array &$hookData)
 
 	$uri = 'at://' . $did . '/app.bsky.feed.post/' . $matches[2];
 
-	$uri = bluesky_fetch_missing_post($uri, $hookData['uid'], $hookData['uid'], 0, 0);
+	$uri = bluesky_fetch_missing_post($uri, $hookData['uid'], $hookData['uid'], Item::PR_FETCHED, 0, 0, 0);
 	Logger::debug('Got post', ['profile' => $matches[1], 'cid' => $matches[2], 'result' => $uri]);
 	if (!empty($uri)) {
 		$item = Post::selectFirst(['id'], ['uri' => $uri, 'uid' => $hookData['uid']]);
@@ -1012,7 +1012,7 @@ function bluesky_fetch_notifications(int $uid, int $last_poll)
 				$item['gravity'] = Item::GRAVITY_ACTIVITY;
 				$item['body'] = $item['verb'] = Activity::LIKE;
 				$item['thr-parent'] = bluesky_get_uri($notification->record->subject);
-				$item['thr-parent'] = bluesky_fetch_missing_post($item['thr-parent'], $uid, $uid, $item['contact-id'], 0, $last_poll);
+				$item['thr-parent'] = bluesky_fetch_missing_post($item['thr-parent'], $uid, $uid, Item::PR_FETCHED, $item['contact-id'], 0, $last_poll);
 				if (!empty($item['thr-parent'])) {
 					$data = Item::insert($item);
 					Logger::debug('Got like', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
@@ -1026,7 +1026,7 @@ function bluesky_fetch_notifications(int $uid, int $last_poll)
 				$item['gravity'] = Item::GRAVITY_ACTIVITY;
 				$item['body'] = $item['verb'] = Activity::ANNOUNCE;
 				$item['thr-parent'] = bluesky_get_uri($notification->record->subject);
-				$item['thr-parent'] = bluesky_fetch_missing_post($item['thr-parent'], $uid, $uid, $item['contact-id'], 0, $last_poll);
+				$item['thr-parent'] = bluesky_fetch_missing_post($item['thr-parent'], $uid, $uid, Item::PR_FETCHED, $item['contact-id'], 0, $last_poll);
 				if (!empty($item['thr-parent'])) {
 					$data = Item::insert($item);
 					Logger::debug('Got repost', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
@@ -1042,19 +1042,19 @@ function bluesky_fetch_notifications(int $uid, int $last_poll)
 
 			case 'mention':
 				$contact = bluesky_get_contact($notification->author, 0, $uid);
-				$result  = bluesky_fetch_missing_post($uri, $uid, $uid, $contact['id'], 0, $last_poll);
+				$result  = bluesky_fetch_missing_post($uri, $uid, $uid, Item::PR_TO, $contact['id'], 0, $last_poll);
 				Logger::debug('Got mention', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
 			case 'reply':
 				$contact = bluesky_get_contact($notification->author, 0, $uid);
-				$result  = bluesky_fetch_missing_post($uri, $uid, $uid, $contact['id'], 0, $last_poll);
+				$result  = bluesky_fetch_missing_post($uri, $uid, $uid, Item::PR_COMMENT, $contact['id'], 0, $last_poll);
 				Logger::debug('Got reply', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
 			case 'quote':
 				$contact = bluesky_get_contact($notification->author, 0, $uid);
-				$result  = bluesky_fetch_missing_post($uri, $uid, $uid, $contact['id'], 0, $last_poll);
+				$result  = bluesky_fetch_missing_post($uri, $uid, $uid, Item::PR_PUSHED, $contact['id'], 0, $last_poll);
 				Logger::debug('Got quote', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
@@ -1187,7 +1187,7 @@ function bluesky_get_content(array $item, stdClass $record, string $uri, int $ui
 	if (!empty($record->reply)) {
 		$item['parent-uri'] = bluesky_get_uri($record->reply->root);
 		if ($item['parent-uri'] != $uri) {
-			$item['parent-uri'] = bluesky_fetch_missing_post($item['parent-uri'], $uid, $fetch_uid, $item['contact-id'], $level, $last_poll);
+			$item['parent-uri'] = bluesky_fetch_missing_post($item['parent-uri'], $uid, $fetch_uid, Item::PR_COMPLETION, $item['contact-id'], $level, $last_poll);
 			if (empty($item['parent-uri'])) {
 				return [];
 			}
@@ -1195,7 +1195,7 @@ function bluesky_get_content(array $item, stdClass $record, string $uri, int $ui
 
 		$item['thr-parent'] = bluesky_get_uri($record->reply->parent);
 		if (!in_array($item['thr-parent'], [$uri, $item['parent-uri']])) {
-			$item['thr-parent'] = bluesky_fetch_missing_post($item['thr-parent'], $uid, $fetch_uid, $item['contact-id'], $level, $last_poll, $item['parent-uri']);
+			$item['thr-parent'] = bluesky_fetch_missing_post($item['thr-parent'], $uid, $fetch_uid, Item::PR_COMPLETION, $item['contact-id'], $level, $last_poll, $item['parent-uri']);
 			if (empty($item['thr-parent'])) {
 				return [];
 			}
@@ -1300,7 +1300,7 @@ function bluesky_add_media(stdClass $embed, array $item, int $fetch_uid, int $le
 
 		case 'app.bsky.embed.record#view':
 			$original_uri = $uri = bluesky_get_uri($embed->record);
-			$uri = bluesky_fetch_missing_post($uri, $item['uid'], $fetch_uid, $item['contact-id'], $level, $last_poll);
+			$uri = bluesky_fetch_missing_post($uri, $item['uid'], $fetch_uid, Item::PR_FETCHED, $item['contact-id'], $level, $last_poll);
 			if ($uri) {
 				$shared = Post::selectFirst(['uri-id'], ['uri' => $uri, 'uid' => [$item['uid'], 0]]);
 				$uri_id = $shared['uri-id'] ?? 0;
@@ -1314,7 +1314,7 @@ function bluesky_add_media(stdClass $embed, array $item, int $fetch_uid, int $le
 
 		case 'app.bsky.embed.recordWithMedia#view':
 			$original_uri = $uri = bluesky_get_uri($embed->record->record);
-			$uri = bluesky_fetch_missing_post($uri, $item['uid'], $fetch_uid, $item['contact-id'], $level, $last_poll);
+			$uri = bluesky_fetch_missing_post($uri, $item['uid'], $fetch_uid, Item::PR_FETCHED, $item['contact-id'], $level, $last_poll);
 			if ($uri) {
 				$shared = Post::selectFirst(['uri-id'], ['uri' => $uri, 'uid' => [$item['uid'], 0]]);
 				$uri_id = $shared['uri-id'] ?? 0;
@@ -1385,7 +1385,7 @@ function bluesky_get_uri_parts(string $uri): ?stdClass
 	return $class;
 }
 
-function bluesky_fetch_missing_post(string $uri, int $uid, int $fetch_uid, int $causer, int $level, int $last_poll = 0, string $fallback = ''): string
+function bluesky_fetch_missing_post(string $uri, int $uid, int $fetch_uid, int $post_reason, int $causer, int $level, int $last_poll, string $fallback = ''): string
 {
 	$fetched_uri = bluesky_fetch_post($uri, $uid);
 	if (!empty($fetched_uri)) {
@@ -1413,11 +1413,10 @@ function bluesky_fetch_missing_post(string $uri, int $uid, int $fetch_uid, int $
 
 	if ($causer != 0) {
 		$cdata = Contact::getPublicAndUserContactID($causer, $uid);
-	} else {
-		$cdata = [];
+		$causer = $cdata['public'] ?? 0;
 	}
 
-	return bluesky_process_thread($data->thread, $uid, $fetch_uid, $cdata, $level, $last_poll);
+	return bluesky_process_thread($data->thread, $uid, $fetch_uid, $post_reason, $causer, $level, $last_poll);
 }
 
 function bluesky_fetch_post(string $uri, int $uid): string
@@ -1450,7 +1449,7 @@ function bluesky_fetch_uri_id(string $uri, int $uid): string
 	return 0;
 }
 
-function bluesky_process_thread(stdClass $thread, int $uid, int $fetch_uid, array $cdata, int $level, int $last_poll): string
+function bluesky_process_thread(stdClass $thread, int $uid, int $fetch_uid, int $post_reason, int $causer, int $level, int $last_poll): string
 {
 	if (empty($thread->post)) {
 		Logger::info('Invalid post', ['post' => $thread]);
@@ -1460,7 +1459,7 @@ function bluesky_process_thread(stdClass $thread, int $uid, int $fetch_uid, arra
 
 	$fetched_uri = bluesky_fetch_post($uri, $uid);
 	if (empty($fetched_uri)) {
-		$uri_id = bluesky_process_post($thread->post, $uid, $fetch_uid, Item::PR_FETCHED, $cdata['public'], $level, $last_poll);
+		$uri_id = bluesky_process_post($thread->post, $uid, $fetch_uid, $post_reason, $causer, $level, $last_poll);
 		if ($uri_id) {
 			Logger::debug('Post has been processed and stored', ['uri-id' => $uri_id, 'uri' => $uri]);
 			return $uri;
@@ -1474,7 +1473,7 @@ function bluesky_process_thread(stdClass $thread, int $uid, int $fetch_uid, arra
 	}
 
 	foreach ($thread->replies ?? [] as $reply) {
-		$reply_uri = bluesky_process_thread($reply, $uid, $fetch_uid, $cdata, $level, $last_poll);
+		$reply_uri = bluesky_process_thread($reply, $uid, $fetch_uid, Item::PR_COMPLETION, $causer, $level, $last_poll);
 		Logger::debug('Reply has been processed', ['uri' => $uri, 'reply' => $reply_uri]);
 	}
 
@@ -1531,7 +1530,7 @@ function bluesky_get_contact(stdClass $author, int $uid, int $fetch_uid): array
 
 function bluesky_get_contact_fields(stdClass $author, int $uid, int $fetch_uid, bool $update): array
 {
-	$nick = $author->handle ?: $author->did;
+	$nick = $author->handle ?? $author->did;
 	$fields = [
 		'uid'      => $uid,
 		'network'  => Protocol::BLUESKY,
@@ -1543,7 +1542,7 @@ function bluesky_get_contact_fields(stdClass $author, int $uid, int $fetch_uid,
 		'url'      => $author->did,
 		'nurl'     => $author->did,
 		'alias'    => BLUESKY_WEB . '/profile/' . $nick,
-		'name'     => $author->displayName ?: $nick,
+		'name'     => $author->displayName ?? $nick,
 		'nick'     => $nick,
 		'addr'     => $nick,
 	];

From 6d578d14952251e4826103d8ab035c8dbd9dee69 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 24 Feb 2024 08:26:06 +0000
Subject: [PATCH 016/294] Changed post reason

---
 bluesky/bluesky.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 7da7d6b5..5e3de1a0 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1187,7 +1187,7 @@ function bluesky_get_content(array $item, stdClass $record, string $uri, int $ui
 	if (!empty($record->reply)) {
 		$item['parent-uri'] = bluesky_get_uri($record->reply->root);
 		if ($item['parent-uri'] != $uri) {
-			$item['parent-uri'] = bluesky_fetch_missing_post($item['parent-uri'], $uid, $fetch_uid, Item::PR_COMPLETION, $item['contact-id'], $level, $last_poll);
+			$item['parent-uri'] = bluesky_fetch_missing_post($item['parent-uri'], $uid, $fetch_uid, Item::PR_FETCHED, $item['contact-id'], $level, $last_poll);
 			if (empty($item['parent-uri'])) {
 				return [];
 			}
@@ -1195,7 +1195,7 @@ function bluesky_get_content(array $item, stdClass $record, string $uri, int $ui
 
 		$item['thr-parent'] = bluesky_get_uri($record->reply->parent);
 		if (!in_array($item['thr-parent'], [$uri, $item['parent-uri']])) {
-			$item['thr-parent'] = bluesky_fetch_missing_post($item['thr-parent'], $uid, $fetch_uid, Item::PR_COMPLETION, $item['contact-id'], $level, $last_poll, $item['parent-uri']);
+			$item['thr-parent'] = bluesky_fetch_missing_post($item['thr-parent'], $uid, $fetch_uid, Item::PR_FETCHED, $item['contact-id'], $level, $last_poll, $item['parent-uri']);
 			if (empty($item['thr-parent'])) {
 				return [];
 			}
@@ -1473,7 +1473,7 @@ function bluesky_process_thread(stdClass $thread, int $uid, int $fetch_uid, int
 	}
 
 	foreach ($thread->replies ?? [] as $reply) {
-		$reply_uri = bluesky_process_thread($reply, $uid, $fetch_uid, Item::PR_COMPLETION, $causer, $level, $last_poll);
+		$reply_uri = bluesky_process_thread($reply, $uid, $fetch_uid, Item::PR_FETCHED, $causer, $level, $last_poll);
 		Logger::debug('Reply has been processed', ['uri' => $uri, 'reply' => $reply_uri]);
 	}
 

From 346e22c5f5ec44716c28f8447ba9844a1b375f14 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 24 Feb 2024 08:28:34 +0000
Subject: [PATCH 017/294] Tumblr: Fixed token exchange

---
 tumblr/tumblr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index d6508ff8..12e9e5e0 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -1479,7 +1479,7 @@ function tumblr_exchange_token(int $uid): stdClass
 		]);
 
 		$response = $client->post('oauth2/exchange', ['auth' => 'oauth']);
-		return json_decode($response->getBodyString()->getContents());
+		return json_decode($response->getBody()->getContents());
 	} catch (RequestException $exception) {
 		Logger::notice('Exchange failed', ['code' => $exception->getCode(), 'message' => $exception->getMessage()]);
 		return new stdClass;

From 7580054394a069a754c8e64acff1b036caba3950 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 1 Mar 2024 05:53:42 +0000
Subject: [PATCH 018/294] Bluesky: fix problems with links and hashtags

---
 bluesky/bluesky.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 5e3de1a0..db60d1a4 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -764,7 +764,7 @@ function bluesky_get_urls(string $body): array
 	if (preg_match_all("/#\[url\=(https?:.*?)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER)) {
 		foreach ($matches as $match) {
 			$text = '#' . $match[2];
-			$urls[] = ['tag' => $match[2], 'text' => $text, 'hash' => $text];
+			$urls[strpos($body, $match[0])] = ['tag' => $match[2], 'text' => $text, 'hash' => $text];
 			$body = str_replace($match[0], $text, $body);
 		}
 	}
@@ -774,7 +774,7 @@ function bluesky_get_urls(string $body): array
 		foreach ($matches as $match) {
 			$text = Strings::getStyledURL($match[1]);
 			$hash = bluesky_get_hash_for_url($match[0], mb_strlen($text));
-			$urls[] = ['url' => $match[1], 'text' => $text, 'hash' => $hash];
+			$urls[strpos($body, $match[0])] = ['url' => $match[1], 'text' => $text, 'hash' => $hash];
 			$body = str_replace($match[0], $hash, $body);
 		}
 	}
@@ -789,17 +789,19 @@ function bluesky_get_urls(string $body): array
 			}
 			if (mb_strlen($text) < 100) {
 				$hash = bluesky_get_hash_for_url($match[0], mb_strlen($text));
-				$urls[] = ['url' => $match[1], 'text' => $text, 'hash' => $hash];
+				$urls[strpos($body, $match[0])] = ['url' => $match[1], 'text' => $text, 'hash' => $hash];
 				$body = str_replace($match[0], $hash, $body);
 			} else {
 				$text = Strings::getStyledURL($match[1]);
 				$hash = bluesky_get_hash_for_url($match[0], mb_strlen($text));
-				$urls[] = ['url' => $match[1], 'text' => $text, 'hash' => $hash];
+				$urls[strpos($body, $match[0])] = ['url' => $match[1], 'text' => $text, 'hash' => $hash];
 				$body = str_replace($match[0], $text . ' ' . $hash, $body);
 			}
 		}
 	}
 
+	asort($urls);
+
 	return ['body' => $body, 'urls' => $urls];
 }
 

From 5f7233fd20b85560ce903f7f26df405daf0414e2 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 28 Feb 2024 03:05:57 +0000
Subject: [PATCH 019/294] Bluesky: Enabled support for Friendica handles

---
 bluesky/bluesky.php                      | 56 +++++++++++++-----
 bluesky/lang/C/messages.po               | 73 +++++++++++++++++-------
 bluesky/templates/admin.tpl              |  2 +
 bluesky/templates/connector_settings.tpl |  1 +
 4 files changed, 96 insertions(+), 36 deletions(-)
 create mode 100644 bluesky/templates/admin.tpl

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index db60d1a4..5fc0a4f0 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -42,6 +42,7 @@ use Friendica\Model\ItemURI;
 use Friendica\Model\Photo;
 use Friendica\Model\Post;
 use Friendica\Model\Tag;
+use Friendica\Model\User;
 use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Object\Image;
@@ -316,20 +317,44 @@ function bluesky_unblock(array &$hook_data)
 	$hook_data['result'] = true;
 }
 
+function bluesky_addon_admin(string &$o)
+{
+	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/bluesky/');
+
+	$o = Renderer::replaceMacros($t, [
+		'$submit' => DI::l10n()->t('Save Settings'),
+		'$friendica_handles'    => ['friendica_handles', DI::l10n()->t('Allow your users to use your hostname for their Bluesky handles'), DI::config()->get('bluesky', 'friendica_handles'), DI::l10n()->t('Before enabling this option, you have to download and configure the bluesky-handles repository on your system. See https://git.friendi.ca/heluecht/bluesky-handles')],
+	]);
+}
+
+function bluesky_addon_admin_post()
+{
+	DI::config()->set('bluesky', 'friendica_handles', (bool)$_POST['friendica_handles']);
+}
+
 function bluesky_settings(array &$data)
 {
 	if (!DI::userSession()->getLocalUserId()) {
 		return;
 	}
 
-	$enabled      = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post') ?? false;
-	$def_enabled  = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default') ?? false;
-	$pds          = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'pds');
-	$handle       = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'handle');
-	$did          = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'did');
-	$token        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'access_token');
-	$import       = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'import') ?? false;
-	$import_feeds = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'import_feeds') ?? false;
+	$enabled       = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post') ?? false;
+	$def_enabled   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default') ?? false;
+	$pds           = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'pds');
+	$handle        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'handle');
+	$did           = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'did');
+	$token         = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'access_token');
+	$import        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'import') ?? false;
+	$import_feeds  = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'import_feeds') ?? false;
+	$custom_handle = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'friendica_handle') ?? false;
+
+	if (DI::config()->get('bluesky', 'friendica_handles')) {
+		$self = User::getById(DI::userSession()->getLocalUserId(), ['nickname']);
+		$handle = $self['nickname'] . '.' . DI::baseUrl()->getHost();
+		$friendica_handle = ['bluesky_friendica_handle', DI::l10n()->t('Allow to use %s as your Bluesky handle.', $handle), $custom_handle, DI::l10n()->t('When enabled, you can use %s as your Bluesky handle. After you enabled this option, please go to https://bsky.app/settings and select to change your handle. Select that you have got your own domain. Then enter %s and select "No DNS Panel". Then select "Verify Text File".', $handle, $handle)];
+	} else {
+		$friendica_handle = [];
+	}
 
 	$t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/bluesky/');
 	$html = Renderer::replaceMacros($t, [
@@ -337,6 +362,7 @@ function bluesky_settings(array &$data)
 		'$bydefault'    => ['bluesky_bydefault', DI::l10n()->t('Post to Bluesky by default'), $def_enabled],
 		'$import'       => ['bluesky_import', DI::l10n()->t('Import the remote timeline'), $import],
 		'$import_feeds' => ['bluesky_import_feeds', DI::l10n()->t('Import the pinned feeds'), $import_feeds, DI::l10n()->t('When activated, Posts will be imported from all the feeds that you pinned in Bluesky.')],
+		'$custom_handle' => $friendica_handle,
 		'$pds'          => ['bluesky_pds', DI::l10n()->t('Personal Data Server'), $pds, DI::l10n()->t('The personal data server (PDS) is the system that hosts your profile.'), '', 'readonly'],
 		'$handle'       => ['bluesky_handle', DI::l10n()->t('Bluesky handle'), $handle],
 		'$did'          => ['bluesky_did', DI::l10n()->t('Bluesky DID'), $did, DI::l10n()->t('This is the unique identifier. It will be fetched automatically, when the handle is entered.'), '', 'readonly'],
@@ -404,11 +430,12 @@ function bluesky_settings_post(array &$b)
 
 	$handle = trim($_POST['bluesky_handle'], ' @');
 
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'post',            intval($_POST['bluesky']));
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default', intval($_POST['bluesky_bydefault']));
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'handle',          $handle);
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'import',          intval($_POST['bluesky_import']));
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'import_feeds',    intval($_POST['bluesky_import_feeds']));
+	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'post',             intval($_POST['bluesky']));
+	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default',  intval($_POST['bluesky_bydefault']));
+	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'handle',           $handle);
+	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'import',           intval($_POST['bluesky_import']));
+	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'import_feeds',     intval($_POST['bluesky_import_feeds']));
+	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'friendica_handle', intval($_POST['bluesky_friendica_handle']));
 
 	if (!empty($handle)) {
 		if (empty($old_did) || $old_handle != $handle) {
@@ -1533,6 +1560,7 @@ function bluesky_get_contact(stdClass $author, int $uid, int $fetch_uid): array
 function bluesky_get_contact_fields(stdClass $author, int $uid, int $fetch_uid, bool $update): array
 {
 	$nick = $author->handle ?? $author->did;
+	$name = $author->displayName ?? $nick;
 	$fields = [
 		'uid'      => $uid,
 		'network'  => Protocol::BLUESKY,
@@ -1544,7 +1572,7 @@ function bluesky_get_contact_fields(stdClass $author, int $uid, int $fetch_uid,
 		'url'      => $author->did,
 		'nurl'     => $author->did,
 		'alias'    => BLUESKY_WEB . '/profile/' . $nick,
-		'name'     => $author->displayName ?? $nick,
+		'name'     => $name ?: $nick,
 		'nick'     => $nick,
 		'addr'     => $nick,
 	];
diff --git a/bluesky/lang/C/messages.po b/bluesky/lang/C/messages.po
index 132e608a..0d69cc10 100644
--- a/bluesky/lang/C/messages.po
+++ b/bluesky/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-06 06:30+0000\n"
+"POT-Creation-Date: 2024-02-28 03:05+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,100 +17,129 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: bluesky.php:336
+#: bluesky.php:325
+msgid "Save Settings"
+msgstr ""
+
+#: bluesky.php:326
+msgid "Allow your users to use your hostname for their Bluesky handles"
+msgstr ""
+
+#: bluesky.php:326
+msgid ""
+"Before enabling this option, you have to download and configure the bluesky-"
+"handles repository on your system. See https://git.friendi.ca/heluecht/"
+"bluesky-handles"
+msgstr ""
+
+#: bluesky.php:354
+#, php-format
+msgid "Allow to use %s as your Bluesky handle."
+msgstr ""
+
+#: bluesky.php:354
+#, php-format
+msgid ""
+"When enabled, you can use %s as your Bluesky handle. After you enabled this "
+"option, please go to https://bsky.app/settings and select to change your "
+"handle. Select that you have got your own domain. Then enter %s and select "
+"\"No DNS Panel\". Then select \"Verify Text File\"."
+msgstr ""
+
+#: bluesky.php:361
 msgid "Enable Bluesky Post Addon"
 msgstr ""
 
-#: bluesky.php:337
+#: bluesky.php:362
 msgid "Post to Bluesky by default"
 msgstr ""
 
-#: bluesky.php:338
+#: bluesky.php:363
 msgid "Import the remote timeline"
 msgstr ""
 
-#: bluesky.php:339
+#: bluesky.php:364
 msgid "Import the pinned feeds"
 msgstr ""
 
-#: bluesky.php:339
+#: bluesky.php:364
 msgid ""
 "When activated, Posts will be imported from all the feeds that you pinned in "
 "Bluesky."
 msgstr ""
 
-#: bluesky.php:340
+#: bluesky.php:366
 msgid "Personal Data Server"
 msgstr ""
 
-#: bluesky.php:340
+#: bluesky.php:366
 msgid "The personal data server (PDS) is the system that hosts your profile."
 msgstr ""
 
-#: bluesky.php:341
+#: bluesky.php:367
 msgid "Bluesky handle"
 msgstr ""
 
-#: bluesky.php:342
+#: bluesky.php:368
 msgid "Bluesky DID"
 msgstr ""
 
-#: bluesky.php:342
+#: bluesky.php:368
 msgid ""
 "This is the unique identifier. It will be fetched automatically, when the "
 "handle is entered."
 msgstr ""
 
-#: bluesky.php:343
+#: bluesky.php:369
 msgid "Bluesky app password"
 msgstr ""
 
-#: bluesky.php:343
+#: bluesky.php:369
 msgid ""
 "Please don't add your real password here, but instead create a specific app "
 "password in the Bluesky settings."
 msgstr ""
 
-#: bluesky.php:349
+#: bluesky.php:375
 msgid "Bluesky Import/Export"
 msgstr ""
 
-#: bluesky.php:359
+#: bluesky.php:385
 msgid ""
 "You are not authenticated. Please enter your handle and the app password."
 msgstr ""
 
-#: bluesky.php:379
+#: bluesky.php:405
 msgid ""
 "You are authenticated to Bluesky. For security reasons the password isn't "
 "stored."
 msgstr ""
 
-#: bluesky.php:381
+#: bluesky.php:407
 msgid ""
 "The communication with the personal data server service (PDS) is established."
 msgstr ""
 
-#: bluesky.php:383
+#: bluesky.php:409
 msgid "Communication issues with the personal data server service (PDS)."
 msgstr ""
 
-#: bluesky.php:385
+#: bluesky.php:411
 msgid ""
 "The DID for the provided handle could not be detected. Please check if you "
 "entered the correct handle."
 msgstr ""
 
-#: bluesky.php:387
+#: bluesky.php:413
 msgid "The personal data server service (PDS) could not be detected."
 msgstr ""
 
-#: bluesky.php:389
+#: bluesky.php:415
 msgid ""
 "The authentication with the provided handle and password failed. Please "
 "check if you entered the correct password."
 msgstr ""
 
-#: bluesky.php:457
+#: bluesky.php:484
 msgid "Post to Bluesky"
 msgstr ""
diff --git a/bluesky/templates/admin.tpl b/bluesky/templates/admin.tpl
new file mode 100644
index 00000000..7b752a88
--- /dev/null
+++ b/bluesky/templates/admin.tpl
@@ -0,0 +1,2 @@
+{{include file="field_checkbox.tpl" field=$friendica_handles}}
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/bluesky/templates/connector_settings.tpl b/bluesky/templates/connector_settings.tpl
index db5ac5d5..f50e9cc6 100644
--- a/bluesky/templates/connector_settings.tpl
+++ b/bluesky/templates/connector_settings.tpl
@@ -3,6 +3,7 @@
 {{include file="field_checkbox.tpl" field=$bydefault}}
 {{include file="field_checkbox.tpl" field=$import}}
 {{include file="field_checkbox.tpl" field=$import_feeds}}
+{{include file="field_checkbox.tpl" field=$custom_handle}}
 {{include file="field_input.tpl" field=$pds}}
 {{include file="field_input.tpl" field=$handle}}
 {{include file="field_input.tpl" field=$did}}

From 2ee78d2f0b771871817440e22abf96de4bc45561 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 2 Mar 2024 13:32:11 +0000
Subject: [PATCH 020/294] Bluesky: Handle media links and shared posts

---
 bluesky/bluesky.php                      | 86 ++++++++++++++++++++++--
 bluesky/templates/connector_settings.tpl |  4 +-
 2 files changed, 82 insertions(+), 8 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 5fc0a4f0..cdedb07a 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -717,8 +717,24 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
 		$language = '';
 	}
 
-	$did  = DI::pConfig()->get($uid, 'bluesky', 'did');
-	$urls = bluesky_get_urls(Post\Media::removeFromBody($item['body']));
+	$item['body'] = Post\Media::removeFromBody($item['body']);
+
+	foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::AUDIO, Post\Media::VIDEO, Post\Media::ACTIVITY]) as $media) {
+		if (strpos($item['body'], $media['url']) === false) {
+			$item['body'] .= "\n[url]" . $media['url'] . "[/url]\n";
+		}
+	}
+	
+	if (!empty($item['quote-uri-id'])) {
+		$quote = Post::selectFirstPost(['uri', 'plink'], ['uri-id' => $item['quote-uri-id']]);
+		if (!empty($quote)) {
+			if ((strpos($item['body'], $quote['plink'] ?: $quote['uri']) === false) && (strpos($item['body'], $quote['uri']) === false)) {
+				$item['body'] .= "\n[url]" . ($quote['plink'] ?: $quote['uri']) . "[/url]\n";
+			}
+		}
+	}
+	
+	$urls = bluesky_get_urls($item['body']);
 	$item['body'] = $urls['body'];
 
 	$msg = Plaintext::getPost($item, 300, false, BBCode::BLUESKY);
@@ -756,7 +772,7 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
 
 		$post = [
 			'collection' => 'app.bsky.feed.post',
-			'repo'       => $did,
+			'repo'       => DI::pConfig()->get($uid, 'bluesky', 'did'),
 			'record'     => $record
 		];
 
@@ -1646,13 +1662,59 @@ function bluesky_get_preferences(int $uid): stdClass
 	return $data;
 }
 
-function bluesky_get_did(string $handle): string
+function bluesky_get_did_by_wellknown(string $handle): string
 {
-	$data = bluesky_get(BLUESKY_PDS . '/xrpc/com.atproto.identity.resolveHandle?handle=' . urlencode($handle));
-	if (empty($data)) {
+	$curlResult = DI::httpClient()->get('http://' . $handle . '/.well-known/atproto-did');
+	if ($curlResult->isSuccess() && substr($curlResult->getBodyString(), 0, 4) == 'did:') {
+		$did = $curlResult->getBodyString();
+		if (!bluesky_valid_did($did, $handle)) {
+			Logger::notice('Invalid DID', ['handle' => $handle, 'did' => $did]);	
+			return '';
+		}
+		Logger::debug('Got DID by wellknown', ['handle' => $handle, 'did' => $did]);
+		return $did;
+	}
+	return '';
+}
+
+function bluesky_get_did_by_dns(string $handle): string
+{
+	$records = @dns_get_record('_atproto.' . $handle . '.', DNS_TXT);
+	if (empty($records)) {
 		return '';
 	}
-	Logger::debug('Got DID', ['return' => $data]);
+	foreach ($records as $record) {
+		if (!empty($record['txt']) && substr($record['txt'], 0, 4) == 'did=') {
+			$did = substr($record['txt'], 4);
+			if (!bluesky_valid_did($did, $handle)) {
+				Logger::notice('Invalid DID', ['handle' => $handle, 'did' => $did]);	
+				return '';
+			}
+			Logger::debug('Got DID by DNS', ['handle' => $handle, 'did' => $did]);
+			return $did;
+		}
+	}
+	return '';
+}
+
+function bluesky_get_did(string $handle): string
+{
+	// Deactivated at the moment, since it isn't reliable by now
+	//$did = bluesky_get_did_by_dns($handle);
+	//if ($did != '') {
+	//	return $did;
+	//}
+	
+	//$did = bluesky_get_did_by_wellknown($handle);
+	//if ($did != '') {
+	//	return $did;
+	//}
+	
+	$data = bluesky_get(BLUESKY_PDS . '/xrpc/com.atproto.identity.resolveHandle?handle=' . urlencode($handle));
+	if (empty($data) || empty($data->did)) {
+		return '';
+	}
+	Logger::debug('Got DID by PDS call', ['handle' => $handle, 'did' => $data->did]);
 	return $data->did;
 }
 
@@ -1688,6 +1750,16 @@ function bluesky_get_pds(string $did): ?string
 	return null;
 }
 
+function bluesky_valid_did(string $did, string $handle): bool
+{
+	$data = bluesky_get(BLUESKY_DIRECTORY . '/' . $did);
+	if (empty($data) || empty($data->alsoKnownAs)) {
+		return false;
+	}
+
+	return in_array('at://' . $handle, $data->alsoKnownAs);
+}
+
 function bluesky_get_token(int $uid): string
 {
 	$token   = DI::pConfig()->get($uid, 'bluesky', 'access_token');
diff --git a/bluesky/templates/connector_settings.tpl b/bluesky/templates/connector_settings.tpl
index f50e9cc6..3ebea827 100644
--- a/bluesky/templates/connector_settings.tpl
+++ b/bluesky/templates/connector_settings.tpl
@@ -3,7 +3,9 @@
 {{include file="field_checkbox.tpl" field=$bydefault}}
 {{include file="field_checkbox.tpl" field=$import}}
 {{include file="field_checkbox.tpl" field=$import_feeds}}
-{{include file="field_checkbox.tpl" field=$custom_handle}}
+{{if $custom_handle}}
+	{{include file="field_checkbox.tpl" field=$custom_handle}}
+{{/if}}
 {{include file="field_input.tpl" field=$pds}}
 {{include file="field_input.tpl" field=$handle}}
 {{include file="field_input.tpl" field=$did}}

From 58cb9337790883569cdee8c788e415e923dbf2d4 Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sun, 3 Mar 2024 17:47:42 +0800
Subject: [PATCH 021/294] do not mail dislike messages

---
 mailstream/mailstream.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 968ee4c0..b513cf36 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -169,6 +169,10 @@ function mailstream_post_hook(array &$item)
 			Logger::debug('mailstream: like item ' . $item['id']);
 			return;
 		}
+		if ($item['verb'] == Activity::DISLIKE) {
+			Logger::debug('mailstream: dislike item ' . $item['id']);
+			return;
+		}
 	}
 
 	$message_id = mailstream_generate_id($item['uri']);

From dcafad573ea4320262e90e6107cbbd36faada2e0 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 3 Mar 2024 12:02:53 +0000
Subject: [PATCH 022/294] Pnut: Client Id/Secret can be set by admins

---
 pnut/README.md                        |  5 +-
 pnut/lang/C/messages.po               | 74 +++++++++++++++++++++++
 pnut/pnut.php                         | 86 ++++++++++++++++++---------
 pnut/templates/admin.tpl              |  3 +
 pnut/templates/connector_settings.tpl |  8 ++-
 5 files changed, 145 insertions(+), 31 deletions(-)
 create mode 100644 pnut/lang/C/messages.po
 create mode 100644 pnut/templates/admin.tpl

diff --git a/pnut/README.md b/pnut/README.md
index d935efe7..6f6a9224 100644
--- a/pnut/README.md
+++ b/pnut/README.md
@@ -2,4 +2,7 @@
 
 With this addon to friendica you can give your users the possibility to post their *public* messages to pnut.io. 
 
-No setup is needed for the admins to make it work for their users.
+No setup is needed for the admins to make it work for their users, however it is possible for the admin to create a client, so that the users don't have to.
+
+To do so, go to https://pnut.io/dev and scroll down to "Create New Client". Enter a name of your choice and enter your Friendica host name as the website. Use https://(yourhost.name)/pnut/connect as a redirect url, replace "(yourhost.name)" with the host name of your system.
+Limit the scope to "basic,files,follow,polls,presence,stream,update_profile,write_post"
\ No newline at end of file
diff --git a/pnut/lang/C/messages.po b/pnut/lang/C/messages.po
new file mode 100644
index 00000000..89b065fd
--- /dev/null
+++ b/pnut/lang/C/messages.po
@@ -0,0 +1,74 @@
+# ADDON pnut
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica pnut addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-03-03 11:53+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: pnut.php:42
+msgid "Permission denied."
+msgstr ""
+
+#: pnut.php:79
+msgid "You are now authenticated with pnut.io."
+msgstr ""
+
+#: pnut.php:82
+msgid "Error fetching token. Please try again."
+msgstr ""
+
+#: pnut.php:85
+msgid "return to the connector page"
+msgstr ""
+
+#: pnut.php:103
+msgid "Save Settings"
+msgstr ""
+
+#: pnut.php:104 pnut.php:150
+msgid "Client ID"
+msgstr ""
+
+#: pnut.php:105 pnut.php:151
+msgid "Client Secret"
+msgstr ""
+
+#: pnut.php:139
+msgid "Authenticate with pnut.io"
+msgstr ""
+
+#: pnut.php:143
+msgid "Disconnect"
+msgstr ""
+
+#: pnut.php:148
+msgid "Enable Pnut Post Addon"
+msgstr ""
+
+#: pnut.php:149
+msgid "Post to Pnut by default"
+msgstr ""
+
+#: pnut.php:152
+msgid "Access Token"
+msgstr ""
+
+#: pnut.php:161
+msgid "Pnut Export"
+msgstr ""
+
+#: pnut.php:203
+msgid "Post to Pnut"
+msgstr ""
diff --git a/pnut/pnut.php b/pnut/pnut.php
index f278fb55..e84f208b 100644
--- a/pnut/pnut.php
+++ b/pnut/pnut.php
@@ -2,7 +2,7 @@
 /**
  * Name: Pnut Connector
  * Description: Post to pnut.io
- * Version: 0.1.1
+ * Version: 0.1.2
  * Author: Morgan McMillian <https://social.clacks.network/profile/spacenerdmo>
  * Status: In Development
  */
@@ -18,12 +18,10 @@ use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\DI;
-use Friendica\Model\Item;
 use Friendica\Model\Photo;
-use Friendica\Object\Image;
-use Friendica\Network\HTTPClient\Client\HttpClientAccept;
-use Friendica\Network\HTTPClient\Client\HttpClientOptions;
-use Friendica\Util\DateTimeFormat;
+use phpnut\phpnutException;
+
+const PNUT_LIMIT = 256;
 
 function pnut_install()
 {
@@ -63,19 +61,25 @@ function pnut_content()
 
 function pnut_connect()
 {
-	$client_id     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'client_id');
-	$client_secret = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'client_secret');
+	$client_id     = DI::config()->get('pnut', 'client_id');
+	$client_secret = DI::config()->get('pnut', 'client_secret');
+
+	if (empty($client_id) || empty($client_secret)) {
+		$client_id     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'client_id');
+		$client_secret = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'client_secret');
+	}
+
 	$callback_url = DI::baseUrl() . '/pnut/connect';
 
 	$nut = new phpnut\phpnut($client_id, $client_secret);
 
 	try {
 		$token = $nut->getAccessToken($callback_url);
-		Logger::debug('TOKEN', [$token]);
+		Logger::debug('Got Token', [$token]);
 		$o = DI::l10n()->t('You are now authenticated with pnut.io.');
 		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pnut', 'access_token', $token);
 	} catch (phpnutException $e) {
-		$o = DI::l10n()->t('Error fetching token. Please try again.');
+		$o = DI::l10n()->t('Error fetching token. Please try again.', ['code' => $e->getCode(), 'message' => $e->getMessage()]);
 	}
 
 	$o .= '<br /><a href="' . DI::baseUrl() . '/settings/connectors">' . DI::l10n()->t("return to the connector page").'</a>';
@@ -88,6 +92,26 @@ function pnut_load_config(ConfigFileManager $loader)
 	DI::app()->getConfigCache()->load($loader->loadAddonConfig('pnut'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
+function pnut_addon_admin(string &$o)
+{
+	$client_id     = DI::config()->get('pnut', 'client_id');
+	$client_secret = DI::config()->get('pnut', 'client_secret');
+
+	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/pnut/');
+
+	$o = Renderer::replaceMacros($t, [
+		'$submit'        => DI::l10n()->t('Save Settings'),
+		'$client_id'     => ['pnut_client_id', DI::l10n()->t('Client ID'), $client_id],
+		'$client_secret' => ['pnut_client_secret', DI::l10n()->t('Client Secret'), $client_secret],
+	]);
+}
+
+function pnut_addon_admin_post()
+{
+	DI::config()->set('pnut', 'client_id',     $_POST['pnut_client_id']);
+	DI::config()->set('pnut', 'client_secret', $_POST['pnut_client_secret']);
+}
+
 function pnut_settings(array &$data)
 {
 	if (!DI::userSession()->getLocalUserId()) {
@@ -99,12 +123,15 @@ function pnut_settings(array &$data)
 
 	$enabled       = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post') ?? false;
 	$def_enabled   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post_by_default') ?? false;
-	$client_id     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'client_id');
-	$client_secret = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'client_secret');
+	$client_id     = DI::config()->get('pnut', 'client_id');
+	$client_secret = DI::config()->get('pnut', 'client_secret');
 	$token         = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'access_token');
-
-	Logger::debug('CLIENT_ID', [$client_id]);
-	Logger::debug('CLIENT_SECRET', [$client_secret]);
+	
+	$user_client = empty($client_id) || empty($client_secret);
+	if ($user_client) {
+		$client_id     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'client_id');
+		$client_secret = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'client_secret');
+	}
 
 	if (!empty($client_id) && !empty($client_secret) && empty($token)) {
 		$nut = new phpnut\phpnut($client_id, $client_secret);
@@ -118,19 +145,20 @@ function pnut_settings(array &$data)
 
 	$t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/pnut/');
 	$html = Renderer::replaceMacros($t, [
-		'$enable'        => ['pnut', DI::l10n()->t('Enable Pnut Post Addon'), $enabled],
-		'$bydefault'     => ['pnut_bydefault', DI::l10n()->t('Post to Pnut by default'), $def_enabled],
-		'$client_id'     => ['pnut_client_id', DI::l10n()->t('Client ID'), $client_id],
-		'$client_secret' => ['pnut_client_secret', DI::l10n()->t('Client Secret'), $client_secret],
-		'$access_token'  => ['pnut_access_token', DI::l10n()->t('Access Token'), $token, '', '', 'readonly'],
-		'$authorize_url' => $authorize_url ?? '',
+		'$enable'         => ['pnut', DI::l10n()->t('Enable Pnut Post Addon'), $enabled],
+		'$bydefault'      => ['pnut_bydefault', DI::l10n()->t('Post to Pnut by default'), $def_enabled],
+		'$client_id'      => ['pnut_client_id', DI::l10n()->t('Client ID'), $client_id],
+		'$client_secret'  => ['pnut_client_secret', DI::l10n()->t('Client Secret'), $client_secret],
+		'$access_token'   => ['pnut_access_token', DI::l10n()->t('Access Token'), $token, '', '', 'readonly'],
+		'$authorize_url'  => $authorize_url ?? '',
 		'$authorize_text' => $authorize_text ?? '',
-		'$disconn_btn' => $disconn_btn ?? '',
+		'$disconn_btn'    => $disconn_btn ?? '',
+		'user_client'     => $user_client,
 	]);
 
 	$data = [
 		'connector' => 'pnut',
-		'title'     => DI::l10n()->t('Pnut Import/Export'),
+		'title'     => DI::l10n()->t('Pnut Export'),
 		'image'     => 'addon/pnut/pnut.svg',
 		'enabled'   => $enabled,
 		'html'      => $html,
@@ -152,8 +180,12 @@ function pnut_settings_post(array &$b)
 	} else {
 		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pnut', 'post',            intval($_POST['pnut']));
 		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pnut', 'post_by_default', intval($_POST['pnut_bydefault']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pnut', 'client_id',       $_POST['pnut_client_id']);
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pnut', 'client_secret',   $_POST['pnut_client_secret']);
+		if (!empty($_POST['pnut_client_id'])) {
+			DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pnut', 'client_id',     $_POST['pnut_client_id']);
+		}
+		if (!empty($_POST['pnut_client_secret'])) {
+			DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pnut', 'client_secret', $_POST['pnut_client_secret']);
+		}
 	}
 }
 
@@ -243,7 +275,7 @@ function pnut_post_hook(array &$b)
 	$token = DI::pConfig()->get($b['uid'], 'pnut', 'access_token');
 	$nut = new phpnut\phpnut($token);
 
-	$msgarr = Plaintext::getPost($b, 256, true, BBCode::EXTERNAL);
+	$msgarr = Plaintext::getPost($b, PNUT_LIMIT, true, BBCode::EXTERNAL);
 	$text = $msgarr['text'];
 	$raw = [];
 
@@ -275,7 +307,7 @@ function pnut_post_hook(array &$b)
 			$picturedata = Photo::getImageForPhoto($photo);
 
 			Logger::debug('PNUT photo', $photo);
-			$picurefile = System::getTempPath() . DIRECTORY_SEPARATOR . $photo['filename'];
+			$picurefile = tempnam(System::getTempPath(), 'pnut');
 			file_put_contents($picurefile, $picturedata);
 			Logger::debug('PNUT got file?', ['filename' => $picurefile]);
 			$imagefile = $nut->createFile($picurefile, $fileraw);
diff --git a/pnut/templates/admin.tpl b/pnut/templates/admin.tpl
new file mode 100644
index 00000000..b4cc3651
--- /dev/null
+++ b/pnut/templates/admin.tpl
@@ -0,0 +1,3 @@
+{{include file="field_input.tpl" field=$client_id}}
+{{include file="field_input.tpl" field=$client_secret}}
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/pnut/templates/connector_settings.tpl b/pnut/templates/connector_settings.tpl
index 7d1ad3f2..6662a5ae 100644
--- a/pnut/templates/connector_settings.tpl
+++ b/pnut/templates/connector_settings.tpl
@@ -1,9 +1,11 @@
 <p>{{$status}}</p>
 {{include file="field_checkbox.tpl" field=$enable}}
 {{include file="field_checkbox.tpl" field=$bydefault}}
-{{include file="field_input.tpl" field=$client_id}}
-{{include file="field_input.tpl" field=$client_secret}}
-{{include file="field_input.tpl" field=$access_token}}
+{{if $user_client}}
+	{{include file="field_input.tpl" field=$client_id}}
+	{{include file="field_input.tpl" field=$client_secret}}
+	{{include file="field_input.tpl" field=$access_token}}
+{{/if}}
 {{if $authorize_url}}
 	<a href="{{$authorize_url}}">{{$authorize_text}}</a>
 {{/if}}

From 90ec1bc83816518dca292db06abe6440d4425195 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 3 Mar 2024 17:10:09 +0000
Subject: [PATCH 023/294] Newlines added

---
 pnut/README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pnut/README.md b/pnut/README.md
index 6f6a9224..798174b8 100644
--- a/pnut/README.md
+++ b/pnut/README.md
@@ -4,5 +4,7 @@ With this addon to friendica you can give your users the possibility to post the
 
 No setup is needed for the admins to make it work for their users, however it is possible for the admin to create a client, so that the users don't have to.
 
-To do so, go to https://pnut.io/dev and scroll down to "Create New Client". Enter a name of your choice and enter your Friendica host name as the website. Use https://(yourhost.name)/pnut/connect as a redirect url, replace "(yourhost.name)" with the host name of your system.
+To do so, go to https://pnut.io/dev and scroll down to "Create New Client".
+Enter a name of your choice and enter your Friendica host name as the website.
+Use https://(yourhost.name)/pnut/connect as a redirect url, replace "(yourhost.name)" with the host name of your system.
 Limit the scope to "basic,files,follow,polls,presence,stream,update_profile,write_post"
\ No newline at end of file

From b6d706822a2c3e484d5901880492268409a4972e Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 4 Mar 2024 05:37:04 +0000
Subject: [PATCH 024/294] Blockbot: You can now allow social media agents

---
 blockbot/blockbot.php        | 51 +++++++++++++++++++++++++-----------
 blockbot/lang/C/messages.po  | 18 ++++++++++---
 blockbot/templates/admin.tpl |  1 +
 3 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php
index 10327edf..62a7f566 100644
--- a/blockbot/blockbot.php
+++ b/blockbot/blockbot.php
@@ -27,16 +27,18 @@ function blockbot_addon_admin(string &$o)
 	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/blockbot/');
 
 	$o = Renderer::replaceMacros($t, [
-		'$submit' => DI::l10n()->t('Save Settings'),
-		'$good_crawlers' => ['good_crawlers', DI::l10n()->t('Allow "good" crawlers'), DI::config()->get('blockbot', 'good_crawlers'), DI::l10n()->t("Don't block fediverse crawlers, relay servers and other bots with good purposes.")],
-		'$block_gab' => ['block_gab', DI::l10n()->t('Block GabSocial'), DI::config()->get('blockbot', 'block_gab'), DI::l10n()->t('Block the software GabSocial. This will block every access for that software. You can block dedicated gab instances in the blocklist settings in the admin section.')],
-		'$training' => ['training', DI::l10n()->t('Training mode'), DI::config()->get('blockbot', 'training'), DI::l10n()->t("Activates the training mode. This is only meant for developing purposes. Don't activate this on a production machine. This can cut communication with some systems.")],
+		'$submit'             => DI::l10n()->t('Save Settings'),
+		'$good_crawlers'      => ['good_crawlers', DI::l10n()->t('Allow "good" crawlers'), DI::config()->get('blockbot', 'good_crawlers'), DI::l10n()->t("Don't block fediverse crawlers, relay servers and other bots with good purposes.")],
+		'$socialmedia_agents' => ['socialmedia_agents', DI::l10n()->t('Allow preview agents'), DI::config()->get('blockbot', 'socialmedia_agents'), DI::l10n()->t("Don't block agents from social media systems that want to generate preview data for links that had been set by their users.")],
+		'$block_gab'          => ['block_gab', DI::l10n()->t('Block GabSocial'), DI::config()->get('blockbot', 'block_gab'), DI::l10n()->t('Block the software GabSocial. This will block every access for that software. You can block dedicated gab instances in the blocklist settings in the admin section.')],
+		'$training'           => ['training', DI::l10n()->t('Training mode'), DI::config()->get('blockbot', 'training'), DI::l10n()->t("Activates the training mode. This is only meant for developing purposes. Don't activate this on a production machine. This can cut communication with some systems.")],
 	]);
 }
 
 function blockbot_addon_admin_post()
 {
 	DI::config()->set('blockbot', 'good_crawlers', $_POST['good_crawlers'] ?? false);
+	DI::config()->set('blockbot', 'socialmedia_agents', $_POST['socialmedia_agents'] ?? false);
 	DI::config()->set('blockbot', 'block_gab', $_POST['block_gab'] ?? false);
 	DI::config()->set('blockbot', 'training', $_POST['training'] ?? false);
 }
@@ -53,34 +55,41 @@ function blockbot_init_1()
 	$good_agents = [
 		'fediverse.space crawler', 'fediverse.network crawler', 'Active_Pods_CheckBot_3.0',
 		'Social-Relay/', 'Test Certificate Info', 'Uptimebot/', 'GNUSocialBot', 'UptimeRobot/',
-		'PTST/', 'Zabbix', 'Poduptime/'
+		'PTST/', 'Zabbix', 'Poduptime/', 'FediFetcher', 'lemmy-stats-crawler',
+		'FedditLemmyverseCrawler/', 'kbinBot/', 'lemmy-explorer-crawler/',
 	];
 
-	// List of known crawlers.
+	// List of agents from social media systems that fetch preview data via opem graph or twitter cards
+	$socialmedia_agents = ['Twitterbot/', 'facebookexternalhit/', 'SkypeUriPreview Preview/',
+		'TelegramBot', 'WhatsApp/', 'github-camo', 'Bluesky Cardyb/', 'XING-contenttabreceiver/', 
+		'LinkedInBot/', 'Instagram ', 'Synapse (bot; ', 'Discordbot/'];
+
+	// List of known unwanted crawlers.
 	$agents = [
 		'SemrushBot', 's~feedly-nikon3', 'Qwantify/Bleriot/', 'ltx71', 'Sogou web spider/',
-		'Diffbot/', 'Twitterbot/', 'YisouSpider', 'evc-batch/', 'LivelapBot/', 'TrendsmapResolver/',
+		'Diffbot/', 'YisouSpider', 'evc-batch/', 'LivelapBot/', 'TrendsmapResolver/',
 		'PaperLiBot/', 'Nuzzel', 'um-LN/', 'Google Favicon', 'Datanyze', 'BLEXBot/', '360Spider',
 		'adscanner/', 'HeadlessChrome', 'wpif', 'startmebot/', 'Googlebot/', 'Applebot/',
-		'facebookexternalhit/', 'GoogleImageProxy', 'bingbot/', 'heritrix/', 'ldspider',
+		'GoogleImageProxy', 'bingbot/', 'heritrix/', 'ldspider',
 		'AwarioRssBot/', 'TweetmemeBot/', 'dcrawl/', 'PhantomJS/', 'Googlebot-Image/',
 		'CrowdTanglebot/', 'Mediapartners-Google', 'Baiduspider/', 'datagnionbot',
 		'MegaIndex.ru/', 'SMUrlExpander', 'Hatena-Favicon/', 'Wappalyzer', 'FlipboardProxy/',
 		'NetcraftSurveyAgent/', 'Dataprovider.com', 'SMTBot/', 'Nimbostratus-Bot/',
 		'DuckDuckGo-Favicons-Bot/', 'IndieWebCards/', 'proximic', 'netEstate NE Crawler',
-		'AhrefsBot/', 'YandexBot/', 'Exabot/', 'Mediumbot-MetaTagFetcher/', 'WhatsApp/',
-		'TelegramBot', 'SurdotlyBot/', 'BingPreview/', 'SabsimBot/', 'CCBot/', 'WbSrch/',
+		'AhrefsBot/', 'YandexBot/', 'Exabot/', 'Mediumbot-MetaTagFetcher/',
+		'SurdotlyBot/', 'BingPreview/', 'SabsimBot/', 'CCBot/', 'WbSrch/',
 		'DuckDuckBot-Https/', 'HTTP Banner Detection', 'YandexImages/', 'archive.org_bot',
 		'ArchiveTeam ArchiveBot/', 'yacybot', 'https://developers.google.com/+/web/snippet/',
-		'Scrapy/', 'github-camo', 'MJ12bot/', 'DotBot/', 'Pinterestbot/', 'Jooblebot/',
+		'Scrapy/', 'MJ12bot/', 'DotBot/', 'Pinterestbot/', 'Jooblebot/',
 		'Cliqzbot/', 'YaK/', 'Mediatoolkitbot', 'Snacktory', 'FunWebProducts', 'oBot/',
 		'7Siters/', 'KOCMOHABT', 'Google-SearchByImage', 'FemtosearchBot/',
 		'HubSpot Crawler', 'DomainStatsBot/', 'Re-re Studio', 'AwarioSmartBot/',
 		'SummalyBot/', 'DNSResearchBot/', 'PetalBot;', 'Nmap Scripting Engine;',
 		'Google-Apps-Script; beanserver;', 'woorankreview/', 'Seekport Crawler;', 'AHC/',
-		'SkypeUriPreview Preview/', 'Semanticbot/', 'Embed PHP library', 'XoviOnpageCrawler;',
+		'Semanticbot/', 'Embed PHP library', 'XoviOnpageCrawler;', 'Pinterest/',
 		'GetHPinfo.com-Bot/', 'BoardReader Favicon Fetcher', 'Google-Adwords-Instant', 'newspaper/',
-		'YurichevBot/', 'Crawling at Home Project', 'InfoTigerBot/'
+		'YurichevBot/', 'Crawling at Home Project', 'InfoTigerBot/',
+		'AdIdxBot/', 'MicrosoftPreview/', 'masscan/'
 	];
 
 	if (!DI::config()->get('blockbot', 'good_crawlers')) {
@@ -93,13 +102,23 @@ function blockbot_init_1()
 		}
 	}
 
+	if (!DI::config()->get('blockbot', 'socialmedia_agents')) {
+		$agents = array_merge($agents, $socialmedia_agents);
+	} else {
+		foreach ($socialmedia_agents as $socialmedia_agent) {
+			if (stristr($_SERVER['HTTP_USER_AGENT'], $socialmedia_agent)) {
+				return;
+			}
+		}
+	}
+
 	if (DI::config()->get('blockbot', 'block_gab')) {
 		$agents[] = 'GabSocial/';
 	}
 
 	foreach ($agents as $agent) {
 		if (stristr($_SERVER['HTTP_USER_AGENT'], $agent)) {
-			throw new ForbiddenException('Bots are not allowed');
+			throw new ForbiddenException('Bots are not allowed. If you consider this a mistake, create an issue at https://github.com/friendica/friendica');
 		}
 	}
 
@@ -125,7 +144,7 @@ function blockbot_init_1()
 		'lua-resty-http/', 'Tiny Tiny RSS/', 'Wget/', 'PostmanRuntime/',
 		'W3C_Validator/', 'NetNewsWire', 'FeedValidator/', 'theoldreader.com', 'axios/',
 		'Paw/', 'PeerTube/', 'fedi.inex.dev', 'FediDB/', 'index.community crawler',
-		'Slackbot-LinkExpanding'
+		'Slackbot-LinkExpanding', 'Firefish/', 'Takahe/', 'Akkoma ', 'Misskey/'
 	];
 
 	if (DI::config()->get('blockbot', 'good_crawlers')) {
@@ -140,5 +159,5 @@ function blockbot_init_1()
 	}
 
 	logger::notice('Blocked bot', $logdata);
-	throw new ForbiddenException('Bots are not allowed');
+	throw new ForbiddenException('Bots are not allowed. If you consider this a mistake, create an issue at https://github.com/friendica/friendica');
 }
diff --git a/blockbot/lang/C/messages.po b/blockbot/lang/C/messages.po
index 6f30e845..49371908 100644
--- a/blockbot/lang/C/messages.po
+++ b/blockbot/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-13 06:17+0000\n"
+"POT-Creation-Date: 2024-03-04 05:35+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -32,21 +32,31 @@ msgid ""
 msgstr ""
 
 #: blockbot.php:32
-msgid "Block GabSocial"
+msgid "Allow preview agents"
 msgstr ""
 
 #: blockbot.php:32
 msgid ""
+"Don't block agents from social media systems that want to generate preview "
+"data for links that had been set by their users."
+msgstr ""
+
+#: blockbot.php:33
+msgid "Block GabSocial"
+msgstr ""
+
+#: blockbot.php:33
+msgid ""
 "Block the software GabSocial. This will block every access for that "
 "software. You can block dedicated gab instances in the blocklist settings in "
 "the admin section."
 msgstr ""
 
-#: blockbot.php:33
+#: blockbot.php:34
 msgid "Training mode"
 msgstr ""
 
-#: blockbot.php:33
+#: blockbot.php:34
 msgid ""
 "Activates the training mode. This is only meant for developing purposes. "
 "Don't activate this on a production machine. This can cut communication with "
diff --git a/blockbot/templates/admin.tpl b/blockbot/templates/admin.tpl
index a6de1bd3..9f728d42 100644
--- a/blockbot/templates/admin.tpl
+++ b/blockbot/templates/admin.tpl
@@ -1,4 +1,5 @@
 {{include file="field_checkbox.tpl" field=$good_crawlers}}
+{{include file="field_checkbox.tpl" field=$socialmedia_agents}}
 {{include file="field_checkbox.tpl" field=$block_gab}}
 {{include file="field_checkbox.tpl" field=$training}}
 <div class="submit"><button type="submit" class="btn btn-primary" name="page_site" value="{{$submit}}">{{$submit}}</button></div>

From 3c0f4e3926768131ac4c093dc9ab1444cee3cca8 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Mon, 4 Mar 2024 01:16:49 -0500
Subject: [PATCH 025/294] [advancedcontentfilter] Stop using
 advancedcontentfilter_get_rules() outside of router context

- This used to work with Slim v2, but the new requirements for module functions broke it
---
 advancedcontentfilter/advancedcontentfilter.php | 4 ++--
 advancedcontentfilter/templates/settings.tpl    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index 55bc5005..418b253e 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -253,7 +253,7 @@ function advancedcontentfilter_content()
 				'cancel'            => DI::l10n()->t('Cancel'),
 			],
 			'$current_theme' => DI::app()->getCurrentTheme(),
-			'$rules' => advancedcontentfilter_get_rules(),
+			'$rules' => DBA::toArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => DI::userSession()->getLocalUserId()])),
 			'$form_security_token' => BaseModule::getFormSecurityToken()
 		]);
 	}
@@ -305,7 +305,7 @@ function advancedcontentfilter_build_fields($data)
  * API
  */
 
-function advancedcontentfilter_get_rules(ServerRequestInterface $request, ResponseInterface $response)
+function advancedcontentfilter_get_rules(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface
 {
 	if (!DI::userSession()->getLocalUserId()) {
 		throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));
diff --git a/advancedcontentfilter/templates/settings.tpl b/advancedcontentfilter/templates/settings.tpl
index c9dfbe3a..8b82e595 100644
--- a/advancedcontentfilter/templates/settings.tpl
+++ b/advancedcontentfilter/templates/settings.tpl
@@ -3,7 +3,7 @@
 	<div id="rules"></div>
 
 	<script>
-		var existingRules = {{$rules nofilter}};
+		var existingRules = {{$rules|json_encode nofilter}};
 
 		var messages = {
 	{{foreach $messages as $key => $value}}

From a05e429470fa6cac72ee28704967e896103a8d41 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 4 Mar 2024 15:27:44 +0000
Subject: [PATCH 026/294] Blockbot: Misskey-Crawler added

---
 blockbot/blockbot.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php
index 62a7f566..0f403588 100644
--- a/blockbot/blockbot.php
+++ b/blockbot/blockbot.php
@@ -51,7 +51,7 @@ function blockbot_init_1()
 
 	$logdata = ['agent' => $_SERVER['HTTP_USER_AGENT'], 'uri' => $_SERVER['REQUEST_URI']];
 
-	// List of "good" crawlers
+	// List of "good" crawlers, mostly from the fediverse.
 	$good_agents = [
 		'fediverse.space crawler', 'fediverse.network crawler', 'Active_Pods_CheckBot_3.0',
 		'Social-Relay/', 'Test Certificate Info', 'Uptimebot/', 'GNUSocialBot', 'UptimeRobot/',
@@ -59,10 +59,10 @@ function blockbot_init_1()
 		'FedditLemmyverseCrawler/', 'kbinBot/', 'lemmy-explorer-crawler/',
 	];
 
-	// List of agents from social media systems that fetch preview data via opem graph or twitter cards
+	// List of agents from social media systems that fetch preview data via opem graph or twitter cards.
 	$socialmedia_agents = ['Twitterbot/', 'facebookexternalhit/', 'SkypeUriPreview Preview/',
 		'TelegramBot', 'WhatsApp/', 'github-camo', 'Bluesky Cardyb/', 'XING-contenttabreceiver/', 
-		'LinkedInBot/', 'Instagram ', 'Synapse (bot; ', 'Discordbot/'];
+		'LinkedInBot/', 'Instagram ', 'Synapse (bot; ', 'Discordbot/', 'SummalyBot/'];
 
 	// List of known unwanted crawlers.
 	$agents = [
@@ -84,7 +84,7 @@ function blockbot_init_1()
 		'Cliqzbot/', 'YaK/', 'Mediatoolkitbot', 'Snacktory', 'FunWebProducts', 'oBot/',
 		'7Siters/', 'KOCMOHABT', 'Google-SearchByImage', 'FemtosearchBot/',
 		'HubSpot Crawler', 'DomainStatsBot/', 'Re-re Studio', 'AwarioSmartBot/',
-		'SummalyBot/', 'DNSResearchBot/', 'PetalBot;', 'Nmap Scripting Engine;',
+		'DNSResearchBot/', 'PetalBot;', 'Nmap Scripting Engine;',
 		'Google-Apps-Script; beanserver;', 'woorankreview/', 'Seekport Crawler;', 'AHC/',
 		'Semanticbot/', 'Embed PHP library', 'XoviOnpageCrawler;', 'Pinterest/',
 		'GetHPinfo.com-Bot/', 'BoardReader Favicon Fetcher', 'Google-Adwords-Instant', 'newspaper/',

From 0751b2ac1680612c9f15b338e5c4647952019012 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 5 Mar 2024 04:54:36 +0000
Subject: [PATCH 027/294] Blockbot: HTTP library section added

---
 blockbot/blockbot.php        | 109 +++++++++++++++++++----------------
 blockbot/lang/C/messages.po  |  19 ++++--
 blockbot/templates/admin.tpl |   1 +
 3 files changed, 74 insertions(+), 55 deletions(-)

diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php
index 0f403588..2c128e40 100644
--- a/blockbot/blockbot.php
+++ b/blockbot/blockbot.php
@@ -30,6 +30,7 @@ function blockbot_addon_admin(string &$o)
 		'$submit'             => DI::l10n()->t('Save Settings'),
 		'$good_crawlers'      => ['good_crawlers', DI::l10n()->t('Allow "good" crawlers'), DI::config()->get('blockbot', 'good_crawlers'), DI::l10n()->t("Don't block fediverse crawlers, relay servers and other bots with good purposes.")],
 		'$socialmedia_agents' => ['socialmedia_agents', DI::l10n()->t('Allow preview agents'), DI::config()->get('blockbot', 'socialmedia_agents'), DI::l10n()->t("Don't block agents from social media systems that want to generate preview data for links that had been set by their users.")],
+		'$http_libraries'     => ['http_libraries', DI::l10n()->t('Allow generic HTTP libraries'), DI::config()->get('blockbot', 'http_libraries'), DI::l10n()->t("Don't block agents from generic HTTP libraries that could be used for good or for bad and that currently can't be traced back to any known Fediverse project.")],
 		'$block_gab'          => ['block_gab', DI::l10n()->t('Block GabSocial'), DI::config()->get('blockbot', 'block_gab'), DI::l10n()->t('Block the software GabSocial. This will block every access for that software. You can block dedicated gab instances in the blocklist settings in the admin section.')],
 		'$training'           => ['training', DI::l10n()->t('Training mode'), DI::config()->get('blockbot', 'training'), DI::l10n()->t("Activates the training mode. This is only meant for developing purposes. Don't activate this on a production machine. This can cut communication with some systems.")],
 	]);
@@ -39,6 +40,7 @@ function blockbot_addon_admin_post()
 {
 	DI::config()->set('blockbot', 'good_crawlers', $_POST['good_crawlers'] ?? false);
 	DI::config()->set('blockbot', 'socialmedia_agents', $_POST['socialmedia_agents'] ?? false);
+	DI::config()->set('blockbot', 'http_libraries', $_POST['http_libraries'] ?? false);
 	DI::config()->set('blockbot', 'block_gab', $_POST['block_gab'] ?? false);
 	DI::config()->set('blockbot', 'training', $_POST['training'] ?? false);
 }
@@ -51,19 +53,6 @@ function blockbot_init_1()
 
 	$logdata = ['agent' => $_SERVER['HTTP_USER_AGENT'], 'uri' => $_SERVER['REQUEST_URI']];
 
-	// List of "good" crawlers, mostly from the fediverse.
-	$good_agents = [
-		'fediverse.space crawler', 'fediverse.network crawler', 'Active_Pods_CheckBot_3.0',
-		'Social-Relay/', 'Test Certificate Info', 'Uptimebot/', 'GNUSocialBot', 'UptimeRobot/',
-		'PTST/', 'Zabbix', 'Poduptime/', 'FediFetcher', 'lemmy-stats-crawler',
-		'FedditLemmyverseCrawler/', 'kbinBot/', 'lemmy-explorer-crawler/',
-	];
-
-	// List of agents from social media systems that fetch preview data via opem graph or twitter cards.
-	$socialmedia_agents = ['Twitterbot/', 'facebookexternalhit/', 'SkypeUriPreview Preview/',
-		'TelegramBot', 'WhatsApp/', 'github-camo', 'Bluesky Cardyb/', 'XING-contenttabreceiver/', 
-		'LinkedInBot/', 'Instagram ', 'Synapse (bot; ', 'Discordbot/', 'SummalyBot/'];
-
 	// List of known unwanted crawlers.
 	$agents = [
 		'SemrushBot', 's~feedly-nikon3', 'Qwantify/Bleriot/', 'ltx71', 'Sogou web spider/',
@@ -86,40 +75,53 @@ function blockbot_init_1()
 		'HubSpot Crawler', 'DomainStatsBot/', 'Re-re Studio', 'AwarioSmartBot/',
 		'DNSResearchBot/', 'PetalBot;', 'Nmap Scripting Engine;',
 		'Google-Apps-Script; beanserver;', 'woorankreview/', 'Seekport Crawler;', 'AHC/',
-		'Semanticbot/', 'Embed PHP library', 'XoviOnpageCrawler;', 'Pinterest/',
+		'Semanticbot/', 'XoviOnpageCrawler;', 'Pinterest/',
 		'GetHPinfo.com-Bot/', 'BoardReader Favicon Fetcher', 'Google-Adwords-Instant', 'newspaper/',
-		'YurichevBot/', 'Crawling at Home Project', 'InfoTigerBot/',
-		'AdIdxBot/', 'MicrosoftPreview/', 'masscan/'
+		'YurichevBot/', 'Crawling at Home Project', 'InfoTigerBot/', 'AdIdxBot/',
+		'MicrosoftPreview/', 'masscan/', 'Timpibot/', 'everyfeed-spider/', 'AndroidDownloadManager/',
+		'WebZIP/', 'WDG_Validator/', 'Screaming Frog SEO Spider/', ' Bytespider;', 'ISSCyberRiskCrawler/',
 	];
 
-	if (!DI::config()->get('blockbot', 'good_crawlers')) {
-		$agents = array_merge($agents, $good_agents);
-	} else {
-		foreach ($good_agents as $good_agent) {
-			if (stristr($_SERVER['HTTP_USER_AGENT'], $good_agent)) {
-				return;
-			}
-		}
-	}
-
-	if (!DI::config()->get('blockbot', 'socialmedia_agents')) {
-		$agents = array_merge($agents, $socialmedia_agents);
-	} else {
-		foreach ($socialmedia_agents as $socialmedia_agent) {
-			if (stristr($_SERVER['HTTP_USER_AGENT'], $socialmedia_agent)) {
-				return;
-			}
-		}
-	}
-
 	if (DI::config()->get('blockbot', 'block_gab')) {
 		$agents[] = 'GabSocial/';
 	}
 
-	foreach ($agents as $agent) {
-		if (stristr($_SERVER['HTTP_USER_AGENT'], $agent)) {
-			throw new ForbiddenException('Bots are not allowed. If you consider this a mistake, create an issue at https://github.com/friendica/friendica');
-		}
+	// List of "good" crawlers, mostly from the fediverse.
+	$good_agents = [
+		'fediverse.space crawler', 'fediverse.network crawler', 'Active_Pods_CheckBot_3.0',
+		'Social-Relay/', 'Test Certificate Info', 'Uptimebot/', 'GNUSocialBot', 'UptimeRobot/',
+		'PTST/', 'Zabbix', 'Poduptime/', 'FediFetcher', 'lemmy-stats-crawler',
+		'FedditLemmyverseCrawler/', 'kbinBot/', 'lemmy-explorer-crawler/',
+	];
+
+	if (!DI::config()->get('blockbot', 'good_crawlers')) {
+		$agents = array_merge($agents, $good_agents);
+	} elseif (blockbot_match($good_agents)) {
+		return;
+	}
+
+	// List of agents from social media systems that fetch preview data via opem graph or twitter cards.
+	$socialmedia_agents = ['Twitterbot', 'facebookexternalhit/', 'SkypeUriPreview Preview/',
+		'TelegramBot', 'WhatsApp/', 'github-camo', 'Bluesky Cardyb/', 'XING-contenttabreceiver/', 
+		'LinkedInBot/', 'Instagram ', 'Synapse (bot; ', 'Discordbot/', 'SummalyBot/'];
+
+	if (!DI::config()->get('blockbot', 'socialmedia_agents')) {
+		$agents = array_merge($agents, $socialmedia_agents);
+	} elseif (blockbot_match($socialmedia_agents)) {
+		return;
+	}
+	
+	// HTTP Libraries
+	$http_libraries = ['ReactorNetty/', 'GuzzleHttp/', 'Embed PHP library', 'python-urllib3/'];
+
+	if (!DI::config()->get('blockbot', 'http_libraries')) {
+		$agents = array_merge($agents, $http_libraries);
+	} elseif (blockbot_match($http_libraries)) {
+		return;
+	}
+
+	if (blockbot_match($agents)) {
+		throw new ForbiddenException('Bots are not allowed. If you consider this a mistake, create an issue at https://github.com/friendica/friendica');
 	}
 
 	// This switch here is only meant for developers who want to add more bots to the list above, it is not safe for production.
@@ -134,7 +136,7 @@ function blockbot_init_1()
 		return;
 	}
 
-	// List of false positives' strings of known "good" agents.
+	// List of known "good" agents, mostly used by Fediverse systems, feed readers, ...
 	$agents = [
 		'curl', 'zgrab', 'Go-http-client', 'curb', 'github.com', 'reqwest', 'Feedly/',
 		'Python-urllib/', 'Liferea/', 'aiohttp/', 'WordPress.com Reader', 'hackney/',
@@ -144,20 +146,25 @@ function blockbot_init_1()
 		'lua-resty-http/', 'Tiny Tiny RSS/', 'Wget/', 'PostmanRuntime/',
 		'W3C_Validator/', 'NetNewsWire', 'FeedValidator/', 'theoldreader.com', 'axios/',
 		'Paw/', 'PeerTube/', 'fedi.inex.dev', 'FediDB/', 'index.community crawler',
-		'Slackbot-LinkExpanding', 'Firefish/', 'Takahe/', 'Akkoma ', 'Misskey/'
+		'Slackbot-LinkExpanding', 'Firefish/', 'Takahe/', 'Akkoma ', 'Misskey/', 'Lynx/',
+		'camo-rs asset proxy',
 	];
 
-	if (DI::config()->get('blockbot', 'good_crawlers')) {
-		$agents = array_merge($agents, $good_agents);
-	}
-
-	foreach ($agents as $agent) {
-		if (stristr($_SERVER['HTTP_USER_AGENT'], $agent)) {
-			logger::info('False positive', $logdata);
-			return;
-		}
+	if (blockbot_match($agents)) {
+		logger::info('False positive', $logdata);
+		return;
 	}
 
 	logger::notice('Blocked bot', $logdata);
 	throw new ForbiddenException('Bots are not allowed. If you consider this a mistake, create an issue at https://github.com/friendica/friendica');
 }
+
+function blockbot_match(array $agents)
+{
+	foreach ($agents as $agent) {
+		if (stristr($_SERVER['HTTP_USER_AGENT'], $agent)) {
+			return true;
+		}
+	}
+	return false;
+}
\ No newline at end of file
diff --git a/blockbot/lang/C/messages.po b/blockbot/lang/C/messages.po
index 49371908..a99ccc5a 100644
--- a/blockbot/lang/C/messages.po
+++ b/blockbot/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-04 05:35+0000\n"
+"POT-Creation-Date: 2024-03-05 04:51+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -42,21 +42,32 @@ msgid ""
 msgstr ""
 
 #: blockbot.php:33
-msgid "Block GabSocial"
+msgid "Allow generic HTTP libraries"
 msgstr ""
 
 #: blockbot.php:33
 msgid ""
+"Don't block agents from generic HTTP libraries that could be used for good "
+"or for bad and that currently can't be traced back to any known Fediverse "
+"project."
+msgstr ""
+
+#: blockbot.php:34
+msgid "Block GabSocial"
+msgstr ""
+
+#: blockbot.php:34
+msgid ""
 "Block the software GabSocial. This will block every access for that "
 "software. You can block dedicated gab instances in the blocklist settings in "
 "the admin section."
 msgstr ""
 
-#: blockbot.php:34
+#: blockbot.php:35
 msgid "Training mode"
 msgstr ""
 
-#: blockbot.php:34
+#: blockbot.php:35
 msgid ""
 "Activates the training mode. This is only meant for developing purposes. "
 "Don't activate this on a production machine. This can cut communication with "
diff --git a/blockbot/templates/admin.tpl b/blockbot/templates/admin.tpl
index 9f728d42..5f41ae70 100644
--- a/blockbot/templates/admin.tpl
+++ b/blockbot/templates/admin.tpl
@@ -1,5 +1,6 @@
 {{include file="field_checkbox.tpl" field=$good_crawlers}}
 {{include file="field_checkbox.tpl" field=$socialmedia_agents}}
+{{include file="field_checkbox.tpl" field=$http_libraries}}
 {{include file="field_checkbox.tpl" field=$block_gab}}
 {{include file="field_checkbox.tpl" field=$training}}
 <div class="submit"><button type="submit" class="btn btn-primary" name="page_site" value="{{$submit}}">{{$submit}}</button></div>

From 09ae5cfaff22328cc551631d33f8b2548911b437 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 6 Mar 2024 05:27:08 +0000
Subject: [PATCH 028/294] More agents added

---
 blockbot/blockbot.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php
index 2c128e40..2df688cb 100644
--- a/blockbot/blockbot.php
+++ b/blockbot/blockbot.php
@@ -80,6 +80,7 @@ function blockbot_init_1()
 		'YurichevBot/', 'Crawling at Home Project', 'InfoTigerBot/', 'AdIdxBot/',
 		'MicrosoftPreview/', 'masscan/', 'Timpibot/', 'everyfeed-spider/', 'AndroidDownloadManager/',
 		'WebZIP/', 'WDG_Validator/', 'Screaming Frog SEO Spider/', ' Bytespider;', 'ISSCyberRiskCrawler/',
+		'BitSightBot/', 'ev-crawler/',
 	];
 
 	if (DI::config()->get('blockbot', 'block_gab')) {
@@ -91,7 +92,8 @@ function blockbot_init_1()
 		'fediverse.space crawler', 'fediverse.network crawler', 'Active_Pods_CheckBot_3.0',
 		'Social-Relay/', 'Test Certificate Info', 'Uptimebot/', 'GNUSocialBot', 'UptimeRobot/',
 		'PTST/', 'Zabbix', 'Poduptime/', 'FediFetcher', 'lemmy-stats-crawler',
-		'FedditLemmyverseCrawler/', 'kbinBot/', 'lemmy-explorer-crawler/',
+		'FedditLemmyverseCrawler/', 'kbinBot/', 'lemmy-explorer-crawler/', 'URIports Validator',
+		'rss-is-dead.lol web bot;',
 	];
 
 	if (!DI::config()->get('blockbot', 'good_crawlers')) {
@@ -112,7 +114,8 @@ function blockbot_init_1()
 	}
 	
 	// HTTP Libraries
-	$http_libraries = ['ReactorNetty/', 'GuzzleHttp/', 'Embed PHP library', 'python-urllib3/'];
+	$http_libraries = ['ReactorNetty/', 'GuzzleHttp/', 'Embed PHP library', 'python-urllib3/',
+		'EventMachine HttpClient'];
 
 	if (!DI::config()->get('blockbot', 'http_libraries')) {
 		$agents = array_merge($agents, $http_libraries);
@@ -147,7 +150,7 @@ function blockbot_init_1()
 		'W3C_Validator/', 'NetNewsWire', 'FeedValidator/', 'theoldreader.com', 'axios/',
 		'Paw/', 'PeerTube/', 'fedi.inex.dev', 'FediDB/', 'index.community crawler',
 		'Slackbot-LinkExpanding', 'Firefish/', 'Takahe/', 'Akkoma ', 'Misskey/', 'Lynx/',
-		'camo-rs asset proxy',
+		'camo-rs asset proxy', 'gotosocial/',
 	];
 
 	if (blockbot_match($agents)) {

From eeb783d71d713df23038102048284c6b170634cb Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 7 Mar 2024 07:21:56 -0500
Subject: [PATCH 029/294] [url_replace] Normalize formatting

---
 url_replace/url_replace.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/url_replace/url_replace.php b/url_replace/url_replace.php
index 4c61b6c2..2c3ba6d0 100644
--- a/url_replace/url_replace.php
+++ b/url_replace/url_replace.php
@@ -6,6 +6,7 @@
  * Author: Dr. Tobias Quathamer <https://social.anoxinon.de/@toddy>
  * Maintainer: Dr. Tobias Quathamer <https://social.anoxinon.de/@toddy>
  */
+
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
@@ -25,13 +26,13 @@ function url_replace_addon_admin_post()
 	// Convert twelvefeet_sites into an array before setting the new value
 	$twelvefeet_sites = explode(PHP_EOL, $_POST['twelvefeet_sites']);
 	// Normalize URLs by using lower case, removing a trailing slash and whitespace
-	$twelvefeet_sites = array_map(fn ($value): string => rtrim(trim(strtolower($value)), '/'), $twelvefeet_sites);
+	$twelvefeet_sites = array_map(fn($value): string => rtrim(trim(strtolower($value)), '/'), $twelvefeet_sites);
 	// Do not store empty lines or duplicates
-	$twelvefeet_sites = array_filter($twelvefeet_sites, fn ($value): bool => !empty($value));
+	$twelvefeet_sites = array_filter($twelvefeet_sites, fn($value): bool => !empty($value));
 	$twelvefeet_sites = array_unique($twelvefeet_sites);
 	// Ensure a protocol and default to HTTPS
 	$twelvefeet_sites = array_map(
-		fn ($value): string => substr($value, 0, 4) !== 'http' ? 'https://'.$value : $value,
+		fn($value): string => substr($value, 0, 4) !== 'http' ? 'https://' . $value : $value,
 		$twelvefeet_sites
 	);
 	asort($twelvefeet_sites);
@@ -47,8 +48,9 @@ function url_replace_addon_admin(string &$o)
 	$nitter_server    = DI::config()->get('url_replace', 'nitter_server');
 	$invidious_server = DI::config()->get('url_replace', 'invidious_server');
 	$twelvefeet_sites = implode(PHP_EOL, DI::config()->get('url_replace', 'twelvefeet_sites'));
-	$t                = Renderer::getMarkupTemplate('admin.tpl', 'addon/url_replace/');
-	$o                = Renderer::replaceMacros($t, [
+
+	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/url_replace/');
+	$o = Renderer::replaceMacros($t, [
 		'$nitter_server' => [
 			'nitter_server',
 			DI::l10n()->t('Nitter server'),
@@ -118,7 +120,7 @@ function url_replace_render(array &$b)
 	}
 	foreach ($twelvefeet_sites as $twelvefeet_site) {
 		if (strpos($b['html'], $twelvefeet_site) !== false) {
-			$b['html'] = str_replace($twelvefeet_site, 'https://12ft.io/'.$twelvefeet_site, $b['html']);
+			$b['html'] = str_replace($twelvefeet_site, 'https://12ft.io/' . $twelvefeet_site, $b['html']);
 			$replaced  = true;
 		}
 	}

From 6a9287dc6fdd0341d2852a4d3ec844fc855502a3 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 7 Mar 2024 07:22:41 -0500
Subject: [PATCH 030/294] [url_replace] Add support for empty config value

---
 url_replace/url_replace.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/url_replace/url_replace.php b/url_replace/url_replace.php
index 2c3ba6d0..de16234f 100644
--- a/url_replace/url_replace.php
+++ b/url_replace/url_replace.php
@@ -47,7 +47,7 @@ function url_replace_addon_admin(string &$o)
 {
 	$nitter_server    = DI::config()->get('url_replace', 'nitter_server');
 	$invidious_server = DI::config()->get('url_replace', 'invidious_server');
-	$twelvefeet_sites = implode(PHP_EOL, DI::config()->get('url_replace', 'twelvefeet_sites'));
+	$twelvefeet_sites = implode(PHP_EOL, DI::config()->get('url_replace', 'twelvefeet_sites') ?? [] ?: []);
 
 	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/url_replace/');
 	$o = Renderer::replaceMacros($t, [
@@ -114,10 +114,7 @@ function url_replace_render(array &$b)
 		}
 	}
 
-	$twelvefeet_sites = DI::config()->get('url_replace', 'twelvefeet_sites');
-	if (empty($twelvefeet_sites)) {
-		$twelvefeet_sites = [];
-	}
+	$twelvefeet_sites = DI::config()->get('url_replace', 'twelvefeet_sites') ?? [] ?: [];
 	foreach ($twelvefeet_sites as $twelvefeet_site) {
 		if (strpos($b['html'], $twelvefeet_site) !== false) {
 			$b['html'] = str_replace($twelvefeet_site, 'https://12ft.io/' . $twelvefeet_site, $b['html']);

From ef7548f5bc04852dda96be4f4b7dda4de57608bb Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 10 Mar 2024 06:14:01 +0000
Subject: [PATCH 031/294] Blockbot: New user agents added

---
 blockbot/blockbot.php | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php
index 2df688cb..8da6ca4a 100644
--- a/blockbot/blockbot.php
+++ b/blockbot/blockbot.php
@@ -80,7 +80,10 @@ function blockbot_init_1()
 		'YurichevBot/', 'Crawling at Home Project', 'InfoTigerBot/', 'AdIdxBot/',
 		'MicrosoftPreview/', 'masscan/', 'Timpibot/', 'everyfeed-spider/', 'AndroidDownloadManager/',
 		'WebZIP/', 'WDG_Validator/', 'Screaming Frog SEO Spider/', ' Bytespider;', 'ISSCyberRiskCrawler/',
-		'BitSightBot/', 'ev-crawler/',
+		'BitSightBot/', 'ev-crawler/', 'CensysInspect/1.1', 'Protopage/', 'Gaisbot/', 'WellKnownBot/',
+		'SuperBot/', 'Googlebot-Mobile/', 'GPTBot/', 'GenomeCrawlerd/', '2ip bot/', 'Ocarinabot',
+		'Yahoo! Slurp;', 'AdsBot-Google', 'Gregarius/', 'FAST-WebCrawler/', 'Xenu Link Sleuth/',
+		'Ask Jeeves'
 	];
 
 	if (DI::config()->get('blockbot', 'block_gab')) {
@@ -92,8 +95,9 @@ function blockbot_init_1()
 		'fediverse.space crawler', 'fediverse.network crawler', 'Active_Pods_CheckBot_3.0',
 		'Social-Relay/', 'Test Certificate Info', 'Uptimebot/', 'GNUSocialBot', 'UptimeRobot/',
 		'PTST/', 'Zabbix', 'Poduptime/', 'FediFetcher', 'lemmy-stats-crawler',
-		'FedditLemmyverseCrawler/', 'kbinBot/', 'lemmy-explorer-crawler/', 'URIports Validator',
-		'rss-is-dead.lol web bot;',
+		'FedditLemmyverseCrawler/', 'lemmy-explorer-crawler/', 'URIports Validator',
+		'rss-is-dead.lol web bot;', 'fedistatsCrawler/', 'W3C_CSS_Validator_JFouffa/',
+		'IABot/', 'Slackbot 1',
 	];
 
 	if (!DI::config()->get('blockbot', 'good_crawlers')) {
@@ -105,7 +109,9 @@ function blockbot_init_1()
 	// List of agents from social media systems that fetch preview data via opem graph or twitter cards.
 	$socialmedia_agents = ['Twitterbot', 'facebookexternalhit/', 'SkypeUriPreview Preview/',
 		'TelegramBot', 'WhatsApp/', 'github-camo', 'Bluesky Cardyb/', 'XING-contenttabreceiver/', 
-		'LinkedInBot/', 'Instagram ', 'Synapse (bot; ', 'Discordbot/', 'SummalyBot/'];
+		'LinkedInBot/', 'Instagram ', 'Synapse (bot; ', 'Discordbot/', 'SummalyBot/',
+		'Slackbot-LinkExpanding', 'Slack-ImgProxy',
+	];
 
 	if (!DI::config()->get('blockbot', 'socialmedia_agents')) {
 		$agents = array_merge($agents, $socialmedia_agents);
@@ -115,7 +121,8 @@ function blockbot_init_1()
 	
 	// HTTP Libraries
 	$http_libraries = ['ReactorNetty/', 'GuzzleHttp/', 'Embed PHP library', 'python-urllib3/',
-		'EventMachine HttpClient'];
+		'EventMachine HttpClient', 'HTMLParser/'
+	];
 
 	if (!DI::config()->get('blockbot', 'http_libraries')) {
 		$agents = array_merge($agents, $http_libraries);
@@ -150,7 +157,9 @@ function blockbot_init_1()
 		'W3C_Validator/', 'NetNewsWire', 'FeedValidator/', 'theoldreader.com', 'axios/',
 		'Paw/', 'PeerTube/', 'fedi.inex.dev', 'FediDB/', 'index.community crawler',
 		'Slackbot-LinkExpanding', 'Firefish/', 'Takahe/', 'Akkoma ', 'Misskey/', 'Lynx/',
-		'camo-rs asset proxy', 'gotosocial/',
+		'camo-rs asset proxy', 'gotosocial/', 'incestoma ', 'SpaceCowboys Android RSS Reader',
+		'NewsBlur Feed Finder', 'Lemmy/', 'enby-town/', 'rss2tg bot;', '; HTTrack ',
+		'MbinBot', 'kbinBot'
 	];
 
 	if (blockbot_match($agents)) {

From 0fc8285f87722958fed5a5daf819d8eaca79c4d5 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 10 Mar 2024 06:17:18 +0000
Subject: [PATCH 032/294] Tumblr: Handle quote shares

---
 tumblr/tumblr.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 12e9e5e0..78e415ee 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -677,11 +677,20 @@ function tumblr_send_npf(array $post): bool
 		return true;
 	}
 
-	$post['body'] = Post\Media::addAttachmentsToBody($post['uri-id'], $post['body']);
+	$post['body'] = Post\Media::addAttachmentsToBody($post['uri-id'], $post['body'], [Post\Media::IMAGE, Post\Media::AUDIO, Post\Media::VIDEO, Post\Media::ACTIVITY]);
 	if (!empty($post['title'])) {
 		$post['body'] = '[h1]' . $post['title'] . "[/h1]\n" . $post['body'];
 	}
 
+	if (!empty($post['quote-uri-id'])) {
+		$quote = Post::selectFirstPost(['uri', 'plink'], ['uri-id' => $post['quote-uri-id']]);
+		if (!empty($quote)) {
+			if ((strpos($post['body'], $quote['plink'] ?: $quote['uri']) === false) && (strpos($post['body'], $quote['uri']) === false)) {
+				$post['body'] .= "\n[url]" . ($quote['plink'] ?: $quote['uri']) . "[/url]\n";
+			}
+		}
+	}
+
 	$params = [
 		'content'                => NPF::fromBBCode($post['body'], $post['uri-id']),
 		'state'                  => 'published',

From d5dfa8028c468a1789800aba64cc61986732862b Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 10 Mar 2024 06:16:37 +0000
Subject: [PATCH 033/294] Bluesky: fix the fetching of media in quoted posts

---
 bluesky/bluesky.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index cdedb07a..fe66d9a4 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1358,6 +1358,7 @@ function bluesky_add_media(stdClass $embed, array $item, int $fetch_uid, int $le
 			break;
 
 		case 'app.bsky.embed.recordWithMedia#view':
+			bluesky_add_media($embed->media, $item, $fetch_uid, $level, $last_poll);
 			$original_uri = $uri = bluesky_get_uri($embed->record->record);
 			$uri = bluesky_fetch_missing_post($uri, $item['uid'], $fetch_uid, Item::PR_FETCHED, $item['contact-id'], $level, $last_poll);
 			if ($uri) {

From 02a6fdd9a21e7c5988fc7c80e9e99701a5833834 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 10 Mar 2024 15:48:23 +0000
Subject: [PATCH 034/294] Blockbot: More agents added

---
 blockbot/blockbot.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php
index 8da6ca4a..26ccbcdb 100644
--- a/blockbot/blockbot.php
+++ b/blockbot/blockbot.php
@@ -61,7 +61,7 @@ function blockbot_init_1()
 		'adscanner/', 'HeadlessChrome', 'wpif', 'startmebot/', 'Googlebot/', 'Applebot/',
 		'GoogleImageProxy', 'bingbot/', 'heritrix/', 'ldspider',
 		'AwarioRssBot/', 'TweetmemeBot/', 'dcrawl/', 'PhantomJS/', 'Googlebot-Image/',
-		'CrowdTanglebot/', 'Mediapartners-Google', 'Baiduspider/', 'datagnionbot',
+		'CrowdTanglebot/', 'Mediapartners-Google', 'Baiduspider', 'datagnionbot',
 		'MegaIndex.ru/', 'SMUrlExpander', 'Hatena-Favicon/', 'Wappalyzer', 'FlipboardProxy/',
 		'NetcraftSurveyAgent/', 'Dataprovider.com', 'SMTBot/', 'Nimbostratus-Bot/',
 		'DuckDuckGo-Favicons-Bot/', 'IndieWebCards/', 'proximic', 'netEstate NE Crawler',
@@ -83,7 +83,10 @@ function blockbot_init_1()
 		'BitSightBot/', 'ev-crawler/', 'CensysInspect/1.1', 'Protopage/', 'Gaisbot/', 'WellKnownBot/',
 		'SuperBot/', 'Googlebot-Mobile/', 'GPTBot/', 'GenomeCrawlerd/', '2ip bot/', 'Ocarinabot',
 		'Yahoo! Slurp;', 'AdsBot-Google', 'Gregarius/', 'FAST-WebCrawler/', 'Xenu Link Sleuth/',
-		'Ask Jeeves'
+		'Ask Jeeves', 'alexa site audit/', 'Yahoo! Slurp China;', 'Microsoft URL Control',
+		'Facebot', 'Googlebot-Video/', 'msnbot/', 'Offline Explorer/', 'YandexNews/', 'msnbot-media/',
+		'EmailWolf', 'Download Demon/', 'FeedFetcher-Google;', 'WebCopier', '+ONB_Bot_Btrix',
+		'scoopit-crawler/'
 	];
 
 	if (DI::config()->get('blockbot', 'block_gab')) {
@@ -97,7 +100,7 @@ function blockbot_init_1()
 		'PTST/', 'Zabbix', 'Poduptime/', 'FediFetcher', 'lemmy-stats-crawler',
 		'FedditLemmyverseCrawler/', 'lemmy-explorer-crawler/', 'URIports Validator',
 		'rss-is-dead.lol web bot;', 'fedistatsCrawler/', 'W3C_CSS_Validator_JFouffa/',
-		'IABot/', 'Slackbot 1',
+		'IABot/', 'Slackbot 1', 'BeeperBot/', 'Matrix-Media-Repo/', 'P3P Validator',
 	];
 
 	if (!DI::config()->get('blockbot', 'good_crawlers')) {
@@ -110,7 +113,7 @@ function blockbot_init_1()
 	$socialmedia_agents = ['Twitterbot', 'facebookexternalhit/', 'SkypeUriPreview Preview/',
 		'TelegramBot', 'WhatsApp/', 'github-camo', 'Bluesky Cardyb/', 'XING-contenttabreceiver/', 
 		'LinkedInBot/', 'Instagram ', 'Synapse (bot; ', 'Discordbot/', 'SummalyBot/',
-		'Slackbot-LinkExpanding', 'Slack-ImgProxy',
+		'Slackbot-LinkExpanding', 'Slack-ImgProxy', 'Iframely/',
 	];
 
 	if (!DI::config()->get('blockbot', 'socialmedia_agents')) {
@@ -159,7 +162,7 @@ function blockbot_init_1()
 		'Slackbot-LinkExpanding', 'Firefish/', 'Takahe/', 'Akkoma ', 'Misskey/', 'Lynx/',
 		'camo-rs asset proxy', 'gotosocial/', 'incestoma ', 'SpaceCowboys Android RSS Reader',
 		'NewsBlur Feed Finder', 'Lemmy/', 'enby-town/', 'rss2tg bot;', '; HTTrack ',
-		'MbinBot', 'kbinBot'
+		'MbinBot', 'kbinBot', 'Pixelfed/'
 	];
 
 	if (blockbot_match($agents)) {

From 904bf11e54a1d8f2f9c0a37d6f89d23389f1cfcf Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Fri, 15 Mar 2024 22:55:48 +0100
Subject: [PATCH 035/294] [CI] Add PHP 8.3

---
 .woodpecker/.phpunit.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml
index a6c5db09..e6b761c4 100644
--- a/.woodpecker/.phpunit.yml
+++ b/.woodpecker/.phpunit.yml
@@ -8,6 +8,8 @@ matrix:
       PHP_VERSION: 8.1.23
     - PHP_MAJOR_VERSION: 8.2
       PHP_VERSION: 8.2.11
+    - PHP_MAJOR_VERSION: 8.3
+      PHP_VERSION: 8.3.3
 
 # This forces PHP Unit executions at the "opensocial" labeled location (because of much more power...)
 labels:

From 7e890124a8357b68f800fe9a292a6a55a86d3443 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Fri, 15 Mar 2024 23:03:44 +0100
Subject: [PATCH 036/294] Update PHP 8.1 and PHP 8.2 CI image

---
 .woodpecker/.phpunit.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml
index e6b761c4..c590b933 100644
--- a/.woodpecker/.phpunit.yml
+++ b/.woodpecker/.phpunit.yml
@@ -5,9 +5,9 @@ matrix:
     - PHP_MAJOR_VERSION: 8.0
       PHP_VERSION: 8.0.30
     - PHP_MAJOR_VERSION: 8.1
-      PHP_VERSION: 8.1.23
+      PHP_VERSION: 8.1.27
     - PHP_MAJOR_VERSION: 8.2
-      PHP_VERSION: 8.2.11
+      PHP_VERSION: 8.2.16
     - PHP_MAJOR_VERSION: 8.3
       PHP_VERSION: 8.3.3
 

From 372a850103fd313c0e1d55a0eee8cac1216ee56a Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Fri, 15 Mar 2024 23:06:13 +0100
Subject: [PATCH 037/294] Use PHP 8.2 for codecoverage

---
 .woodpecker/.phpunit.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml
index c590b933..207bb207 100644
--- a/.woodpecker/.phpunit.yml
+++ b/.woodpecker/.phpunit.yml
@@ -89,8 +89,8 @@ pipeline:
     image: friendicaci/codecov
     when:
       matrix:
-        PHP_MAJOR_VERSION: 7.4
-        PHP_VERSION: 7.4.33
+        PHP_MAJOR_VERSION: 8.2
+        PHP_VERSION: 8.2.16
       repo:
         - friendica/friendica-addons
     commands:

From 57c4735ad6751afbbb4976afaaf51bcabad4da27 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Fri, 15 Mar 2024 23:08:52 +0100
Subject: [PATCH 038/294] Use PHP 8.2 for other pipelines

---
 .woodpecker/.continuous-deployment.yml | 2 +-
 .woodpecker/.releaser.yml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.woodpecker/.continuous-deployment.yml b/.woodpecker/.continuous-deployment.yml
index ab6e07e9..3756a8bf 100644
--- a/.woodpecker/.continuous-deployment.yml
+++ b/.woodpecker/.continuous-deployment.yml
@@ -45,7 +45,7 @@ pipeline:
       branch: [ develop, '*-rc' ]
       event: push
   composer_install:
-    image: friendicaci/php7.4:php7.4.33
+    image: friendicaci/php8.2:php8.2.16
     commands:
       - export COMPOSER_HOME=.composer
       - composer validate
diff --git a/.woodpecker/.releaser.yml b/.woodpecker/.releaser.yml
index 4a661937..5751f07f 100644
--- a/.woodpecker/.releaser.yml
+++ b/.woodpecker/.releaser.yml
@@ -42,7 +42,7 @@ pipeline:
       repo: friendica/friendica-addons
       event: tag
   composer_install:
-    image: friendicaci/php7.4:php7.4.33
+    image: friendicaci/php8.2:php8.2.16
     commands:
       - export COMPOSER_HOME=.composer
       - composer validate

From e1f27d88b77bddeae44a768b3e3d37c09977fbe6 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Fri, 15 Mar 2024 23:15:42 +0100
Subject: [PATCH 039/294] Fixup :)

---
 .woodpecker/.phpunit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml
index 207bb207..1e6189d3 100644
--- a/.woodpecker/.phpunit.yml
+++ b/.woodpecker/.phpunit.yml
@@ -78,7 +78,7 @@ pipeline:
       - cp config/local-sample.config.php config/local.config.php
       - if ! bin/wait-for-connection $MYSQL_HOST $MYSQL_PORT 300; then echo "[ERROR] Waited 300 seconds, no response" >&2; exit 1; fi
       - mysql -h$MYSQL_HOST -P$MYSQL_PORT -p$MYSQL_PASSWORD -u$MYSQL_USER $MYSQL_DATABASE < database.sql
-      - if [ "${PHP_MAJOR_VERSION}" = "7.4" -a "${CI_REPO}" = "friendica/friendica-addons" ]; then
+      - if [ "${PHP_MAJOR_VERSION}" = "8.2" -a "${CI_REPO}" = "friendica/friendica-addons" ]; then
           phpenmod xdebug;
           export XDEBUG_MODE=coverage;
           phpunit --configuration tests/phpunit-addons.xml --coverage-clover clover.xml;

From 4a14bc47ee1dec10c992d28f72d8bd9c728d5b9b Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 15 Mar 2024 04:30:32 +0000
Subject: [PATCH 040/294] Blockbot: More agents added

---
 blockbot/blockbot.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php
index 26ccbcdb..e11f23f7 100644
--- a/blockbot/blockbot.php
+++ b/blockbot/blockbot.php
@@ -86,7 +86,8 @@ function blockbot_init_1()
 		'Ask Jeeves', 'alexa site audit/', 'Yahoo! Slurp China;', 'Microsoft URL Control',
 		'Facebot', 'Googlebot-Video/', 'msnbot/', 'Offline Explorer/', 'YandexNews/', 'msnbot-media/',
 		'EmailWolf', 'Download Demon/', 'FeedFetcher-Google;', 'WebCopier', '+ONB_Bot_Btrix',
-		'scoopit-crawler/'
+		'scoopit-crawler/', 'ia_archiver', 'Quora-Bot/', 'WebwikiBot/', 'FullStoryBot/',
+		'wpbot/', 'SearchExpress', 'DuckDuckBot/', 'Google Web Preview',
 	];
 
 	if (DI::config()->get('blockbot', 'block_gab')) {
@@ -101,6 +102,7 @@ function blockbot_init_1()
 		'FedditLemmyverseCrawler/', 'lemmy-explorer-crawler/', 'URIports Validator',
 		'rss-is-dead.lol web bot;', 'fedistatsCrawler/', 'W3C_CSS_Validator_JFouffa/',
 		'IABot/', 'Slackbot 1', 'BeeperBot/', 'Matrix-Media-Repo/', 'P3P Validator',
+		'KeybaseBot;',
 	];
 
 	if (!DI::config()->get('blockbot', 'good_crawlers')) {
@@ -162,7 +164,7 @@ function blockbot_init_1()
 		'Slackbot-LinkExpanding', 'Firefish/', 'Takahe/', 'Akkoma ', 'Misskey/', 'Lynx/',
 		'camo-rs asset proxy', 'gotosocial/', 'incestoma ', 'SpaceCowboys Android RSS Reader',
 		'NewsBlur Feed Finder', 'Lemmy/', 'enby-town/', 'rss2tg bot;', '; HTTrack ',
-		'MbinBot', 'kbinBot', 'Pixelfed/'
+		'MbinBot', 'kbinBot', 'Pixelfed/', 'NewsBlur Feed Fetcher', 'NewsBlur Page Fetcher',
 	];
 
 	if (blockbot_match($agents)) {

From 1bcd23f6845ffb3836dd32203ac05be85c118c4a Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <toddy@debian.org>
Date: Wed, 13 Mar 2024 15:39:21 +0100
Subject: [PATCH 041/294] Simplify providing a default empty array

---
 url_replace/url_replace.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/url_replace/url_replace.php b/url_replace/url_replace.php
index de16234f..7710a2e1 100644
--- a/url_replace/url_replace.php
+++ b/url_replace/url_replace.php
@@ -47,7 +47,7 @@ function url_replace_addon_admin(string &$o)
 {
 	$nitter_server    = DI::config()->get('url_replace', 'nitter_server');
 	$invidious_server = DI::config()->get('url_replace', 'invidious_server');
-	$twelvefeet_sites = implode(PHP_EOL, DI::config()->get('url_replace', 'twelvefeet_sites') ?? [] ?: []);
+	$twelvefeet_sites = implode(PHP_EOL, DI::config()->get('url_replace', 'twelvefeet_sites') ?? []);
 
 	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/url_replace/');
 	$o = Renderer::replaceMacros($t, [
@@ -114,7 +114,7 @@ function url_replace_render(array &$b)
 		}
 	}
 
-	$twelvefeet_sites = DI::config()->get('url_replace', 'twelvefeet_sites') ?? [] ?: [];
+	$twelvefeet_sites = DI::config()->get('url_replace', 'twelvefeet_sites') ?? [];
 	foreach ($twelvefeet_sites as $twelvefeet_site) {
 		if (strpos($b['html'], $twelvefeet_site) !== false) {
 			$b['html'] = str_replace($twelvefeet_site, 'https://12ft.io/' . $twelvefeet_site, $b['html']);

From a40bd7009b672b869127bc64e87083d0d6eb39de Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <toddy@debian.org>
Date: Wed, 13 Mar 2024 17:07:08 +0100
Subject: [PATCH 042/294] Add proxigram for instagram redirection.

Based on an idea and patch from loma-one. Thanks!
---
 url_replace/templates/admin.tpl |  1 +
 url_replace/url_replace.php     | 22 ++++++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/url_replace/templates/admin.tpl b/url_replace/templates/admin.tpl
index b99e6355..01f38e6e 100644
--- a/url_replace/templates/admin.tpl
+++ b/url_replace/templates/admin.tpl
@@ -1,5 +1,6 @@
 {{include file="field_input.tpl" field=$nitter_server}}
 {{include file="field_input.tpl" field=$invidious_server}}
+{{include file="field_input.tpl" field=$proxigram_server}}
 {{include file="field_textarea.tpl" field=$twelvefeet_sites}}
 
 <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/url_replace/url_replace.php b/url_replace/url_replace.php
index 7710a2e1..c7bb2e81 100644
--- a/url_replace/url_replace.php
+++ b/url_replace/url_replace.php
@@ -23,6 +23,7 @@ function url_replace_addon_admin_post()
 {
 	DI::config()->set('url_replace', 'nitter_server', rtrim(trim($_POST['nitter_server']), '/'));
 	DI::config()->set('url_replace', 'invidious_server', rtrim(trim($_POST['invidious_server']), '/'));
+	DI::config()->set('url_replace', 'proxigram_server', rtrim(trim($_POST['proxigram_server']), '/'));
 	// Convert twelvefeet_sites into an array before setting the new value
 	$twelvefeet_sites = explode(PHP_EOL, $_POST['twelvefeet_sites']);
 	// Normalize URLs by using lower case, removing a trailing slash and whitespace
@@ -41,12 +42,13 @@ function url_replace_addon_admin_post()
 
 /**
  * Hook into admin settings to enable choosing a different server
- * for twitter, youtube, and news sites.
+ * for twitter, youtube, instagram, and news sites.
  */
 function url_replace_addon_admin(string &$o)
 {
 	$nitter_server    = DI::config()->get('url_replace', 'nitter_server');
 	$invidious_server = DI::config()->get('url_replace', 'invidious_server');
+	$proxigram_server = DI::config()->get('url_replace', 'proxigram_server');
 	$twelvefeet_sites = implode(PHP_EOL, DI::config()->get('url_replace', 'twelvefeet_sites') ?? []);
 
 	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/url_replace/');
@@ -67,6 +69,14 @@ function url_replace_addon_admin(string &$o)
 			null,
 			'placeholder="https://yewtu.be"',
 		],
+		'$proxigram_server' => [
+			'proxigram_server',
+			DI::l10n()->t('Proxigram server'),
+			$proxigram_server,
+			DI::l10n()->t('Specify the URL with protocol. The default is https://proxigram.lunar.icu.'),
+			null,
+			'placeholder="https://proxigram.lunar.icu"',
+		],
 		'$twelvefeet_sites' => [
 			'twelvefeet_sites',
 			DI::l10n()->t('Sites which are accessed through 12ft.io'),
@@ -96,6 +106,11 @@ function url_replace_render(array &$b)
 		$invidious_server = 'https://yewtu.be';
 	}
 
+	$proxigram_server = DI::config()->get('url_replace', 'proxigram_server');
+	if (empty($proxigram_server)) {
+		$proxigram_server = 'https://proxigram.lunar.icu';
+	}
+
 	// Handle some of twitter and youtube
 	$replacements = [
 		'https://mobile.twitter.com' => $nitter_server,
@@ -106,6 +121,9 @@ function url_replace_render(array &$b)
 		'https://youtube.com'        => $invidious_server,
 		'https://m.youtube.com'      => $invidious_server,
 		'https://youtu.be'           => $invidious_server,
+		'https://www.instagram.com'  => $proxigram_server,
+		'https://instagram.com'      => $proxigram_server,
+		'https://ig.me'              => $proxigram_server,
 	];
 	foreach ($replacements as $server => $replacement) {
 		if (strpos($b['html'], $server) !== false) {
@@ -124,6 +142,6 @@ function url_replace_render(array &$b)
 
 
 	if ($replaced) {
-		$b['html'] .= '<hr><p><small>' . DI::l10n()->t('(URL replace addon enabled for X, YouTube and some news sites.)') . '</small></p>';
+		$b['html'] .= '<hr><p><small>' . DI::l10n()->t('(URL replace addon enabled for X, YouTube, Instagram and some news sites.)') . '</small></p>';
 	}
 }

From 51797d975b543a8058c359ad2c1252afb20eba9a Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <toddy@debian.org>
Date: Wed, 13 Mar 2024 17:09:19 +0100
Subject: [PATCH 043/294] Update README

---
 url_replace/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/url_replace/README.md b/url_replace/README.md
index 278de91b..348c4426 100644
--- a/url_replace/README.md
+++ b/url_replace/README.md
@@ -4,7 +4,8 @@ This addon will replace all occurrences of specified URLs with the address of
 alternative servers in all displayed postings on a Friendica node.
 
 You can use this to switch from Twitter (or X) to a nitter instance, from
-YouTube to an invidious instance, or from some news sites to 12ft.io.
+YouTube to an invidious instance, from Instagram to a proxigram instance,
+or from some news sites to 12ft.io.
 
 Note: If you are using the twitter connector on your server, the links to the
 contacts profile pages will not be replaced by this addon. Only links in the

From c6daf2381c4c93cbd006b4d21519798eb0f1170b Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <toddy@debian.org>
Date: Wed, 13 Mar 2024 22:40:15 +0100
Subject: [PATCH 044/294] Enable individual replacement preferences

---
 url_replace/templates/admin.tpl |  3 ++
 url_replace/url_replace.php     | 58 ++++++++++++++++++++++++++-------
 2 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/url_replace/templates/admin.tpl b/url_replace/templates/admin.tpl
index 01f38e6e..fec5a253 100644
--- a/url_replace/templates/admin.tpl
+++ b/url_replace/templates/admin.tpl
@@ -1,5 +1,8 @@
+{{include file="field_checkbox.tpl" field=$nitter_server_enabled}}
 {{include file="field_input.tpl" field=$nitter_server}}
+{{include file="field_checkbox.tpl" field=$invidious_server_enabled}}
 {{include file="field_input.tpl" field=$invidious_server}}
+{{include file="field_checkbox.tpl" field=$proxigram_server_enabled}}
 {{include file="field_input.tpl" field=$proxigram_server}}
 {{include file="field_textarea.tpl" field=$twelvefeet_sites}}
 
diff --git a/url_replace/url_replace.php b/url_replace/url_replace.php
index c7bb2e81..7b84a77a 100644
--- a/url_replace/url_replace.php
+++ b/url_replace/url_replace.php
@@ -21,8 +21,11 @@ function url_replace_install()
  */
 function url_replace_addon_admin_post()
 {
+	DI::config()->set('url_replace', 'nitter_server_enabled', !empty($_POST['nitter_server_enabled']));
 	DI::config()->set('url_replace', 'nitter_server', rtrim(trim($_POST['nitter_server']), '/'));
+	DI::config()->set('url_replace', 'invidious_server_enabled', !empty($_POST['invidious_server_enabled']));
 	DI::config()->set('url_replace', 'invidious_server', rtrim(trim($_POST['invidious_server']), '/'));
+	DI::config()->set('url_replace', 'proxigram_server_enabled', !empty($_POST['proxigram_server_enabled']));
 	DI::config()->set('url_replace', 'proxigram_server', rtrim(trim($_POST['proxigram_server']), '/'));
 	// Convert twelvefeet_sites into an array before setting the new value
 	$twelvefeet_sites = explode(PHP_EOL, $_POST['twelvefeet_sites']);
@@ -46,13 +49,21 @@ function url_replace_addon_admin_post()
  */
 function url_replace_addon_admin(string &$o)
 {
+	$nitter_server_enabled    = DI::config()->get('url_replace', 'nitter_server_enabled', true);
 	$nitter_server    = DI::config()->get('url_replace', 'nitter_server');
+	$invidious_server_enabled = DI::config()->get('url_replace', 'invidious_server_enabled', true);
 	$invidious_server = DI::config()->get('url_replace', 'invidious_server');
+	$proxigram_server_enabled = DI::config()->get('url_replace', 'proxigram_server_enabled', true);
 	$proxigram_server = DI::config()->get('url_replace', 'proxigram_server');
 	$twelvefeet_sites = implode(PHP_EOL, DI::config()->get('url_replace', 'twelvefeet_sites') ?? []);
 
 	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/url_replace/');
 	$o = Renderer::replaceMacros($t, [
+		'$nitter_server_enabled' => [
+			'nitter_server_enabled',
+			DI::l10n()->t('Replace links to X.'),
+			$nitter_server_enabled,
+		],
 		'$nitter_server' => [
 			'nitter_server',
 			DI::l10n()->t('Nitter server'),
@@ -61,6 +72,11 @@ function url_replace_addon_admin(string &$o)
 			null,
 			'placeholder="https://nitter.net"',
 		],
+		'$invidious_server_enabled' => [
+			'invidious_server_enabled',
+			DI::l10n()->t('Replace links to YouTube.'),
+			$invidious_server_enabled,
+		],
 		'$invidious_server' => [
 			'invidious_server',
 			DI::l10n()->t('Invidious server'),
@@ -69,6 +85,11 @@ function url_replace_addon_admin(string &$o)
 			null,
 			'placeholder="https://yewtu.be"',
 		],
+		'$proxigram_server_enabled' => [
+			'proxigram_server_enabled',
+			DI::l10n()->t('Replace links to Instagram.'),
+			$proxigram_server_enabled,
+		],
 		'$proxigram_server' => [
 			'proxigram_server',
 			DI::l10n()->t('Proxigram server'),
@@ -95,36 +116,49 @@ function url_replace_addon_admin(string &$o)
 function url_replace_render(array &$b)
 {
 	$replaced = false;
+	$replacements = [];
 
 	$nitter_server = DI::config()->get('url_replace', 'nitter_server');
 	if (empty($nitter_server)) {
 		$nitter_server = 'https://nitter.net';
 	}
+	$nitter_server_enabled = DI::config()->get('url_replace', 'nitter_server_enabled', true);
+	if ($nitter_server_enabled) {
+		$replacements = array_merge($replacements, [
+			'https://mobile.twitter.com' => $nitter_server,
+			'https://twitter.com'        => $nitter_server,
+			'https://mobile.x.com'       => $nitter_server,
+			'https://x.com'              => $nitter_server,
+		]);
+	}
 
 	$invidious_server = DI::config()->get('url_replace', 'invidious_server');
 	if (empty($invidious_server)) {
 		$invidious_server = 'https://yewtu.be';
 	}
+	$invidious_server_enabled = DI::config()->get('url_replace', 'invidious_server_enabled', true);
+	if ($invidious_server_enabled) {
+		$replacements = array_merge($replacements, [
+		'https://www.youtube.com'    => $invidious_server,
+		'https://youtube.com'        => $invidious_server,
+		'https://m.youtube.com'      => $invidious_server,
+		'https://youtu.be'           => $invidious_server,
+		]);
+	}
 
 	$proxigram_server = DI::config()->get('url_replace', 'proxigram_server');
 	if (empty($proxigram_server)) {
 		$proxigram_server = 'https://proxigram.lunar.icu';
 	}
-
-	// Handle some of twitter and youtube
-	$replacements = [
-		'https://mobile.twitter.com' => $nitter_server,
-		'https://twitter.com'        => $nitter_server,
-		'https://mobile.x.com'       => $nitter_server,
-		'https://x.com'              => $nitter_server,
-		'https://www.youtube.com'    => $invidious_server,
-		'https://youtube.com'        => $invidious_server,
-		'https://m.youtube.com'      => $invidious_server,
-		'https://youtu.be'           => $invidious_server,
+	$proxigram_server_enabled = DI::config()->get('url_replace', 'proxigram_server_enabled', true);
+	if ($proxigram_server_enabled) {
+		$replacements = array_merge($replacements, [
 		'https://www.instagram.com'  => $proxigram_server,
 		'https://instagram.com'      => $proxigram_server,
 		'https://ig.me'              => $proxigram_server,
-	];
+		]);
+	}
+
 	foreach ($replacements as $server => $replacement) {
 		if (strpos($b['html'], $server) !== false) {
 			$b['html'] = str_replace($server, $replacement, $b['html']);

From 0bcf2d7c89b437cb86758015cf71bae15bd822ff Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <toddy@debian.org>
Date: Wed, 13 Mar 2024 22:53:08 +0100
Subject: [PATCH 045/294] Reformat code, no content changes

---
 url_replace/url_replace.php | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/url_replace/url_replace.php b/url_replace/url_replace.php
index 7b84a77a..714fe459 100644
--- a/url_replace/url_replace.php
+++ b/url_replace/url_replace.php
@@ -30,13 +30,13 @@ function url_replace_addon_admin_post()
 	// Convert twelvefeet_sites into an array before setting the new value
 	$twelvefeet_sites = explode(PHP_EOL, $_POST['twelvefeet_sites']);
 	// Normalize URLs by using lower case, removing a trailing slash and whitespace
-	$twelvefeet_sites = array_map(fn($value): string => rtrim(trim(strtolower($value)), '/'), $twelvefeet_sites);
+	$twelvefeet_sites = array_map(fn ($value): string => rtrim(trim(strtolower($value)), '/'), $twelvefeet_sites);
 	// Do not store empty lines or duplicates
-	$twelvefeet_sites = array_filter($twelvefeet_sites, fn($value): bool => !empty($value));
+	$twelvefeet_sites = array_filter($twelvefeet_sites, fn ($value): bool => !empty($value));
 	$twelvefeet_sites = array_unique($twelvefeet_sites);
 	// Ensure a protocol and default to HTTPS
 	$twelvefeet_sites = array_map(
-		fn($value): string => substr($value, 0, 4) !== 'http' ? 'https://' . $value : $value,
+		fn ($value): string => substr($value, 0, 4) !== 'http' ? 'https://' . $value : $value,
 		$twelvefeet_sites
 	);
 	asort($twelvefeet_sites);
@@ -50,12 +50,12 @@ function url_replace_addon_admin_post()
 function url_replace_addon_admin(string &$o)
 {
 	$nitter_server_enabled    = DI::config()->get('url_replace', 'nitter_server_enabled', true);
-	$nitter_server    = DI::config()->get('url_replace', 'nitter_server');
+	$nitter_server            = DI::config()->get('url_replace', 'nitter_server');
 	$invidious_server_enabled = DI::config()->get('url_replace', 'invidious_server_enabled', true);
-	$invidious_server = DI::config()->get('url_replace', 'invidious_server');
+	$invidious_server         = DI::config()->get('url_replace', 'invidious_server');
 	$proxigram_server_enabled = DI::config()->get('url_replace', 'proxigram_server_enabled', true);
-	$proxigram_server = DI::config()->get('url_replace', 'proxigram_server');
-	$twelvefeet_sites = implode(PHP_EOL, DI::config()->get('url_replace', 'twelvefeet_sites') ?? []);
+	$proxigram_server         = DI::config()->get('url_replace', 'proxigram_server');
+	$twelvefeet_sites         = implode(PHP_EOL, DI::config()->get('url_replace', 'twelvefeet_sites') ?? []);
 
 	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/url_replace/');
 	$o = Renderer::replaceMacros($t, [
@@ -115,7 +115,7 @@ function url_replace_addon_admin(string &$o)
  */
 function url_replace_render(array &$b)
 {
-	$replaced = false;
+	$replaced     = false;
 	$replacements = [];
 
 	$nitter_server = DI::config()->get('url_replace', 'nitter_server');
@@ -139,10 +139,10 @@ function url_replace_render(array &$b)
 	$invidious_server_enabled = DI::config()->get('url_replace', 'invidious_server_enabled', true);
 	if ($invidious_server_enabled) {
 		$replacements = array_merge($replacements, [
-		'https://www.youtube.com'    => $invidious_server,
-		'https://youtube.com'        => $invidious_server,
-		'https://m.youtube.com'      => $invidious_server,
-		'https://youtu.be'           => $invidious_server,
+			'https://www.youtube.com' => $invidious_server,
+			'https://youtube.com'     => $invidious_server,
+			'https://m.youtube.com'   => $invidious_server,
+			'https://youtu.be'        => $invidious_server,
 		]);
 	}
 
@@ -153,9 +153,9 @@ function url_replace_render(array &$b)
 	$proxigram_server_enabled = DI::config()->get('url_replace', 'proxigram_server_enabled', true);
 	if ($proxigram_server_enabled) {
 		$replacements = array_merge($replacements, [
-		'https://www.instagram.com'  => $proxigram_server,
-		'https://instagram.com'      => $proxigram_server,
-		'https://ig.me'              => $proxigram_server,
+			'https://www.instagram.com' => $proxigram_server,
+			'https://instagram.com'     => $proxigram_server,
+			'https://ig.me'             => $proxigram_server,
 		]);
 	}
 
@@ -174,7 +174,6 @@ function url_replace_render(array &$b)
 		}
 	}
 
-
 	if ($replaced) {
 		$b['html'] .= '<hr><p><small>' . DI::l10n()->t('(URL replace addon enabled for X, YouTube, Instagram and some news sites.)') . '</small></p>';
 	}

From 453772e393dbc36b41d6da33c2547a65ff1d5402 Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <toddy@debian.org>
Date: Wed, 13 Mar 2024 22:54:31 +0100
Subject: [PATCH 046/294] Remove now unnecessary variable

---
 url_replace/url_replace.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/url_replace/url_replace.php b/url_replace/url_replace.php
index 714fe459..ba0d5792 100644
--- a/url_replace/url_replace.php
+++ b/url_replace/url_replace.php
@@ -115,7 +115,6 @@ function url_replace_addon_admin(string &$o)
  */
 function url_replace_render(array &$b)
 {
-	$replaced     = false;
 	$replacements = [];
 
 	$nitter_server = DI::config()->get('url_replace', 'nitter_server');
@@ -162,7 +161,6 @@ function url_replace_render(array &$b)
 	foreach ($replacements as $server => $replacement) {
 		if (strpos($b['html'], $server) !== false) {
 			$b['html'] = str_replace($server, $replacement, $b['html']);
-			$replaced  = true;
 		}
 	}
 
@@ -170,11 +168,10 @@ function url_replace_render(array &$b)
 	foreach ($twelvefeet_sites as $twelvefeet_site) {
 		if (strpos($b['html'], $twelvefeet_site) !== false) {
 			$b['html'] = str_replace($twelvefeet_site, 'https://12ft.io/' . $twelvefeet_site, $b['html']);
-			$replaced  = true;
 		}
 	}
 
-	if ($replaced) {
+	if (count($replacements) > 0) {
 		$b['html'] .= '<hr><p><small>' . DI::l10n()->t('(URL replace addon enabled for X, YouTube, Instagram and some news sites.)') . '</small></p>';
 	}
 }

From 89134542b4cee865789ad98ce6ff25de8e46d565 Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <toddy@debian.org>
Date: Wed, 13 Mar 2024 22:56:38 +0100
Subject: [PATCH 047/294] Update message catalog

---
 url_replace/lang/C/messages.po | 42 ++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/url_replace/lang/C/messages.po b/url_replace/lang/C/messages.po
index c09ad6d9..72325edf 100644
--- a/url_replace/lang/C/messages.po
+++ b/url_replace/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-05 00:06+0100\n"
+"POT-Creation-Date: 2024-03-13 22:56+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,34 +17,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: url_replace.php:54
+#: url_replace.php:64
+msgid "Replace links to X."
+msgstr ""
+
+#: url_replace.php:69
 msgid "Nitter server"
 msgstr ""
 
-#: url_replace.php:56
+#: url_replace.php:71
 msgid "Specify the URL with protocol. The default is https://nitter.net."
 msgstr ""
 
-#: url_replace.php:62
+#: url_replace.php:77
+msgid "Replace links to YouTube."
+msgstr ""
+
+#: url_replace.php:82
 msgid "Invidious server"
 msgstr ""
 
-#: url_replace.php:64
+#: url_replace.php:84
 msgid "Specify the URL with protocol. The default is https://yewtu.be."
 msgstr ""
 
-#: url_replace.php:70
+#: url_replace.php:90
+msgid "Replace links to Instagram."
+msgstr ""
+
+#: url_replace.php:95
+msgid "Proxigram server"
+msgstr ""
+
+#: url_replace.php:97
+msgid ""
+"Specify the URL with protocol. The default is https://proxigram.lunar.icu."
+msgstr ""
+
+#: url_replace.php:103
 msgid "Sites which are accessed through 12ft.io"
 msgstr ""
 
-#: url_replace.php:72
+#: url_replace.php:105
 msgid "Specify the URLs with protocol, one per line."
 msgstr ""
 
-#: url_replace.php:76
+#: url_replace.php:109
 msgid "Save settings"
 msgstr ""
 
-#: url_replace.php:125
-msgid "(URL replace addon enabled for X, YouTube and some news sites.)"
+#: url_replace.php:175
+msgid ""
+"(URL replace addon enabled for X, YouTube, Instagram and some news sites.)"
 msgstr ""

From 2cff751b128a906268b504b2bcf88aaa7a2fdec2 Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <toddy@debian.org>
Date: Wed, 13 Mar 2024 22:57:16 +0100
Subject: [PATCH 048/294] Increment version

---
 url_replace/url_replace.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/url_replace/url_replace.php b/url_replace/url_replace.php
index ba0d5792..3ab959f0 100644
--- a/url_replace/url_replace.php
+++ b/url_replace/url_replace.php
@@ -2,7 +2,7 @@
 /**
  * Name: URL Replace
  * Description: Replaces occurrences of specified URLs with the address of alternative servers in all displays of postings on a node.
- * Version: 1.0
+ * Version: 1.1
  * Author: Dr. Tobias Quathamer <https://social.anoxinon.de/@toddy>
  * Maintainer: Dr. Tobias Quathamer <https://social.anoxinon.de/@toddy>
  */

From 890bc3712fbab18581e53c9482eb8fdcd6969963 Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <toddy@debian.org>
Date: Thu, 14 Mar 2024 09:03:12 +0100
Subject: [PATCH 049/294] Use constants for the default servers

---
 url_replace/url_replace.php | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/url_replace/url_replace.php b/url_replace/url_replace.php
index 3ab959f0..3b36b285 100644
--- a/url_replace/url_replace.php
+++ b/url_replace/url_replace.php
@@ -11,6 +11,10 @@ use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
+CONST URL_REPLACE_NITTER_DEFAULT = 'https://nitter.net';
+CONST URL_REPLACE_INVIDIOUS_DEFAULT = 'https://yewtu.be';
+CONST URL_REPLACE_PROXIGRAM_DEFAULT = 'https://proxigram.lunar.icu';
+
 function url_replace_install()
 {
 	Hook::register('prepare_body_final', 'addon/url_replace/url_replace.php', 'url_replace_render');
@@ -68,9 +72,9 @@ function url_replace_addon_admin(string &$o)
 			'nitter_server',
 			DI::l10n()->t('Nitter server'),
 			$nitter_server,
-			DI::l10n()->t('Specify the URL with protocol. The default is https://nitter.net.'),
+			DI::l10n()->t('Specify the URL with protocol. The default is %s.', URL_REPLACE_NITTER_DEFAULT),
 			null,
-			'placeholder="https://nitter.net"',
+			'placeholder="'.URL_REPLACE_NITTER_DEFAULT.'"',
 		],
 		'$invidious_server_enabled' => [
 			'invidious_server_enabled',
@@ -81,9 +85,9 @@ function url_replace_addon_admin(string &$o)
 			'invidious_server',
 			DI::l10n()->t('Invidious server'),
 			$invidious_server,
-			DI::l10n()->t('Specify the URL with protocol. The default is https://yewtu.be.'),
+			DI::l10n()->t('Specify the URL with protocol. The default is %s.', URL_REPLACE_INVIDIOUS_DEFAULT),
 			null,
-			'placeholder="https://yewtu.be"',
+			'placeholder="'.URL_REPLACE_INVIDIOUS_DEFAULT.'"',
 		],
 		'$proxigram_server_enabled' => [
 			'proxigram_server_enabled',
@@ -94,9 +98,9 @@ function url_replace_addon_admin(string &$o)
 			'proxigram_server',
 			DI::l10n()->t('Proxigram server'),
 			$proxigram_server,
-			DI::l10n()->t('Specify the URL with protocol. The default is https://proxigram.lunar.icu.'),
+			DI::l10n()->t('Specify the URL with protocol. The default is %s.', URL_REPLACE_PROXIGRAM_DEFAULT),
 			null,
-			'placeholder="https://proxigram.lunar.icu"',
+			'placeholder="'.URL_REPLACE_PROXIGRAM_DEFAULT.'"',
 		],
 		'$twelvefeet_sites' => [
 			'twelvefeet_sites',
@@ -119,7 +123,7 @@ function url_replace_render(array &$b)
 
 	$nitter_server = DI::config()->get('url_replace', 'nitter_server');
 	if (empty($nitter_server)) {
-		$nitter_server = 'https://nitter.net';
+		$nitter_server = URL_REPLACE_NITTER_DEFAULT;
 	}
 	$nitter_server_enabled = DI::config()->get('url_replace', 'nitter_server_enabled', true);
 	if ($nitter_server_enabled) {
@@ -133,7 +137,7 @@ function url_replace_render(array &$b)
 
 	$invidious_server = DI::config()->get('url_replace', 'invidious_server');
 	if (empty($invidious_server)) {
-		$invidious_server = 'https://yewtu.be';
+		$invidious_server = URL_REPLACE_INVIDIOUS_DEFAULT;
 	}
 	$invidious_server_enabled = DI::config()->get('url_replace', 'invidious_server_enabled', true);
 	if ($invidious_server_enabled) {
@@ -147,7 +151,7 @@ function url_replace_render(array &$b)
 
 	$proxigram_server = DI::config()->get('url_replace', 'proxigram_server');
 	if (empty($proxigram_server)) {
-		$proxigram_server = 'https://proxigram.lunar.icu';
+		$proxigram_server = URL_REPLACE_PROXIGRAM_DEFAULT;
 	}
 	$proxigram_server_enabled = DI::config()->get('url_replace', 'proxigram_server_enabled', true);
 	if ($proxigram_server_enabled) {

From 127ab370fcee9e53970fd8d39a28cc7ca8401067 Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <toddy@debian.org>
Date: Thu, 14 Mar 2024 09:05:34 +0100
Subject: [PATCH 050/294] Update message catalog

---
 url_replace/lang/C/messages.po | 36 +++++++++++++---------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/url_replace/lang/C/messages.po b/url_replace/lang/C/messages.po
index 72325edf..e8dbb04c 100644
--- a/url_replace/lang/C/messages.po
+++ b/url_replace/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-13 22:56+0100\n"
+"POT-Creation-Date: 2024-03-14 09:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,56 +17,48 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: url_replace.php:64
+#: url_replace.php:68
 msgid "Replace links to X."
 msgstr ""
 
-#: url_replace.php:69
+#: url_replace.php:73
 msgid "Nitter server"
 msgstr ""
 
-#: url_replace.php:71
-msgid "Specify the URL with protocol. The default is https://nitter.net."
+#: url_replace.php:75 url_replace.php:88 url_replace.php:101
+#, php-format
+msgid "Specify the URL with protocol. The default is %s."
 msgstr ""
 
-#: url_replace.php:77
+#: url_replace.php:81
 msgid "Replace links to YouTube."
 msgstr ""
 
-#: url_replace.php:82
+#: url_replace.php:86
 msgid "Invidious server"
 msgstr ""
 
-#: url_replace.php:84
-msgid "Specify the URL with protocol. The default is https://yewtu.be."
-msgstr ""
-
-#: url_replace.php:90
+#: url_replace.php:94
 msgid "Replace links to Instagram."
 msgstr ""
 
-#: url_replace.php:95
+#: url_replace.php:99
 msgid "Proxigram server"
 msgstr ""
 
-#: url_replace.php:97
-msgid ""
-"Specify the URL with protocol. The default is https://proxigram.lunar.icu."
-msgstr ""
-
-#: url_replace.php:103
+#: url_replace.php:107
 msgid "Sites which are accessed through 12ft.io"
 msgstr ""
 
-#: url_replace.php:105
+#: url_replace.php:109
 msgid "Specify the URLs with protocol, one per line."
 msgstr ""
 
-#: url_replace.php:109
+#: url_replace.php:113
 msgid "Save settings"
 msgstr ""
 
-#: url_replace.php:175
+#: url_replace.php:179
 msgid ""
 "(URL replace addon enabled for X, YouTube, Instagram and some news sites.)"
 msgstr ""

From e24e3f758adb8e859bbf9fb2d28bbe5431db3e21 Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <toddy@debian.org>
Date: Thu, 14 Mar 2024 09:31:58 +0100
Subject: [PATCH 051/294] Fix formatting

---
 url_replace/url_replace.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/url_replace/url_replace.php b/url_replace/url_replace.php
index 3b36b285..db128f6d 100644
--- a/url_replace/url_replace.php
+++ b/url_replace/url_replace.php
@@ -11,9 +11,9 @@ use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
-CONST URL_REPLACE_NITTER_DEFAULT = 'https://nitter.net';
-CONST URL_REPLACE_INVIDIOUS_DEFAULT = 'https://yewtu.be';
-CONST URL_REPLACE_PROXIGRAM_DEFAULT = 'https://proxigram.lunar.icu';
+const URL_REPLACE_NITTER_DEFAULT    = 'https://nitter.net';
+const URL_REPLACE_INVIDIOUS_DEFAULT = 'https://yewtu.be';
+const URL_REPLACE_PROXIGRAM_DEFAULT = 'https://proxigram.lunar.icu';
 
 function url_replace_install()
 {

From fc33555cd66528c370b901041946c35973ec0674 Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <toddy@debian.org>
Date: Sat, 16 Mar 2024 11:33:48 +0100
Subject: [PATCH 052/294] Remove configuration value if no server URL is
 provided

---
 url_replace/url_replace.php | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/url_replace/url_replace.php b/url_replace/url_replace.php
index db128f6d..1590d3fa 100644
--- a/url_replace/url_replace.php
+++ b/url_replace/url_replace.php
@@ -26,11 +26,26 @@ function url_replace_install()
 function url_replace_addon_admin_post()
 {
 	DI::config()->set('url_replace', 'nitter_server_enabled', !empty($_POST['nitter_server_enabled']));
-	DI::config()->set('url_replace', 'nitter_server', rtrim(trim($_POST['nitter_server']), '/'));
+	$server = rtrim(trim($_POST['nitter_server']), '/');
+	if (empty($server)) {
+		DI::config()->delete('url_replace', 'nitter_server');
+	} else {
+		DI::config()->set('url_replace', 'nitter_server', $server);
+	}
 	DI::config()->set('url_replace', 'invidious_server_enabled', !empty($_POST['invidious_server_enabled']));
-	DI::config()->set('url_replace', 'invidious_server', rtrim(trim($_POST['invidious_server']), '/'));
+	$server = rtrim(trim($_POST['invidious_server']), '/');
+	if (empty($server)) {
+		DI::config()->delete('url_replace', 'invidious_server');
+	} else {
+		DI::config()->set('url_replace', 'invidious_server', $server);
+	}
 	DI::config()->set('url_replace', 'proxigram_server_enabled', !empty($_POST['proxigram_server_enabled']));
-	DI::config()->set('url_replace', 'proxigram_server', rtrim(trim($_POST['proxigram_server']), '/'));
+	$server = rtrim(trim($_POST['proxigram_server']), '/');
+	if (empty($server)) {
+		DI::config()->delete('url_replace', 'proxigram_server');
+	} else {
+		DI::config()->set('url_replace', 'proxigram_server', $server);
+	}
 	// Convert twelvefeet_sites into an array before setting the new value
 	$twelvefeet_sites = explode(PHP_EOL, $_POST['twelvefeet_sites']);
 	// Normalize URLs by using lower case, removing a trailing slash and whitespace
@@ -121,10 +136,7 @@ function url_replace_render(array &$b)
 {
 	$replacements = [];
 
-	$nitter_server = DI::config()->get('url_replace', 'nitter_server');
-	if (empty($nitter_server)) {
-		$nitter_server = URL_REPLACE_NITTER_DEFAULT;
-	}
+	$nitter_server = DI::config()->get('url_replace', 'nitter_server') ?? URL_REPLACE_NITTER_DEFAULT;
 	$nitter_server_enabled = DI::config()->get('url_replace', 'nitter_server_enabled', true);
 	if ($nitter_server_enabled) {
 		$replacements = array_merge($replacements, [
@@ -135,10 +147,7 @@ function url_replace_render(array &$b)
 		]);
 	}
 
-	$invidious_server = DI::config()->get('url_replace', 'invidious_server');
-	if (empty($invidious_server)) {
-		$invidious_server = URL_REPLACE_INVIDIOUS_DEFAULT;
-	}
+	$invidious_server = DI::config()->get('url_replace', 'invidious_server') ?? URL_REPLACE_INVIDIOUS_DEFAULT;
 	$invidious_server_enabled = DI::config()->get('url_replace', 'invidious_server_enabled', true);
 	if ($invidious_server_enabled) {
 		$replacements = array_merge($replacements, [
@@ -149,10 +158,7 @@ function url_replace_render(array &$b)
 		]);
 	}
 
-	$proxigram_server = DI::config()->get('url_replace', 'proxigram_server');
-	if (empty($proxigram_server)) {
-		$proxigram_server = URL_REPLACE_PROXIGRAM_DEFAULT;
-	}
+	$proxigram_server = DI::config()->get('url_replace', 'proxigram_server') ?? URL_REPLACE_PROXIGRAM_DEFAULT;
 	$proxigram_server_enabled = DI::config()->get('url_replace', 'proxigram_server_enabled', true);
 	if ($proxigram_server_enabled) {
 		$replacements = array_merge($replacements, [

From a110b2f6c11b9c779825450e30221fd95a3a5199 Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <toddy@debian.org>
Date: Sat, 16 Mar 2024 20:26:38 +0100
Subject: [PATCH 053/294] Reformat code to apply standards

---
 url_replace/url_replace.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/url_replace/url_replace.php b/url_replace/url_replace.php
index 1590d3fa..54b407e4 100644
--- a/url_replace/url_replace.php
+++ b/url_replace/url_replace.php
@@ -89,7 +89,7 @@ function url_replace_addon_admin(string &$o)
 			$nitter_server,
 			DI::l10n()->t('Specify the URL with protocol. The default is %s.', URL_REPLACE_NITTER_DEFAULT),
 			null,
-			'placeholder="'.URL_REPLACE_NITTER_DEFAULT.'"',
+			'placeholder="' . URL_REPLACE_NITTER_DEFAULT . '"',
 		],
 		'$invidious_server_enabled' => [
 			'invidious_server_enabled',
@@ -102,7 +102,7 @@ function url_replace_addon_admin(string &$o)
 			$invidious_server,
 			DI::l10n()->t('Specify the URL with protocol. The default is %s.', URL_REPLACE_INVIDIOUS_DEFAULT),
 			null,
-			'placeholder="'.URL_REPLACE_INVIDIOUS_DEFAULT.'"',
+			'placeholder="' . URL_REPLACE_INVIDIOUS_DEFAULT . '"',
 		],
 		'$proxigram_server_enabled' => [
 			'proxigram_server_enabled',
@@ -115,7 +115,7 @@ function url_replace_addon_admin(string &$o)
 			$proxigram_server,
 			DI::l10n()->t('Specify the URL with protocol. The default is %s.', URL_REPLACE_PROXIGRAM_DEFAULT),
 			null,
-			'placeholder="'.URL_REPLACE_PROXIGRAM_DEFAULT.'"',
+			'placeholder="' . URL_REPLACE_PROXIGRAM_DEFAULT . '"',
 		],
 		'$twelvefeet_sites' => [
 			'twelvefeet_sites',
@@ -136,8 +136,8 @@ function url_replace_render(array &$b)
 {
 	$replacements = [];
 
-	$nitter_server = DI::config()->get('url_replace', 'nitter_server') ?? URL_REPLACE_NITTER_DEFAULT;
-	$nitter_server_enabled = DI::config()->get('url_replace', 'nitter_server_enabled', true);
+	$nitter_server         = DI::config()->get('url_replace', 'nitter_server')         ?? URL_REPLACE_NITTER_DEFAULT;
+	$nitter_server_enabled = DI::config()->get('url_replace', 'nitter_server_enabled') ?? true;
 	if ($nitter_server_enabled) {
 		$replacements = array_merge($replacements, [
 			'https://mobile.twitter.com' => $nitter_server,
@@ -147,8 +147,8 @@ function url_replace_render(array &$b)
 		]);
 	}
 
-	$invidious_server = DI::config()->get('url_replace', 'invidious_server') ?? URL_REPLACE_INVIDIOUS_DEFAULT;
-	$invidious_server_enabled = DI::config()->get('url_replace', 'invidious_server_enabled', true);
+	$invidious_server         = DI::config()->get('url_replace', 'invidious_server')         ?? URL_REPLACE_INVIDIOUS_DEFAULT;
+	$invidious_server_enabled = DI::config()->get('url_replace', 'invidious_server_enabled') ?? true;
 	if ($invidious_server_enabled) {
 		$replacements = array_merge($replacements, [
 			'https://www.youtube.com' => $invidious_server,
@@ -158,8 +158,8 @@ function url_replace_render(array &$b)
 		]);
 	}
 
-	$proxigram_server = DI::config()->get('url_replace', 'proxigram_server') ?? URL_REPLACE_PROXIGRAM_DEFAULT;
-	$proxigram_server_enabled = DI::config()->get('url_replace', 'proxigram_server_enabled', true);
+	$proxigram_server         = DI::config()->get('url_replace', 'proxigram_server')         ?? URL_REPLACE_PROXIGRAM_DEFAULT;
+	$proxigram_server_enabled = DI::config()->get('url_replace', 'proxigram_server_enabled') ?? true;
 	if ($proxigram_server_enabled) {
 		$replacements = array_merge($replacements, [
 			'https://www.instagram.com' => $proxigram_server,

From 32f698ce10ac2e790a8723a4a2387b58baacb10a Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <toddy@debian.org>
Date: Mon, 18 Mar 2024 11:05:09 +0100
Subject: [PATCH 054/294] Only show small info about replacements if the
 original has changed

---
 url_replace/url_replace.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/url_replace/url_replace.php b/url_replace/url_replace.php
index 54b407e4..622ac720 100644
--- a/url_replace/url_replace.php
+++ b/url_replace/url_replace.php
@@ -134,6 +134,7 @@ function url_replace_addon_admin(string &$o)
  */
 function url_replace_render(array &$b)
 {
+	$replaced     = false;
 	$replacements = [];
 
 	$nitter_server         = DI::config()->get('url_replace', 'nitter_server')         ?? URL_REPLACE_NITTER_DEFAULT;
@@ -171,6 +172,7 @@ function url_replace_render(array &$b)
 	foreach ($replacements as $server => $replacement) {
 		if (strpos($b['html'], $server) !== false) {
 			$b['html'] = str_replace($server, $replacement, $b['html']);
+			$replaced  = true;
 		}
 	}
 
@@ -178,10 +180,11 @@ function url_replace_render(array &$b)
 	foreach ($twelvefeet_sites as $twelvefeet_site) {
 		if (strpos($b['html'], $twelvefeet_site) !== false) {
 			$b['html'] = str_replace($twelvefeet_site, 'https://12ft.io/' . $twelvefeet_site, $b['html']);
+			$replaced  = true;
 		}
 	}
 
-	if (count($replacements) > 0) {
+	if ($replaced) {
 		$b['html'] .= '<hr><p><small>' . DI::l10n()->t('(URL replace addon enabled for X, YouTube, Instagram and some news sites.)') . '</small></p>';
 	}
 }

From cfbbeaac62bf3c4eaf526824c46e1837055e5a12 Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <toddy@debian.org>
Date: Mon, 18 Mar 2024 11:11:24 +0100
Subject: [PATCH 055/294] Use invidio.us as default

---
 url_replace/url_replace.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/url_replace/url_replace.php b/url_replace/url_replace.php
index 622ac720..e5f02412 100644
--- a/url_replace/url_replace.php
+++ b/url_replace/url_replace.php
@@ -12,7 +12,7 @@ use Friendica\Core\Renderer;
 use Friendica\DI;
 
 const URL_REPLACE_NITTER_DEFAULT    = 'https://nitter.net';
-const URL_REPLACE_INVIDIOUS_DEFAULT = 'https://yewtu.be';
+const URL_REPLACE_INVIDIOUS_DEFAULT = 'https://invidio.us';
 const URL_REPLACE_PROXIGRAM_DEFAULT = 'https://proxigram.lunar.icu';
 
 function url_replace_install()

From 67c44792fd69b5dccc1cd7caf04d86e39e0457f0 Mon Sep 17 00:00:00 2001
From: MrPetovan <hypolite@mrpetovan.com>
Date: Tue, 19 Mar 2024 12:56:08 -0400
Subject: [PATCH 056/294] [url_replace] Simplify config setting conditions

- Add default values for config values in url_replace_addon_admin()
- Capitalize brand names
---
 url_replace/url_replace.php | 38 ++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/url_replace/url_replace.php b/url_replace/url_replace.php
index e5f02412..cd3b60b4 100644
--- a/url_replace/url_replace.php
+++ b/url_replace/url_replace.php
@@ -26,25 +26,25 @@ function url_replace_install()
 function url_replace_addon_admin_post()
 {
 	DI::config()->set('url_replace', 'nitter_server_enabled', !empty($_POST['nitter_server_enabled']));
-	$server = rtrim(trim($_POST['nitter_server']), '/');
-	if (empty($server)) {
-		DI::config()->delete('url_replace', 'nitter_server');
+	$nitter_server = rtrim(trim($_POST['nitter_server']), '/');
+	if ($nitter_server) {
+		DI::config()->set('url_replace', 'nitter_server', $nitter_server);
 	} else {
-		DI::config()->set('url_replace', 'nitter_server', $server);
+		DI::config()->delete('url_replace', 'nitter_server');
 	}
 	DI::config()->set('url_replace', 'invidious_server_enabled', !empty($_POST['invidious_server_enabled']));
-	$server = rtrim(trim($_POST['invidious_server']), '/');
-	if (empty($server)) {
-		DI::config()->delete('url_replace', 'invidious_server');
+	$invidious_server = rtrim(trim($_POST['invidious_server']), '/');
+	if ($invidious_server) {
+		DI::config()->set('url_replace', 'invidious_server', $invidious_server);
 	} else {
-		DI::config()->set('url_replace', 'invidious_server', $server);
+		DI::config()->delete('url_replace', 'invidious_server');
 	}
 	DI::config()->set('url_replace', 'proxigram_server_enabled', !empty($_POST['proxigram_server_enabled']));
-	$server = rtrim(trim($_POST['proxigram_server']), '/');
-	if (empty($server)) {
-		DI::config()->delete('url_replace', 'proxigram_server');
+	$proxigram_server = rtrim(trim($_POST['proxigram_server']), '/');
+	if ($proxigram_server) {
+		DI::config()->set('url_replace', 'proxigram_server', $proxigram_server);
 	} else {
-		DI::config()->set('url_replace', 'proxigram_server', $server);
+		DI::config()->delete('url_replace', 'proxigram_server');
 	}
 	// Convert twelvefeet_sites into an array before setting the new value
 	$twelvefeet_sites = explode(PHP_EOL, $_POST['twelvefeet_sites']);
@@ -64,16 +64,16 @@ function url_replace_addon_admin_post()
 
 /**
  * Hook into admin settings to enable choosing a different server
- * for twitter, youtube, instagram, and news sites.
+ * for Twitter, YouTube, Instagram, and news sites.
  */
 function url_replace_addon_admin(string &$o)
 {
-	$nitter_server_enabled    = DI::config()->get('url_replace', 'nitter_server_enabled', true);
-	$nitter_server            = DI::config()->get('url_replace', 'nitter_server');
-	$invidious_server_enabled = DI::config()->get('url_replace', 'invidious_server_enabled', true);
-	$invidious_server         = DI::config()->get('url_replace', 'invidious_server');
-	$proxigram_server_enabled = DI::config()->get('url_replace', 'proxigram_server_enabled', true);
-	$proxigram_server         = DI::config()->get('url_replace', 'proxigram_server');
+	$nitter_server_enabled    = DI::config()->get('url_replace', 'nitter_server_enabled')    ?? true;
+	$nitter_server            = DI::config()->get('url_replace', 'nitter_server')            ?? '';
+	$invidious_server_enabled = DI::config()->get('url_replace', 'invidious_server_enabled') ?? true;
+	$invidious_server         = DI::config()->get('url_replace', 'invidious_server')         ?? '';
+	$proxigram_server_enabled = DI::config()->get('url_replace', 'proxigram_server_enabled') ?? true;
+	$proxigram_server         = DI::config()->get('url_replace', 'proxigram_server')         ?? '';
 	$twelvefeet_sites         = implode(PHP_EOL, DI::config()->get('url_replace', 'twelvefeet_sites') ?? []);
 
 	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/url_replace/');

From da8681c8c4b914f71ac465858aa2ebb103e81d5b Mon Sep 17 00:00:00 2001
From: MrPetovan <hypolite@mrpetovan.com>
Date: Tue, 19 Mar 2024 12:56:08 -0400
Subject: [PATCH 057/294] [invidious] Drop support for the addon

- Please use the URL replace addon instead
---
 invidious/invidious.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/invidious/invidious.php b/invidious/invidious.php
index ec16b4dc..1078d26d 100644
--- a/invidious/invidious.php
+++ b/invidious/invidious.php
@@ -5,7 +5,8 @@
  * Version: 0.3
  * Author: Matthias Ebers <https://loma.ml/profile/feb>
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
- *
+ * Status: Unsupported
+ * Note: Please use the URL Replace addon instead
  */
 
 use Friendica\Core\Hook;
@@ -91,7 +92,7 @@ function invidious_render(array &$b)
 
 	$original = $b['html'];
 	$server   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'invidious', 'server', DI::config()->get('invidious', 'server', INVIDIOUS_DEFAULT));
-	
+
 	$b['html'] = preg_replace("/https?:\/\/www.youtube.com\/watch\?v\=(.*?)/ism", $server . '/watch?v=$1', $b['html']);
 	$b['html'] = preg_replace("/https?:\/\/www.youtube.com\/embed\/(.*?)/ism", $server . '/embed/$1', $b['html']);
 	$b['html'] = preg_replace("/https?:\/\/www.youtube.com\/shorts\/(.*?)/ism", $server . '/shorts/$1', $b['html']);

From 872a438dcf18ef6a2925d59abf77520d5800e609 Mon Sep 17 00:00:00 2001
From: MrPetovan <hypolite@mrpetovan.com>
Date: Tue, 19 Mar 2024 12:56:08 -0400
Subject: [PATCH 058/294] [nitter] Drop support for the addon

- Please use the URL replace addon instead
---
 nitter/nitter.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/nitter/nitter.php b/nitter/nitter.php
index e9454c5d..946b18c0 100644
--- a/nitter/nitter.php
+++ b/nitter/nitter.php
@@ -4,18 +4,20 @@
  * Description: Replaces links to twitter.com to a nitter server in all displays of postings on a node.
  * Version: 2.0
  * Author: Tobias Diekershoff <tobias@social.diekershoff.de>
+ * Status: Unsupported
+ * Note: Please use the URL Replace addon instead
  *
  * Copyright (c) 2020 Tobias Diekershoff
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and 
+ * 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,
@@ -49,7 +51,7 @@ function nitter_addon_admin(string &$o)
 	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/nitter/');
 	$o = Renderer::replaceMacros($t, [
 		'$settingdescription' => DI::l10n()->t('Which nitter server shall be used for the replacements in the post bodies? Use the URL with servername and protocol.  See %s for a list of available public Nitter servers.', 'https://github.com/zedeus/nitter/wiki/Instances'),
-		'$nitterserver' => ['nitterserver', DI::l10n()->t('Nitter server'), $nitterserver, 'https://example.com'], 
+		'$nitterserver' => ['nitterserver', DI::l10n()->t('Nitter server'), $nitterserver, 'https://example.com'],
 		'$submit' => DI::l10n()->t('Save Settings'),
 	]);
 }

From 46c65b79be24746a4b6699d0e6065a1efa5ef982 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Tue, 19 Mar 2024 22:28:30 -0400
Subject: [PATCH 059/294] [advancedcontentfilter] Improve error handling

- Add Logger to Slim application to log to Friendica log file
- Show more specific error message when rule syntax check fails
- Align editorconfig with Composer style
- Add minimum PHP version to composer.json
---
 .editorconfig                                 |  3 ++
 .../advancedcontentfilter.js                  |  4 +-
 advancedcontentfilter/composer.json           | 47 ++++++++++---------
 advancedcontentfilter/src/middlewares.php     |  2 +-
 4 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 8565b274..ef6e90b2 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -27,3 +27,6 @@ indent_size = 2
 [*.json]
 indent_style = space
 indent_size = 2
+
+[composer.json]
+indent_size = 4
diff --git a/advancedcontentfilter/advancedcontentfilter.js b/advancedcontentfilter/advancedcontentfilter.js
index fcf7b096..a8fc1c65 100644
--- a/advancedcontentfilter/advancedcontentfilter.js
+++ b/advancedcontentfilter/advancedcontentfilter.js
@@ -54,7 +54,7 @@ new Vue({
 					self.rules.push(responseJSON.rule);
 					self.resetForm();
 				}, function (response) {
-					self.errorMessage = response.responseJSON.message;
+					self.errorMessage = response.responseJSON.exception[0].message;
 				});
 			}
 		},
@@ -74,7 +74,7 @@ new Vue({
 				self.rules[self.editedIndex] = rule;
 				self.resetForm();
 			}, function (response) {
-				self.errorMessage = response.responseJSON.message;
+				self.errorMessage = response.responseJSON.exception[0].message;
 			});
 		},
 
diff --git a/advancedcontentfilter/composer.json b/advancedcontentfilter/composer.json
index ceb152e7..b9ab1900 100644
--- a/advancedcontentfilter/composer.json
+++ b/advancedcontentfilter/composer.json
@@ -1,24 +1,27 @@
 {
-	"name": "friendica-addons/advancedcontentfilter",
-	"description": "Advanced Content Filter addon for Friendica",
-	"type": "friendica-addon",
-	"authors": [
-		{
-			"name": "Hypolite Petovan",
-			"email": "hypolite@mrpetovan.com",
-			"homepage": "https://friendica.mrpetovan.com/profile/hypolite",
-			"role": "Developer"
-		}
-	],
-	"require": {
-		"slim/slim": "^4",
-		"symfony/expression-language": "^3.4"
-	},
-	"license": "3-clause BSD license",
-	"minimum-stability": "stable",
-	"config": {
-		"optimize-autoloader": true,
-		"autoloader-suffix": "AdvancedContentFilterAddon",
-		"preferred-install": "dist"
-	}
+    "name": "friendica-addons/advancedcontentfilter",
+    "description": "Advanced Content Filter addon for Friendica",
+    "type": "friendica-addon",
+    "authors": [
+        {
+            "name": "Hypolite Petovan",
+            "email": "hypolite@mrpetovan.com",
+            "homepage": "https://friendica.mrpetovan.com/profile/hypolite",
+            "role": "Developer"
+        }
+    ],
+    "require": {
+        "slim/slim": "^4",
+        "symfony/expression-language": "^3.4"
+    },
+    "license": "3-clause BSD license",
+    "minimum-stability": "stable",
+    "config": {
+        "platform": {
+            "php": "7.4"
+        },
+        "optimize-autoloader": true,
+        "autoloader-suffix": "AdvancedContentFilterAddon",
+        "preferred-install": "dist"
+    }
 }
diff --git a/advancedcontentfilter/src/middlewares.php b/advancedcontentfilter/src/middlewares.php
index 84dd6ed8..2b831473 100644
--- a/advancedcontentfilter/src/middlewares.php
+++ b/advancedcontentfilter/src/middlewares.php
@@ -29,4 +29,4 @@ use Friendica\DI;
  */
 $slim->addRoutingMiddleware();
 
-$errorMiddleware = $slim->addErrorMiddleware(true, true, true);
+$errorMiddleware = $slim->addErrorMiddleware(true, true, true, DI::logger());

From b0ee9fdf2aafe67bb8e36e571cb6b5eef58bb3b4 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Tue, 19 Mar 2024 22:35:09 -0400
Subject: [PATCH 060/294] [advancedcontentfilter] Update Composer dependencies
 ahead of release

- Removing symfony/polyfill-apcu (v1.28.0)
- Removing psr/simple-cache (1.0.1)
- Updating psr/http-message (1.1 => 2.0)
- Downgrading psr/container (2.0.2 => 1.1.2)
- Updating slim/slim (4.12.0 => 4.13.0)
- Installing symfony/polyfill-php80 (v1.29.0)
- Installing symfony/var-exporter (v5.4.35)
- Installing symfony/deprecation-contracts (v2.5.2)
- Installing symfony/service-contracts (v2.5.2)
- Installing symfony/polyfill-php73 (v1.29.0)
- Installing symfony/cache-contracts (v2.5.2)
- Updating symfony/cache (v3.4.47 => v4.4.48)
---
 advancedcontentfilter/composer.lock           | 671 ++++++++++++-----
 .../vendor/composer/autoload_classmap.php     |  57 +-
 .../vendor/composer/autoload_files.php        |   4 +-
 .../vendor/composer/autoload_psr4.php         |   7 +-
 .../vendor/composer/autoload_static.php       |  92 ++-
 .../vendor/composer/installed.json            | 686 +++++++++++++-----
 .../vendor/psr/container/composer.json        |   5 -
 .../psr/container/src/ContainerInterface.php  |   2 +-
 .../vendor/psr/http-message/composer.json     |   4 +-
 .../psr/http-message/src/MessageInterface.php |  24 +-
 .../psr/http-message/src/RequestInterface.php |  15 +-
 .../http-message/src/ResponseInterface.php    |   8 +-
 .../src/ServerRequestInterface.php            |  24 +-
 .../psr/http-message/src/StreamInterface.php  |  28 +-
 .../src/UploadedFileInterface.php             |  14 +-
 .../psr/http-message/src/UriInterface.php     |  34 +-
 .../HttpTooManyRequestsException.php          |  28 +
 .../vendor/slim/slim/composer.json            |  14 +-
 .../vendor/symfony/cache-contracts/.gitignore |   3 +
 .../symfony/cache-contracts/CHANGELOG.md      |   5 +
 .../cache-contracts/CacheInterface.php        |  57 ++
 .../symfony/cache-contracts/CacheTrait.php    |  80 ++
 .../cache-contracts/CallbackInterface.php     |  30 +
 .../symfony/cache-contracts/ItemInterface.php |  65 ++
 .../vendor/symfony/cache-contracts/LICENSE    |  19 +
 .../vendor/symfony/cache-contracts/README.md  |   9 +
 .../TagAwareCacheInterface.php                |  38 +
 .../symfony/cache-contracts/composer.json     |  38 +
 .../symfony/cache/Adapter/AbstractAdapter.php | 220 ++----
 .../cache/Adapter/AbstractTagAwareAdapter.php | 334 +++++++++
 .../cache/Adapter/AdapterInterface.php        |  12 +
 .../symfony/cache/Adapter/ApcuAdapter.php     |   6 +-
 .../symfony/cache/Adapter/ArrayAdapter.php    |  95 ++-
 .../symfony/cache/Adapter/ChainAdapter.php    |  90 ++-
 .../symfony/cache/Adapter/DoctrineAdapter.php |   6 +-
 .../cache/Adapter/FilesystemAdapter.php       |  10 +-
 .../Adapter/FilesystemTagAwareAdapter.php     | 239 ++++++
 .../cache/Adapter/MemcachedAdapter.php        |   5 +-
 .../symfony/cache/Adapter/NullAdapter.php     |  47 +-
 .../symfony/cache/Adapter/PdoAdapter.php      |  13 +-
 .../symfony/cache/Adapter/PhpArrayAdapter.php | 112 +--
 .../symfony/cache/Adapter/PhpFilesAdapter.php |  19 +-
 .../symfony/cache/Adapter/ProxyAdapter.php    | 111 ++-
 .../symfony/cache/Adapter/Psr16Adapter.php    |  86 +++
 .../symfony/cache/Adapter/RedisAdapter.php    |  13 +-
 .../cache/Adapter/RedisTagAwareAdapter.php    | 321 ++++++++
 .../cache/Adapter/SimpleCacheAdapter.php      |  68 +-
 .../symfony/cache/Adapter/TagAwareAdapter.php |  90 ++-
 .../cache/Adapter/TraceableAdapter.php        |  75 +-
 .../Adapter/TraceableTagAwareAdapter.php      |   4 +-
 .../vendor/symfony/cache/CHANGELOG.md         |  39 +-
 .../vendor/symfony/cache/CacheItem.php        |  88 ++-
 .../DataCollector/CacheDataCollector.php      |  28 +-
 .../CacheCollectorPass.php                    |  81 +++
 .../CachePoolClearerPass.php                  |  48 ++
 .../DependencyInjection/CachePoolPass.php     | 228 ++++++
 .../CachePoolPrunerPass.php                   |  60 ++
 .../vendor/symfony/cache/DoctrineProvider.php |  19 +-
 .../cache/Exception/CacheException.php        |  10 +-
 .../Exception/InvalidArgumentException.php    |  10 +-
 .../cache/Exception/LogicException.php        |  25 +
 .../vendor/symfony/cache/LICENSE              |   2 +-
 .../vendor/symfony/cache/LockRegistry.php     | 161 ++++
 .../cache/Marshaller/DefaultMarshaller.php    |  99 +++
 .../cache/Marshaller/DeflateMarshaller.php    |  53 ++
 .../cache/Marshaller/MarshallerInterface.php  |  40 +
 .../cache/Marshaller/TagAwareMarshaller.php   |  89 +++
 .../vendor/symfony/cache/Psr16Cache.php       | 284 ++++++++
 .../vendor/symfony/cache/README.md            |  23 +-
 .../symfony/cache/ResettableInterface.php     |   5 +-
 .../symfony/cache/Simple/AbstractCache.php    |  49 +-
 .../vendor/symfony/cache/Simple/ApcuCache.php |  14 +-
 .../symfony/cache/Simple/ArrayCache.php       |  69 +-
 .../symfony/cache/Simple/ChainCache.php       |  43 +-
 .../symfony/cache/Simple/DoctrineCache.php    |  13 +-
 .../symfony/cache/Simple/FilesystemCache.php  |  17 +-
 .../symfony/cache/Simple/MemcachedCache.php   |  16 +-
 .../vendor/symfony/cache/Simple/NullCache.php |  24 +-
 .../vendor/symfony/cache/Simple/PdoCache.php  |  20 +-
 .../symfony/cache/Simple/PhpArrayCache.php    |  93 ++-
 .../symfony/cache/Simple/PhpFilesCache.php    |  26 +-
 .../vendor/symfony/cache/Simple/Psr6Cache.php | 228 +-----
 .../symfony/cache/Simple/RedisCache.php       |  18 +-
 .../symfony/cache/Simple/TraceableCache.php   |  33 +-
 .../cache/Traits/AbstractAdapterTrait.php     | 164 +++++
 .../symfony/cache/Traits/AbstractTrait.php    |  84 ++-
 .../vendor/symfony/cache/Traits/ApcuTrait.php |  41 +-
 .../symfony/cache/Traits/ArrayTrait.php       | 118 ++-
 .../symfony/cache/Traits/ContractsTrait.php   | 109 +++
 .../symfony/cache/Traits/DoctrineTrait.php    |   2 +-
 .../cache/Traits/FilesystemCommonTrait.php    |  82 ++-
 .../symfony/cache/Traits/FilesystemTrait.php  |  35 +-
 .../symfony/cache/Traits/MemcachedTrait.php   | 102 ++-
 .../vendor/symfony/cache/Traits/PdoTrait.php  | 204 ++++--
 .../symfony/cache/Traits/PhpArrayTrait.php    |  89 ++-
 .../symfony/cache/Traits/PhpFilesTrait.php    | 263 +++++--
 .../symfony/cache/Traits/ProxyTrait.php       |   4 +-
 .../cache/Traits/RedisClusterNodeProxy.php    |  53 ++
 .../cache/Traits/RedisClusterProxy.php        |  63 ++
 .../symfony/cache/Traits/RedisProxy.php       |   2 +-
 .../symfony/cache/Traits/RedisTrait.php       | 403 +++++++---
 .../vendor/symfony/cache/composer.json        |  37 +-
 .../symfony/deprecation-contracts/.gitignore  |   3 +
 .../deprecation-contracts/CHANGELOG.md        |   5 +
 .../symfony/deprecation-contracts/LICENSE     |  19 +
 .../symfony/deprecation-contracts/README.md   |  26 +
 .../deprecation-contracts/composer.json       |  35 +
 .../deprecation-contracts/function.php        |  27 +
 .../vendor/symfony/polyfill-php73/LICENSE     |  19 +
 .../vendor/symfony/polyfill-php73/Php73.php   |  43 ++
 .../vendor/symfony/polyfill-php73/README.md   |  18 +
 .../Resources/stubs/JsonException.php         |  16 +
 .../symfony/polyfill-php73/bootstrap.php      |  31 +
 .../symfony/polyfill-php73/composer.json      |  33 +
 .../vendor/symfony/polyfill-php80/LICENSE     |  19 +
 .../vendor/symfony/polyfill-php80/Php80.php   | 115 +++
 .../symfony/polyfill-php80/PhpToken.php       | 103 +++
 .../vendor/symfony/polyfill-php80/README.md   |  25 +
 .../Resources/stubs/Attribute.php             |  31 +
 .../Resources/stubs/PhpToken.php              |  16 +
 .../Resources/stubs/Stringable.php            |  20 +
 .../Resources/stubs/UnhandledMatchError.php   |  16 +
 .../Resources/stubs/ValueError.php            |  16 +
 .../symfony/polyfill-php80/bootstrap.php      |  42 ++
 .../symfony/polyfill-php80/composer.json      |  37 +
 .../symfony/service-contracts/.gitignore      |   3 +
 .../service-contracts/Attribute/Required.php  |  25 +
 .../Attribute/SubscribedService.php           |  33 +
 .../symfony/service-contracts/CHANGELOG.md    |   5 +
 .../vendor/symfony/service-contracts/LICENSE  |  19 +
 .../symfony/service-contracts/README.md       |   9 +
 .../service-contracts/ResetInterface.php      |  30 +
 .../service-contracts/ServiceLocatorTrait.php | 128 ++++
 .../ServiceProviderInterface.php              |  36 +
 .../ServiceSubscriberInterface.php            |  53 ++
 .../ServiceSubscriberTrait.php                | 109 +++
 .../Test/ServiceLocatorTest.php               |  95 +++
 .../symfony/service-contracts/composer.json   |  42 ++
 .../vendor/symfony/var-exporter/CHANGELOG.md  |  12 +
 .../Exception/ClassNotFoundException.php      |  20 +
 .../Exception/ExceptionInterface.php          |  16 +
 .../NotInstantiableTypeException.php          |  20 +
 .../symfony/var-exporter/Instantiator.php     |  92 +++
 .../var-exporter/Internal/Exporter.php        | 417 +++++++++++
 .../var-exporter/Internal/Hydrator.php        | 152 ++++
 .../var-exporter/Internal/Reference.php       |  30 +
 .../var-exporter/Internal/Registry.php        | 146 ++++
 .../symfony/var-exporter/Internal/Values.php  |  27 +
 .../vendor/symfony/var-exporter/LICENSE       |  19 +
 .../vendor/symfony/var-exporter/README.md     |  38 +
 .../symfony/var-exporter/VarExporter.php      | 115 +++
 .../vendor/symfony/var-exporter/composer.json |  32 +
 152 files changed, 8680 insertions(+), 1705 deletions(-)
 create mode 100644 advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpTooManyRequestsException.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache-contracts/.gitignore
 create mode 100644 advancedcontentfilter/vendor/symfony/cache-contracts/CHANGELOG.md
 create mode 100644 advancedcontentfilter/vendor/symfony/cache-contracts/CacheInterface.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache-contracts/CacheTrait.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache-contracts/CallbackInterface.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache-contracts/ItemInterface.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache-contracts/LICENSE
 create mode 100644 advancedcontentfilter/vendor/symfony/cache-contracts/README.md
 create mode 100644 advancedcontentfilter/vendor/symfony/cache-contracts/TagAwareCacheInterface.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache-contracts/composer.json
 create mode 100644 advancedcontentfilter/vendor/symfony/cache/Adapter/AbstractTagAwareAdapter.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache/Adapter/FilesystemTagAwareAdapter.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache/Adapter/Psr16Adapter.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache/Adapter/RedisTagAwareAdapter.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CacheCollectorPass.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CachePoolClearerPass.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CachePoolPass.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CachePoolPrunerPass.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache/Exception/LogicException.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache/LockRegistry.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache/Marshaller/DefaultMarshaller.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache/Marshaller/DeflateMarshaller.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache/Marshaller/MarshallerInterface.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache/Marshaller/TagAwareMarshaller.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache/Psr16Cache.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache/Traits/AbstractAdapterTrait.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache/Traits/ContractsTrait.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache/Traits/RedisClusterNodeProxy.php
 create mode 100644 advancedcontentfilter/vendor/symfony/cache/Traits/RedisClusterProxy.php
 create mode 100644 advancedcontentfilter/vendor/symfony/deprecation-contracts/.gitignore
 create mode 100644 advancedcontentfilter/vendor/symfony/deprecation-contracts/CHANGELOG.md
 create mode 100644 advancedcontentfilter/vendor/symfony/deprecation-contracts/LICENSE
 create mode 100644 advancedcontentfilter/vendor/symfony/deprecation-contracts/README.md
 create mode 100644 advancedcontentfilter/vendor/symfony/deprecation-contracts/composer.json
 create mode 100644 advancedcontentfilter/vendor/symfony/deprecation-contracts/function.php
 create mode 100644 advancedcontentfilter/vendor/symfony/polyfill-php73/LICENSE
 create mode 100644 advancedcontentfilter/vendor/symfony/polyfill-php73/Php73.php
 create mode 100644 advancedcontentfilter/vendor/symfony/polyfill-php73/README.md
 create mode 100644 advancedcontentfilter/vendor/symfony/polyfill-php73/Resources/stubs/JsonException.php
 create mode 100644 advancedcontentfilter/vendor/symfony/polyfill-php73/bootstrap.php
 create mode 100644 advancedcontentfilter/vendor/symfony/polyfill-php73/composer.json
 create mode 100644 advancedcontentfilter/vendor/symfony/polyfill-php80/LICENSE
 create mode 100644 advancedcontentfilter/vendor/symfony/polyfill-php80/Php80.php
 create mode 100644 advancedcontentfilter/vendor/symfony/polyfill-php80/PhpToken.php
 create mode 100644 advancedcontentfilter/vendor/symfony/polyfill-php80/README.md
 create mode 100644 advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/Attribute.php
 create mode 100644 advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/PhpToken.php
 create mode 100644 advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/Stringable.php
 create mode 100644 advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php
 create mode 100644 advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/ValueError.php
 create mode 100644 advancedcontentfilter/vendor/symfony/polyfill-php80/bootstrap.php
 create mode 100644 advancedcontentfilter/vendor/symfony/polyfill-php80/composer.json
 create mode 100644 advancedcontentfilter/vendor/symfony/service-contracts/.gitignore
 create mode 100644 advancedcontentfilter/vendor/symfony/service-contracts/Attribute/Required.php
 create mode 100644 advancedcontentfilter/vendor/symfony/service-contracts/Attribute/SubscribedService.php
 create mode 100644 advancedcontentfilter/vendor/symfony/service-contracts/CHANGELOG.md
 create mode 100644 advancedcontentfilter/vendor/symfony/service-contracts/LICENSE
 create mode 100644 advancedcontentfilter/vendor/symfony/service-contracts/README.md
 create mode 100644 advancedcontentfilter/vendor/symfony/service-contracts/ResetInterface.php
 create mode 100644 advancedcontentfilter/vendor/symfony/service-contracts/ServiceLocatorTrait.php
 create mode 100644 advancedcontentfilter/vendor/symfony/service-contracts/ServiceProviderInterface.php
 create mode 100644 advancedcontentfilter/vendor/symfony/service-contracts/ServiceSubscriberInterface.php
 create mode 100644 advancedcontentfilter/vendor/symfony/service-contracts/ServiceSubscriberTrait.php
 create mode 100644 advancedcontentfilter/vendor/symfony/service-contracts/Test/ServiceLocatorTest.php
 create mode 100644 advancedcontentfilter/vendor/symfony/service-contracts/composer.json
 create mode 100644 advancedcontentfilter/vendor/symfony/var-exporter/CHANGELOG.md
 create mode 100644 advancedcontentfilter/vendor/symfony/var-exporter/Exception/ClassNotFoundException.php
 create mode 100644 advancedcontentfilter/vendor/symfony/var-exporter/Exception/ExceptionInterface.php
 create mode 100644 advancedcontentfilter/vendor/symfony/var-exporter/Exception/NotInstantiableTypeException.php
 create mode 100644 advancedcontentfilter/vendor/symfony/var-exporter/Instantiator.php
 create mode 100644 advancedcontentfilter/vendor/symfony/var-exporter/Internal/Exporter.php
 create mode 100644 advancedcontentfilter/vendor/symfony/var-exporter/Internal/Hydrator.php
 create mode 100644 advancedcontentfilter/vendor/symfony/var-exporter/Internal/Reference.php
 create mode 100644 advancedcontentfilter/vendor/symfony/var-exporter/Internal/Registry.php
 create mode 100644 advancedcontentfilter/vendor/symfony/var-exporter/Internal/Values.php
 create mode 100644 advancedcontentfilter/vendor/symfony/var-exporter/LICENSE
 create mode 100644 advancedcontentfilter/vendor/symfony/var-exporter/README.md
 create mode 100644 advancedcontentfilter/vendor/symfony/var-exporter/VarExporter.php
 create mode 100644 advancedcontentfilter/vendor/symfony/var-exporter/composer.json

diff --git a/advancedcontentfilter/composer.lock b/advancedcontentfilter/composer.lock
index 83d61074..6dbd17ba 100644
--- a/advancedcontentfilter/composer.lock
+++ b/advancedcontentfilter/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": "3e87f0369e4799fc35d98f399c67f1e9",
+    "content-hash": "a7276eb2d2108a26699f69c750d02d27",
     "packages": [
         {
             "name": "nikic/fast-route",
@@ -100,27 +100,22 @@
         },
         {
             "name": "psr/container",
-            "version": "2.0.2",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
-                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.4.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Psr\\Container\\": "src/"
@@ -145,7 +140,7 @@
                 "container-interop",
                 "psr"
             ],
-            "time": "2021-11-05T16:47:00+00:00"
+            "time": "2021-11-05T16:50:12+00:00"
         },
         {
             "name": "psr/http-factory",
@@ -201,16 +196,16 @@
         },
         {
             "name": "psr/http-message",
-            "version": "1.1",
+            "version": "2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-message.git",
-                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
-                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
                 "shasum": ""
             },
             "require": {
@@ -219,7 +214,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -234,7 +229,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for HTTP messages",
@@ -247,7 +242,7 @@
                 "request",
                 "response"
             ],
-            "time": "2023-04-04T09:50:52+00:00"
+            "time": "2023-04-04T09:54:51+00:00"
         },
         {
             "name": "psr/http-server-handler",
@@ -402,66 +397,18 @@
             ],
             "time": "2021-05-03T11:20:27+00:00"
         },
-        {
-            "name": "psr/simple-cache",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/simple-cache.git",
-                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
-                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\SimpleCache\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interfaces for simple caching",
-            "keywords": [
-                "cache",
-                "caching",
-                "psr",
-                "psr-16",
-                "simple-cache"
-            ],
-            "time": "2017-10-23T01:57:42+00:00"
-        },
         {
             "name": "slim/slim",
-            "version": "4.12.0",
+            "version": "4.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/slimphp/Slim.git",
-                "reference": "e9e99c2b24398b967841c6c4c3048622cc7e2b18"
+                "reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/slimphp/Slim/zipball/e9e99c2b24398b967841c6c4c3048622cc7e2b18",
-                "reference": "e9e99c2b24398b967841c6c4c3048622cc7e2b18",
+                "url": "https://api.github.com/repos/slimphp/Slim/zipball/038fd5713d5a41636fdff0e8dcceedecdd17fc17",
+                "reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17",
                 "shasum": ""
             },
             "require": {
@@ -470,7 +417,7 @@
                 "php": "^7.4 || ^8.0",
                 "psr/container": "^1.0 || ^2.0",
                 "psr/http-factory": "^1.0",
-                "psr/http-message": "^1.1",
+                "psr/http-message": "^1.1 || ^2.0",
                 "psr/http-server-handler": "^1.0",
                 "psr/http-server-middleware": "^1.0",
                 "psr/log": "^1.1 || ^2.0 || ^3.0"
@@ -478,19 +425,19 @@
             "require-dev": {
                 "adriansuter/php-autoload-override": "^1.4",
                 "ext-simplexml": "*",
-                "guzzlehttp/psr7": "^2.5",
+                "guzzlehttp/psr7": "^2.6",
                 "httpsoft/http-message": "^1.1",
                 "httpsoft/http-server-request": "^1.1",
-                "laminas/laminas-diactoros": "^2.17",
+                "laminas/laminas-diactoros": "^2.17 || ^3",
                 "nyholm/psr7": "^1.8",
-                "nyholm/psr7-server": "^1.0",
-                "phpspec/prophecy": "^1.17",
-                "phpspec/prophecy-phpunit": "^2.0",
+                "nyholm/psr7-server": "^1.1",
+                "phpspec/prophecy": "^1.19",
+                "phpspec/prophecy-phpunit": "^2.1",
                 "phpstan/phpstan": "^1.10",
                 "phpunit/phpunit": "^9.6",
                 "slim/http": "^1.3",
                 "slim/psr7": "^1.6",
-                "squizlabs/php_codesniffer": "^3.7"
+                "squizlabs/php_codesniffer": "^3.9"
             },
             "suggest": {
                 "ext-simplexml": "Needed to support XML format in BodyParsingMiddleware",
@@ -553,41 +500,54 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-07-23T04:54:29+00:00"
+            "time": "2024-03-03T21:25:30+00:00"
         },
         {
             "name": "symfony/cache",
-            "version": "v3.4.47",
+            "version": "v4.4.48",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache.git",
-                "reference": "a7a14c4832760bd1fbd31be2859ffedc9b6ff813"
+                "reference": "3b98ed664887ad197b8ede3da2432787212eb915"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/a7a14c4832760bd1fbd31be2859ffedc9b6ff813",
-                "reference": "a7a14c4832760bd1fbd31be2859ffedc9b6ff813",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/3b98ed664887ad197b8ede3da2432787212eb915",
+                "reference": "3b98ed664887ad197b8ede3da2432787212eb915",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "psr/cache": "~1.0",
-                "psr/log": "~1.0",
-                "psr/simple-cache": "^1.0",
-                "symfony/polyfill-apcu": "~1.1"
+                "php": ">=7.1.3",
+                "psr/cache": "^1.0|^2.0",
+                "psr/log": "^1|^2|^3",
+                "symfony/cache-contracts": "^1.1.7|^2",
+                "symfony/polyfill-php73": "^1.9",
+                "symfony/polyfill-php80": "^1.16",
+                "symfony/service-contracts": "^1.1|^2",
+                "symfony/var-exporter": "^4.2|^5.0"
             },
             "conflict": {
-                "symfony/var-dumper": "<3.3"
+                "doctrine/dbal": "<2.7",
+                "symfony/dependency-injection": "<3.4",
+                "symfony/http-kernel": "<4.4|>=5.0",
+                "symfony/var-dumper": "<4.4"
             },
             "provide": {
-                "psr/cache-implementation": "1.0",
-                "psr/simple-cache-implementation": "1.0"
+                "psr/cache-implementation": "1.0|2.0",
+                "psr/simple-cache-implementation": "1.0|2.0",
+                "symfony/cache-implementation": "1.0|2.0"
             },
             "require-dev": {
                 "cache/integration-tests": "dev-master",
-                "doctrine/cache": "^1.6",
-                "doctrine/dbal": "^2.4|^3.0",
-                "predis/predis": "^1.0"
+                "doctrine/cache": "^1.6|^2.0",
+                "doctrine/dbal": "^2.7|^3.0",
+                "predis/predis": "^1.1",
+                "psr/simple-cache": "^1.0|^2.0",
+                "symfony/config": "^4.2|^5.0",
+                "symfony/dependency-injection": "^3.4|^4.1|^5.0",
+                "symfony/filesystem": "^4.4|^5.0",
+                "symfony/http-kernel": "^4.4",
+                "symfony/var-dumper": "^4.4|^5.0"
             },
             "type": "library",
             "autoload": {
@@ -612,7 +572,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Cache component with PSR-6, PSR-16, and tags",
+            "description": "Provides extended PSR-6, PSR-16 (and tags) implementations",
             "homepage": "https://symfony.com",
             "keywords": [
                 "caching",
@@ -632,7 +592,147 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-10-24T10:57:07+00:00"
+            "time": "2022-10-17T20:21:54+00:00"
+        },
+        {
+            "name": "symfony/cache-contracts",
+            "version": "v2.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/cache-contracts.git",
+                "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/64be4a7acb83b6f2bf6de9a02cee6dad41277ebc",
+                "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "psr/cache": "^1.0|^2.0|^3.0"
+            },
+            "suggest": {
+                "symfony/cache-implementation": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\Cache\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to caching",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-01-02T09:53:40+00:00"
+        },
+        {
+            "name": "symfony/deprecation-contracts",
+            "version": "v2.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A generic function and convention to trigger deprecation notices",
+            "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-01-02T09:53:40+00:00"
         },
         {
             "name": "symfony/expression-language",
@@ -694,80 +794,6 @@
             ],
             "time": "2020-10-24T10:57:07+00:00"
         },
-        {
-            "name": "symfony/polyfill-apcu",
-            "version": "v1.28.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-apcu.git",
-                "reference": "c6c2c0f5f4cb0b100c5dfea807ef5cd27bbe9899"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/c6c2c0f5f4cb0b100c5dfea807ef5cd27bbe9899",
-                "reference": "c6c2c0f5f4cb0b100c5dfea807ef5cd27bbe9899",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Apcu\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting apcu_* functions to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "apcu",
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2023-01-26T09:26:14+00:00"
-        },
         {
             "name": "symfony/polyfill-php70",
             "version": "v1.20.0",
@@ -832,6 +858,306 @@
                 }
             ],
             "time": "2020-10-23T14:02:19+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php73",
+            "version": "v1.29.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php73.git",
+                "reference": "21bd091060673a1177ae842c0ef8fe30893114d2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2",
+                "reference": "21bd091060673a1177ae842c0ef8fe30893114d2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php73\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-01-29T20:11:03+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php80",
+            "version": "v1.29.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
+                },
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-01-29T20:11:03+00:00"
+        },
+        {
+            "name": "symfony/service-contracts",
+            "version": "v2.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/service-contracts.git",
+                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
+                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "psr/container": "^1.1",
+                "symfony/deprecation-contracts": "^2.1|^3"
+            },
+            "conflict": {
+                "ext-psr": "<1.1|>=2"
+            },
+            "suggest": {
+                "symfony/service-implementation": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\Service\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to writing services",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-05-30T19:17:29+00:00"
+        },
+        {
+            "name": "symfony/var-exporter",
+            "version": "v5.4.35",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/var-exporter.git",
+                "reference": "abb0a151b62d6b07e816487e20040464af96cae7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/abb0a151b62d6b07e816487e20040464af96cae7",
+                "reference": "abb0a151b62d6b07e816487e20040464af96cae7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/polyfill-php80": "^1.16"
+            },
+            "require-dev": {
+                "symfony/var-dumper": "^4.4.9|^5.0.9|^6.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\VarExporter\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Allows exporting any serializable PHP data structure to plain PHP code",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "clone",
+                "construct",
+                "export",
+                "hydrate",
+                "instantiate",
+                "serialize"
+            ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-01-23T13:51:25+00:00"
         }
     ],
     "packages-dev": [],
@@ -840,9 +1166,10 @@
     "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
-    "platform": {
-        "php": ">=5.6.0"
-    },
+    "platform": [],
     "platform-dev": [],
+    "platform-overrides": {
+        "php": "7.4"
+    },
     "plugin-api-version": "1.1.0"
 }
diff --git a/advancedcontentfilter/vendor/composer/autoload_classmap.php b/advancedcontentfilter/vendor/composer/autoload_classmap.php
index aa3de8a3..9f79be5c 100644
--- a/advancedcontentfilter/vendor/composer/autoload_classmap.php
+++ b/advancedcontentfilter/vendor/composer/autoload_classmap.php
@@ -6,6 +6,7 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
+    'Attribute' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
     'FastRoute\\BadRouteException' => $vendorDir . '/nikic/fast-route/src/BadRouteException.php',
     'FastRoute\\DataGenerator' => $vendorDir . '/nikic/fast-route/src/DataGenerator.php',
     'FastRoute\\DataGenerator\\CharCountBased' => $vendorDir . '/nikic/fast-route/src/DataGenerator/CharCountBased.php',
@@ -23,6 +24,8 @@ return array(
     'FastRoute\\RouteCollector' => $vendorDir . '/nikic/fast-route/src/RouteCollector.php',
     'FastRoute\\RouteParser' => $vendorDir . '/nikic/fast-route/src/RouteParser.php',
     'FastRoute\\RouteParser\\Std' => $vendorDir . '/nikic/fast-route/src/RouteParser/Std.php',
+    'JsonException' => $vendorDir . '/symfony/polyfill-php73/Resources/stubs/JsonException.php',
+    'PhpToken' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/PhpToken.php',
     'Psr\\Cache\\CacheException' => $vendorDir . '/psr/cache/src/CacheException.php',
     'Psr\\Cache\\CacheItemInterface' => $vendorDir . '/psr/cache/src/CacheItemInterface.php',
     'Psr\\Cache\\CacheItemPoolInterface' => $vendorDir . '/psr/cache/src/CacheItemPoolInterface.php',
@@ -56,9 +59,6 @@ return array(
     'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/DummyTest.php',
     'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
     'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php',
-    'Psr\\SimpleCache\\CacheException' => $vendorDir . '/psr/simple-cache/src/CacheException.php',
-    'Psr\\SimpleCache\\CacheInterface' => $vendorDir . '/psr/simple-cache/src/CacheInterface.php',
-    'Psr\\SimpleCache\\InvalidArgumentException' => $vendorDir . '/psr/simple-cache/src/InvalidArgumentException.php',
     'Slim\\App' => $vendorDir . '/slim/slim/Slim/App.php',
     'Slim\\CallableResolver' => $vendorDir . '/slim/slim/Slim/CallableResolver.php',
     'Slim\\Error\\AbstractErrorRenderer' => $vendorDir . '/slim/slim/Slim/Error/AbstractErrorRenderer.php',
@@ -75,6 +75,7 @@ return array(
     'Slim\\Exception\\HttpNotFoundException' => $vendorDir . '/slim/slim/Slim/Exception/HttpNotFoundException.php',
     'Slim\\Exception\\HttpNotImplementedException' => $vendorDir . '/slim/slim/Slim/Exception/HttpNotImplementedException.php',
     'Slim\\Exception\\HttpSpecializedException' => $vendorDir . '/slim/slim/Slim/Exception/HttpSpecializedException.php',
+    'Slim\\Exception\\HttpTooManyRequestsException' => $vendorDir . '/slim/slim/Slim/Exception/HttpTooManyRequestsException.php',
     'Slim\\Exception\\HttpUnauthorizedException' => $vendorDir . '/slim/slim/Slim/Exception/HttpUnauthorizedException.php',
     'Slim\\Factory\\AppFactory' => $vendorDir . '/slim/slim/Slim/Factory/AppFactory.php',
     'Slim\\Factory\\Psr17\\GuzzlePsr17Factory' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/GuzzlePsr17Factory.php',
@@ -130,20 +131,25 @@ return array(
     'Slim\\Routing\\RouteResolver' => $vendorDir . '/slim/slim/Slim/Routing/RouteResolver.php',
     'Slim\\Routing\\RouteRunner' => $vendorDir . '/slim/slim/Slim/Routing/RouteRunner.php',
     'Slim\\Routing\\RoutingResults' => $vendorDir . '/slim/slim/Slim/Routing/RoutingResults.php',
+    'Stringable' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/Stringable.php',
     'Symfony\\Component\\Cache\\Adapter\\AbstractAdapter' => $vendorDir . '/symfony/cache/Adapter/AbstractAdapter.php',
+    'Symfony\\Component\\Cache\\Adapter\\AbstractTagAwareAdapter' => $vendorDir . '/symfony/cache/Adapter/AbstractTagAwareAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\AdapterInterface' => $vendorDir . '/symfony/cache/Adapter/AdapterInterface.php',
     'Symfony\\Component\\Cache\\Adapter\\ApcuAdapter' => $vendorDir . '/symfony/cache/Adapter/ApcuAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\ArrayAdapter' => $vendorDir . '/symfony/cache/Adapter/ArrayAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\ChainAdapter' => $vendorDir . '/symfony/cache/Adapter/ChainAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\DoctrineAdapter' => $vendorDir . '/symfony/cache/Adapter/DoctrineAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\FilesystemAdapter' => $vendorDir . '/symfony/cache/Adapter/FilesystemAdapter.php',
+    'Symfony\\Component\\Cache\\Adapter\\FilesystemTagAwareAdapter' => $vendorDir . '/symfony/cache/Adapter/FilesystemTagAwareAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\MemcachedAdapter' => $vendorDir . '/symfony/cache/Adapter/MemcachedAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\NullAdapter' => $vendorDir . '/symfony/cache/Adapter/NullAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\PdoAdapter' => $vendorDir . '/symfony/cache/Adapter/PdoAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\PhpArrayAdapter' => $vendorDir . '/symfony/cache/Adapter/PhpArrayAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\PhpFilesAdapter' => $vendorDir . '/symfony/cache/Adapter/PhpFilesAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\ProxyAdapter' => $vendorDir . '/symfony/cache/Adapter/ProxyAdapter.php',
+    'Symfony\\Component\\Cache\\Adapter\\Psr16Adapter' => $vendorDir . '/symfony/cache/Adapter/Psr16Adapter.php',
     'Symfony\\Component\\Cache\\Adapter\\RedisAdapter' => $vendorDir . '/symfony/cache/Adapter/RedisAdapter.php',
+    'Symfony\\Component\\Cache\\Adapter\\RedisTagAwareAdapter' => $vendorDir . '/symfony/cache/Adapter/RedisTagAwareAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\SimpleCacheAdapter' => $vendorDir . '/symfony/cache/Adapter/SimpleCacheAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\TagAwareAdapter' => $vendorDir . '/symfony/cache/Adapter/TagAwareAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\TagAwareAdapterInterface' => $vendorDir . '/symfony/cache/Adapter/TagAwareAdapterInterface.php',
@@ -152,10 +158,21 @@ return array(
     'Symfony\\Component\\Cache\\Adapter\\TraceableTagAwareAdapter' => $vendorDir . '/symfony/cache/Adapter/TraceableTagAwareAdapter.php',
     'Symfony\\Component\\Cache\\CacheItem' => $vendorDir . '/symfony/cache/CacheItem.php',
     'Symfony\\Component\\Cache\\DataCollector\\CacheDataCollector' => $vendorDir . '/symfony/cache/DataCollector/CacheDataCollector.php',
+    'Symfony\\Component\\Cache\\DependencyInjection\\CacheCollectorPass' => $vendorDir . '/symfony/cache/DependencyInjection/CacheCollectorPass.php',
+    'Symfony\\Component\\Cache\\DependencyInjection\\CachePoolClearerPass' => $vendorDir . '/symfony/cache/DependencyInjection/CachePoolClearerPass.php',
+    'Symfony\\Component\\Cache\\DependencyInjection\\CachePoolPass' => $vendorDir . '/symfony/cache/DependencyInjection/CachePoolPass.php',
+    'Symfony\\Component\\Cache\\DependencyInjection\\CachePoolPrunerPass' => $vendorDir . '/symfony/cache/DependencyInjection/CachePoolPrunerPass.php',
     'Symfony\\Component\\Cache\\DoctrineProvider' => $vendorDir . '/symfony/cache/DoctrineProvider.php',
     'Symfony\\Component\\Cache\\Exception\\CacheException' => $vendorDir . '/symfony/cache/Exception/CacheException.php',
     'Symfony\\Component\\Cache\\Exception\\InvalidArgumentException' => $vendorDir . '/symfony/cache/Exception/InvalidArgumentException.php',
+    'Symfony\\Component\\Cache\\Exception\\LogicException' => $vendorDir . '/symfony/cache/Exception/LogicException.php',
+    'Symfony\\Component\\Cache\\LockRegistry' => $vendorDir . '/symfony/cache/LockRegistry.php',
+    'Symfony\\Component\\Cache\\Marshaller\\DefaultMarshaller' => $vendorDir . '/symfony/cache/Marshaller/DefaultMarshaller.php',
+    'Symfony\\Component\\Cache\\Marshaller\\DeflateMarshaller' => $vendorDir . '/symfony/cache/Marshaller/DeflateMarshaller.php',
+    'Symfony\\Component\\Cache\\Marshaller\\MarshallerInterface' => $vendorDir . '/symfony/cache/Marshaller/MarshallerInterface.php',
+    'Symfony\\Component\\Cache\\Marshaller\\TagAwareMarshaller' => $vendorDir . '/symfony/cache/Marshaller/TagAwareMarshaller.php',
     'Symfony\\Component\\Cache\\PruneableInterface' => $vendorDir . '/symfony/cache/PruneableInterface.php',
+    'Symfony\\Component\\Cache\\Psr16Cache' => $vendorDir . '/symfony/cache/Psr16Cache.php',
     'Symfony\\Component\\Cache\\ResettableInterface' => $vendorDir . '/symfony/cache/ResettableInterface.php',
     'Symfony\\Component\\Cache\\Simple\\AbstractCache' => $vendorDir . '/symfony/cache/Simple/AbstractCache.php',
     'Symfony\\Component\\Cache\\Simple\\ApcuCache' => $vendorDir . '/symfony/cache/Simple/ApcuCache.php',
@@ -172,17 +189,22 @@ return array(
     'Symfony\\Component\\Cache\\Simple\\RedisCache' => $vendorDir . '/symfony/cache/Simple/RedisCache.php',
     'Symfony\\Component\\Cache\\Simple\\TraceableCache' => $vendorDir . '/symfony/cache/Simple/TraceableCache.php',
     'Symfony\\Component\\Cache\\Simple\\TraceableCacheEvent' => $vendorDir . '/symfony/cache/Simple/TraceableCache.php',
+    'Symfony\\Component\\Cache\\Traits\\AbstractAdapterTrait' => $vendorDir . '/symfony/cache/Traits/AbstractAdapterTrait.php',
     'Symfony\\Component\\Cache\\Traits\\AbstractTrait' => $vendorDir . '/symfony/cache/Traits/AbstractTrait.php',
     'Symfony\\Component\\Cache\\Traits\\ApcuTrait' => $vendorDir . '/symfony/cache/Traits/ApcuTrait.php',
     'Symfony\\Component\\Cache\\Traits\\ArrayTrait' => $vendorDir . '/symfony/cache/Traits/ArrayTrait.php',
+    'Symfony\\Component\\Cache\\Traits\\ContractsTrait' => $vendorDir . '/symfony/cache/Traits/ContractsTrait.php',
     'Symfony\\Component\\Cache\\Traits\\DoctrineTrait' => $vendorDir . '/symfony/cache/Traits/DoctrineTrait.php',
     'Symfony\\Component\\Cache\\Traits\\FilesystemCommonTrait' => $vendorDir . '/symfony/cache/Traits/FilesystemCommonTrait.php',
     'Symfony\\Component\\Cache\\Traits\\FilesystemTrait' => $vendorDir . '/symfony/cache/Traits/FilesystemTrait.php',
+    'Symfony\\Component\\Cache\\Traits\\LazyValue' => $vendorDir . '/symfony/cache/Traits/PhpFilesTrait.php',
     'Symfony\\Component\\Cache\\Traits\\MemcachedTrait' => $vendorDir . '/symfony/cache/Traits/MemcachedTrait.php',
     'Symfony\\Component\\Cache\\Traits\\PdoTrait' => $vendorDir . '/symfony/cache/Traits/PdoTrait.php',
     'Symfony\\Component\\Cache\\Traits\\PhpArrayTrait' => $vendorDir . '/symfony/cache/Traits/PhpArrayTrait.php',
     'Symfony\\Component\\Cache\\Traits\\PhpFilesTrait' => $vendorDir . '/symfony/cache/Traits/PhpFilesTrait.php',
     'Symfony\\Component\\Cache\\Traits\\ProxyTrait' => $vendorDir . '/symfony/cache/Traits/ProxyTrait.php',
+    'Symfony\\Component\\Cache\\Traits\\RedisClusterNodeProxy' => $vendorDir . '/symfony/cache/Traits/RedisClusterNodeProxy.php',
+    'Symfony\\Component\\Cache\\Traits\\RedisClusterProxy' => $vendorDir . '/symfony/cache/Traits/RedisClusterProxy.php',
     'Symfony\\Component\\Cache\\Traits\\RedisProxy' => $vendorDir . '/symfony/cache/Traits/RedisProxy.php',
     'Symfony\\Component\\Cache\\Traits\\RedisTrait' => $vendorDir . '/symfony/cache/Traits/RedisTrait.php',
     'Symfony\\Component\\ExpressionLanguage\\Compiler' => $vendorDir . '/symfony/expression-language/Compiler.php',
@@ -210,5 +232,32 @@ return array(
     'Symfony\\Component\\ExpressionLanguage\\SyntaxError' => $vendorDir . '/symfony/expression-language/SyntaxError.php',
     'Symfony\\Component\\ExpressionLanguage\\Token' => $vendorDir . '/symfony/expression-language/Token.php',
     'Symfony\\Component\\ExpressionLanguage\\TokenStream' => $vendorDir . '/symfony/expression-language/TokenStream.php',
-    'Symfony\\Polyfill\\Apcu\\Apcu' => $vendorDir . '/symfony/polyfill-apcu/Apcu.php',
+    'Symfony\\Component\\VarExporter\\Exception\\ClassNotFoundException' => $vendorDir . '/symfony/var-exporter/Exception/ClassNotFoundException.php',
+    'Symfony\\Component\\VarExporter\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/var-exporter/Exception/ExceptionInterface.php',
+    'Symfony\\Component\\VarExporter\\Exception\\NotInstantiableTypeException' => $vendorDir . '/symfony/var-exporter/Exception/NotInstantiableTypeException.php',
+    'Symfony\\Component\\VarExporter\\Instantiator' => $vendorDir . '/symfony/var-exporter/Instantiator.php',
+    'Symfony\\Component\\VarExporter\\Internal\\Exporter' => $vendorDir . '/symfony/var-exporter/Internal/Exporter.php',
+    'Symfony\\Component\\VarExporter\\Internal\\Hydrator' => $vendorDir . '/symfony/var-exporter/Internal/Hydrator.php',
+    'Symfony\\Component\\VarExporter\\Internal\\Reference' => $vendorDir . '/symfony/var-exporter/Internal/Reference.php',
+    'Symfony\\Component\\VarExporter\\Internal\\Registry' => $vendorDir . '/symfony/var-exporter/Internal/Registry.php',
+    'Symfony\\Component\\VarExporter\\Internal\\Values' => $vendorDir . '/symfony/var-exporter/Internal/Values.php',
+    'Symfony\\Component\\VarExporter\\VarExporter' => $vendorDir . '/symfony/var-exporter/VarExporter.php',
+    'Symfony\\Contracts\\Cache\\CacheInterface' => $vendorDir . '/symfony/cache-contracts/CacheInterface.php',
+    'Symfony\\Contracts\\Cache\\CacheTrait' => $vendorDir . '/symfony/cache-contracts/CacheTrait.php',
+    'Symfony\\Contracts\\Cache\\CallbackInterface' => $vendorDir . '/symfony/cache-contracts/CallbackInterface.php',
+    'Symfony\\Contracts\\Cache\\ItemInterface' => $vendorDir . '/symfony/cache-contracts/ItemInterface.php',
+    'Symfony\\Contracts\\Cache\\TagAwareCacheInterface' => $vendorDir . '/symfony/cache-contracts/TagAwareCacheInterface.php',
+    'Symfony\\Contracts\\Service\\Attribute\\Required' => $vendorDir . '/symfony/service-contracts/Attribute/Required.php',
+    'Symfony\\Contracts\\Service\\Attribute\\SubscribedService' => $vendorDir . '/symfony/service-contracts/Attribute/SubscribedService.php',
+    'Symfony\\Contracts\\Service\\ResetInterface' => $vendorDir . '/symfony/service-contracts/ResetInterface.php',
+    'Symfony\\Contracts\\Service\\ServiceLocatorTrait' => $vendorDir . '/symfony/service-contracts/ServiceLocatorTrait.php',
+    'Symfony\\Contracts\\Service\\ServiceProviderInterface' => $vendorDir . '/symfony/service-contracts/ServiceProviderInterface.php',
+    'Symfony\\Contracts\\Service\\ServiceSubscriberInterface' => $vendorDir . '/symfony/service-contracts/ServiceSubscriberInterface.php',
+    'Symfony\\Contracts\\Service\\ServiceSubscriberTrait' => $vendorDir . '/symfony/service-contracts/ServiceSubscriberTrait.php',
+    'Symfony\\Contracts\\Service\\Test\\ServiceLocatorTest' => $vendorDir . '/symfony/service-contracts/Test/ServiceLocatorTest.php',
+    'Symfony\\Polyfill\\Php73\\Php73' => $vendorDir . '/symfony/polyfill-php73/Php73.php',
+    'Symfony\\Polyfill\\Php80\\Php80' => $vendorDir . '/symfony/polyfill-php80/Php80.php',
+    'Symfony\\Polyfill\\Php80\\PhpToken' => $vendorDir . '/symfony/polyfill-php80/PhpToken.php',
+    'UnhandledMatchError' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php',
+    'ValueError' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/ValueError.php',
 );
diff --git a/advancedcontentfilter/vendor/composer/autoload_files.php b/advancedcontentfilter/vendor/composer/autoload_files.php
index a6b8b352..a5d3b964 100644
--- a/advancedcontentfilter/vendor/composer/autoload_files.php
+++ b/advancedcontentfilter/vendor/composer/autoload_files.php
@@ -6,6 +6,8 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    '32dcc8afd4335739640db7d200c1971d' => $vendorDir . '/symfony/polyfill-apcu/bootstrap.php',
+    'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php',
+    '6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php',
+    '0d59ee240a4cd96ddbb4ff164fccea4d' => $vendorDir . '/symfony/polyfill-php73/bootstrap.php',
     '253c157292f75eb38082b5acb06f3f01' => $vendorDir . '/nikic/fast-route/src/functions.php',
 );
diff --git a/advancedcontentfilter/vendor/composer/autoload_psr4.php b/advancedcontentfilter/vendor/composer/autoload_psr4.php
index 87606585..3d716d56 100644
--- a/advancedcontentfilter/vendor/composer/autoload_psr4.php
+++ b/advancedcontentfilter/vendor/composer/autoload_psr4.php
@@ -6,11 +6,14 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    'Symfony\\Polyfill\\Apcu\\' => array($vendorDir . '/symfony/polyfill-apcu'),
+    'Symfony\\Polyfill\\Php80\\' => array($vendorDir . '/symfony/polyfill-php80'),
+    'Symfony\\Polyfill\\Php73\\' => array($vendorDir . '/symfony/polyfill-php73'),
+    'Symfony\\Contracts\\Service\\' => array($vendorDir . '/symfony/service-contracts'),
+    'Symfony\\Contracts\\Cache\\' => array($vendorDir . '/symfony/cache-contracts'),
+    'Symfony\\Component\\VarExporter\\' => array($vendorDir . '/symfony/var-exporter'),
     'Symfony\\Component\\ExpressionLanguage\\' => array($vendorDir . '/symfony/expression-language'),
     'Symfony\\Component\\Cache\\' => array($vendorDir . '/symfony/cache'),
     'Slim\\' => array($vendorDir . '/slim/slim/Slim'),
-    'Psr\\SimpleCache\\' => array($vendorDir . '/psr/simple-cache/src'),
     'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
     'Psr\\Http\\Server\\' => array($vendorDir . '/psr/http-server-handler/src', $vendorDir . '/psr/http-server-middleware/src'),
     'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-factory/src', $vendorDir . '/psr/http-message/src'),
diff --git a/advancedcontentfilter/vendor/composer/autoload_static.php b/advancedcontentfilter/vendor/composer/autoload_static.php
index 917d3d90..57172a1a 100644
--- a/advancedcontentfilter/vendor/composer/autoload_static.php
+++ b/advancedcontentfilter/vendor/composer/autoload_static.php
@@ -7,21 +7,26 @@ namespace Composer\Autoload;
 class ComposerStaticInitAdvancedContentFilterAddon
 {
     public static $files = array (
-        '32dcc8afd4335739640db7d200c1971d' => __DIR__ . '/..' . '/symfony/polyfill-apcu/bootstrap.php',
+        'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
+        '6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php',
+        '0d59ee240a4cd96ddbb4ff164fccea4d' => __DIR__ . '/..' . '/symfony/polyfill-php73/bootstrap.php',
         '253c157292f75eb38082b5acb06f3f01' => __DIR__ . '/..' . '/nikic/fast-route/src/functions.php',
     );
 
     public static $prefixLengthsPsr4 = array (
         'S' => 
         array (
-            'Symfony\\Polyfill\\Apcu\\' => 22,
+            'Symfony\\Polyfill\\Php80\\' => 23,
+            'Symfony\\Polyfill\\Php73\\' => 23,
+            'Symfony\\Contracts\\Service\\' => 26,
+            'Symfony\\Contracts\\Cache\\' => 24,
+            'Symfony\\Component\\VarExporter\\' => 30,
             'Symfony\\Component\\ExpressionLanguage\\' => 37,
             'Symfony\\Component\\Cache\\' => 24,
             'Slim\\' => 5,
         ),
         'P' => 
         array (
-            'Psr\\SimpleCache\\' => 16,
             'Psr\\Log\\' => 8,
             'Psr\\Http\\Server\\' => 16,
             'Psr\\Http\\Message\\' => 17,
@@ -35,9 +40,25 @@ class ComposerStaticInitAdvancedContentFilterAddon
     );
 
     public static $prefixDirsPsr4 = array (
-        'Symfony\\Polyfill\\Apcu\\' => 
+        'Symfony\\Polyfill\\Php80\\' => 
         array (
-            0 => __DIR__ . '/..' . '/symfony/polyfill-apcu',
+            0 => __DIR__ . '/..' . '/symfony/polyfill-php80',
+        ),
+        'Symfony\\Polyfill\\Php73\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/symfony/polyfill-php73',
+        ),
+        'Symfony\\Contracts\\Service\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/symfony/service-contracts',
+        ),
+        'Symfony\\Contracts\\Cache\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/symfony/cache-contracts',
+        ),
+        'Symfony\\Component\\VarExporter\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/symfony/var-exporter',
         ),
         'Symfony\\Component\\ExpressionLanguage\\' => 
         array (
@@ -51,10 +72,6 @@ class ComposerStaticInitAdvancedContentFilterAddon
         array (
             0 => __DIR__ . '/..' . '/slim/slim/Slim',
         ),
-        'Psr\\SimpleCache\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/psr/simple-cache/src',
-        ),
         'Psr\\Log\\' => 
         array (
             0 => __DIR__ . '/..' . '/psr/log/Psr/Log',
@@ -84,6 +101,7 @@ class ComposerStaticInitAdvancedContentFilterAddon
     );
 
     public static $classMap = array (
+        'Attribute' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
         'FastRoute\\BadRouteException' => __DIR__ . '/..' . '/nikic/fast-route/src/BadRouteException.php',
         'FastRoute\\DataGenerator' => __DIR__ . '/..' . '/nikic/fast-route/src/DataGenerator.php',
         'FastRoute\\DataGenerator\\CharCountBased' => __DIR__ . '/..' . '/nikic/fast-route/src/DataGenerator/CharCountBased.php',
@@ -101,6 +119,8 @@ class ComposerStaticInitAdvancedContentFilterAddon
         'FastRoute\\RouteCollector' => __DIR__ . '/..' . '/nikic/fast-route/src/RouteCollector.php',
         'FastRoute\\RouteParser' => __DIR__ . '/..' . '/nikic/fast-route/src/RouteParser.php',
         'FastRoute\\RouteParser\\Std' => __DIR__ . '/..' . '/nikic/fast-route/src/RouteParser/Std.php',
+        'JsonException' => __DIR__ . '/..' . '/symfony/polyfill-php73/Resources/stubs/JsonException.php',
+        'PhpToken' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/PhpToken.php',
         'Psr\\Cache\\CacheException' => __DIR__ . '/..' . '/psr/cache/src/CacheException.php',
         'Psr\\Cache\\CacheItemInterface' => __DIR__ . '/..' . '/psr/cache/src/CacheItemInterface.php',
         'Psr\\Cache\\CacheItemPoolInterface' => __DIR__ . '/..' . '/psr/cache/src/CacheItemPoolInterface.php',
@@ -134,9 +154,6 @@ class ComposerStaticInitAdvancedContentFilterAddon
         'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/DummyTest.php',
         'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
         'Psr\\Log\\Test\\TestLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/TestLogger.php',
-        'Psr\\SimpleCache\\CacheException' => __DIR__ . '/..' . '/psr/simple-cache/src/CacheException.php',
-        'Psr\\SimpleCache\\CacheInterface' => __DIR__ . '/..' . '/psr/simple-cache/src/CacheInterface.php',
-        'Psr\\SimpleCache\\InvalidArgumentException' => __DIR__ . '/..' . '/psr/simple-cache/src/InvalidArgumentException.php',
         'Slim\\App' => __DIR__ . '/..' . '/slim/slim/Slim/App.php',
         'Slim\\CallableResolver' => __DIR__ . '/..' . '/slim/slim/Slim/CallableResolver.php',
         'Slim\\Error\\AbstractErrorRenderer' => __DIR__ . '/..' . '/slim/slim/Slim/Error/AbstractErrorRenderer.php',
@@ -153,6 +170,7 @@ class ComposerStaticInitAdvancedContentFilterAddon
         'Slim\\Exception\\HttpNotFoundException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpNotFoundException.php',
         'Slim\\Exception\\HttpNotImplementedException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpNotImplementedException.php',
         'Slim\\Exception\\HttpSpecializedException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpSpecializedException.php',
+        'Slim\\Exception\\HttpTooManyRequestsException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpTooManyRequestsException.php',
         'Slim\\Exception\\HttpUnauthorizedException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpUnauthorizedException.php',
         'Slim\\Factory\\AppFactory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/AppFactory.php',
         'Slim\\Factory\\Psr17\\GuzzlePsr17Factory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/GuzzlePsr17Factory.php',
@@ -208,20 +226,25 @@ class ComposerStaticInitAdvancedContentFilterAddon
         'Slim\\Routing\\RouteResolver' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RouteResolver.php',
         'Slim\\Routing\\RouteRunner' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RouteRunner.php',
         'Slim\\Routing\\RoutingResults' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RoutingResults.php',
+        'Stringable' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/Stringable.php',
         'Symfony\\Component\\Cache\\Adapter\\AbstractAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/AbstractAdapter.php',
+        'Symfony\\Component\\Cache\\Adapter\\AbstractTagAwareAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/AbstractTagAwareAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\AdapterInterface' => __DIR__ . '/..' . '/symfony/cache/Adapter/AdapterInterface.php',
         'Symfony\\Component\\Cache\\Adapter\\ApcuAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/ApcuAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\ArrayAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/ArrayAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\ChainAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/ChainAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\DoctrineAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/DoctrineAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\FilesystemAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/FilesystemAdapter.php',
+        'Symfony\\Component\\Cache\\Adapter\\FilesystemTagAwareAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/FilesystemTagAwareAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\MemcachedAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/MemcachedAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\NullAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/NullAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\PdoAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/PdoAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\PhpArrayAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/PhpArrayAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\PhpFilesAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/PhpFilesAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\ProxyAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/ProxyAdapter.php',
+        'Symfony\\Component\\Cache\\Adapter\\Psr16Adapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/Psr16Adapter.php',
         'Symfony\\Component\\Cache\\Adapter\\RedisAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/RedisAdapter.php',
+        'Symfony\\Component\\Cache\\Adapter\\RedisTagAwareAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/RedisTagAwareAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\SimpleCacheAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/SimpleCacheAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\TagAwareAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/TagAwareAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\TagAwareAdapterInterface' => __DIR__ . '/..' . '/symfony/cache/Adapter/TagAwareAdapterInterface.php',
@@ -230,10 +253,21 @@ class ComposerStaticInitAdvancedContentFilterAddon
         'Symfony\\Component\\Cache\\Adapter\\TraceableTagAwareAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/TraceableTagAwareAdapter.php',
         'Symfony\\Component\\Cache\\CacheItem' => __DIR__ . '/..' . '/symfony/cache/CacheItem.php',
         'Symfony\\Component\\Cache\\DataCollector\\CacheDataCollector' => __DIR__ . '/..' . '/symfony/cache/DataCollector/CacheDataCollector.php',
+        'Symfony\\Component\\Cache\\DependencyInjection\\CacheCollectorPass' => __DIR__ . '/..' . '/symfony/cache/DependencyInjection/CacheCollectorPass.php',
+        'Symfony\\Component\\Cache\\DependencyInjection\\CachePoolClearerPass' => __DIR__ . '/..' . '/symfony/cache/DependencyInjection/CachePoolClearerPass.php',
+        'Symfony\\Component\\Cache\\DependencyInjection\\CachePoolPass' => __DIR__ . '/..' . '/symfony/cache/DependencyInjection/CachePoolPass.php',
+        'Symfony\\Component\\Cache\\DependencyInjection\\CachePoolPrunerPass' => __DIR__ . '/..' . '/symfony/cache/DependencyInjection/CachePoolPrunerPass.php',
         'Symfony\\Component\\Cache\\DoctrineProvider' => __DIR__ . '/..' . '/symfony/cache/DoctrineProvider.php',
         'Symfony\\Component\\Cache\\Exception\\CacheException' => __DIR__ . '/..' . '/symfony/cache/Exception/CacheException.php',
         'Symfony\\Component\\Cache\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/symfony/cache/Exception/InvalidArgumentException.php',
+        'Symfony\\Component\\Cache\\Exception\\LogicException' => __DIR__ . '/..' . '/symfony/cache/Exception/LogicException.php',
+        'Symfony\\Component\\Cache\\LockRegistry' => __DIR__ . '/..' . '/symfony/cache/LockRegistry.php',
+        'Symfony\\Component\\Cache\\Marshaller\\DefaultMarshaller' => __DIR__ . '/..' . '/symfony/cache/Marshaller/DefaultMarshaller.php',
+        'Symfony\\Component\\Cache\\Marshaller\\DeflateMarshaller' => __DIR__ . '/..' . '/symfony/cache/Marshaller/DeflateMarshaller.php',
+        'Symfony\\Component\\Cache\\Marshaller\\MarshallerInterface' => __DIR__ . '/..' . '/symfony/cache/Marshaller/MarshallerInterface.php',
+        'Symfony\\Component\\Cache\\Marshaller\\TagAwareMarshaller' => __DIR__ . '/..' . '/symfony/cache/Marshaller/TagAwareMarshaller.php',
         'Symfony\\Component\\Cache\\PruneableInterface' => __DIR__ . '/..' . '/symfony/cache/PruneableInterface.php',
+        'Symfony\\Component\\Cache\\Psr16Cache' => __DIR__ . '/..' . '/symfony/cache/Psr16Cache.php',
         'Symfony\\Component\\Cache\\ResettableInterface' => __DIR__ . '/..' . '/symfony/cache/ResettableInterface.php',
         'Symfony\\Component\\Cache\\Simple\\AbstractCache' => __DIR__ . '/..' . '/symfony/cache/Simple/AbstractCache.php',
         'Symfony\\Component\\Cache\\Simple\\ApcuCache' => __DIR__ . '/..' . '/symfony/cache/Simple/ApcuCache.php',
@@ -250,17 +284,22 @@ class ComposerStaticInitAdvancedContentFilterAddon
         'Symfony\\Component\\Cache\\Simple\\RedisCache' => __DIR__ . '/..' . '/symfony/cache/Simple/RedisCache.php',
         'Symfony\\Component\\Cache\\Simple\\TraceableCache' => __DIR__ . '/..' . '/symfony/cache/Simple/TraceableCache.php',
         'Symfony\\Component\\Cache\\Simple\\TraceableCacheEvent' => __DIR__ . '/..' . '/symfony/cache/Simple/TraceableCache.php',
+        'Symfony\\Component\\Cache\\Traits\\AbstractAdapterTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/AbstractAdapterTrait.php',
         'Symfony\\Component\\Cache\\Traits\\AbstractTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/AbstractTrait.php',
         'Symfony\\Component\\Cache\\Traits\\ApcuTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/ApcuTrait.php',
         'Symfony\\Component\\Cache\\Traits\\ArrayTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/ArrayTrait.php',
+        'Symfony\\Component\\Cache\\Traits\\ContractsTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/ContractsTrait.php',
         'Symfony\\Component\\Cache\\Traits\\DoctrineTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/DoctrineTrait.php',
         'Symfony\\Component\\Cache\\Traits\\FilesystemCommonTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/FilesystemCommonTrait.php',
         'Symfony\\Component\\Cache\\Traits\\FilesystemTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/FilesystemTrait.php',
+        'Symfony\\Component\\Cache\\Traits\\LazyValue' => __DIR__ . '/..' . '/symfony/cache/Traits/PhpFilesTrait.php',
         'Symfony\\Component\\Cache\\Traits\\MemcachedTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/MemcachedTrait.php',
         'Symfony\\Component\\Cache\\Traits\\PdoTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/PdoTrait.php',
         'Symfony\\Component\\Cache\\Traits\\PhpArrayTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/PhpArrayTrait.php',
         'Symfony\\Component\\Cache\\Traits\\PhpFilesTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/PhpFilesTrait.php',
         'Symfony\\Component\\Cache\\Traits\\ProxyTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/ProxyTrait.php',
+        'Symfony\\Component\\Cache\\Traits\\RedisClusterNodeProxy' => __DIR__ . '/..' . '/symfony/cache/Traits/RedisClusterNodeProxy.php',
+        'Symfony\\Component\\Cache\\Traits\\RedisClusterProxy' => __DIR__ . '/..' . '/symfony/cache/Traits/RedisClusterProxy.php',
         'Symfony\\Component\\Cache\\Traits\\RedisProxy' => __DIR__ . '/..' . '/symfony/cache/Traits/RedisProxy.php',
         'Symfony\\Component\\Cache\\Traits\\RedisTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/RedisTrait.php',
         'Symfony\\Component\\ExpressionLanguage\\Compiler' => __DIR__ . '/..' . '/symfony/expression-language/Compiler.php',
@@ -288,7 +327,34 @@ class ComposerStaticInitAdvancedContentFilterAddon
         'Symfony\\Component\\ExpressionLanguage\\SyntaxError' => __DIR__ . '/..' . '/symfony/expression-language/SyntaxError.php',
         'Symfony\\Component\\ExpressionLanguage\\Token' => __DIR__ . '/..' . '/symfony/expression-language/Token.php',
         'Symfony\\Component\\ExpressionLanguage\\TokenStream' => __DIR__ . '/..' . '/symfony/expression-language/TokenStream.php',
-        'Symfony\\Polyfill\\Apcu\\Apcu' => __DIR__ . '/..' . '/symfony/polyfill-apcu/Apcu.php',
+        'Symfony\\Component\\VarExporter\\Exception\\ClassNotFoundException' => __DIR__ . '/..' . '/symfony/var-exporter/Exception/ClassNotFoundException.php',
+        'Symfony\\Component\\VarExporter\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/symfony/var-exporter/Exception/ExceptionInterface.php',
+        'Symfony\\Component\\VarExporter\\Exception\\NotInstantiableTypeException' => __DIR__ . '/..' . '/symfony/var-exporter/Exception/NotInstantiableTypeException.php',
+        'Symfony\\Component\\VarExporter\\Instantiator' => __DIR__ . '/..' . '/symfony/var-exporter/Instantiator.php',
+        'Symfony\\Component\\VarExporter\\Internal\\Exporter' => __DIR__ . '/..' . '/symfony/var-exporter/Internal/Exporter.php',
+        'Symfony\\Component\\VarExporter\\Internal\\Hydrator' => __DIR__ . '/..' . '/symfony/var-exporter/Internal/Hydrator.php',
+        'Symfony\\Component\\VarExporter\\Internal\\Reference' => __DIR__ . '/..' . '/symfony/var-exporter/Internal/Reference.php',
+        'Symfony\\Component\\VarExporter\\Internal\\Registry' => __DIR__ . '/..' . '/symfony/var-exporter/Internal/Registry.php',
+        'Symfony\\Component\\VarExporter\\Internal\\Values' => __DIR__ . '/..' . '/symfony/var-exporter/Internal/Values.php',
+        'Symfony\\Component\\VarExporter\\VarExporter' => __DIR__ . '/..' . '/symfony/var-exporter/VarExporter.php',
+        'Symfony\\Contracts\\Cache\\CacheInterface' => __DIR__ . '/..' . '/symfony/cache-contracts/CacheInterface.php',
+        'Symfony\\Contracts\\Cache\\CacheTrait' => __DIR__ . '/..' . '/symfony/cache-contracts/CacheTrait.php',
+        'Symfony\\Contracts\\Cache\\CallbackInterface' => __DIR__ . '/..' . '/symfony/cache-contracts/CallbackInterface.php',
+        'Symfony\\Contracts\\Cache\\ItemInterface' => __DIR__ . '/..' . '/symfony/cache-contracts/ItemInterface.php',
+        'Symfony\\Contracts\\Cache\\TagAwareCacheInterface' => __DIR__ . '/..' . '/symfony/cache-contracts/TagAwareCacheInterface.php',
+        'Symfony\\Contracts\\Service\\Attribute\\Required' => __DIR__ . '/..' . '/symfony/service-contracts/Attribute/Required.php',
+        'Symfony\\Contracts\\Service\\Attribute\\SubscribedService' => __DIR__ . '/..' . '/symfony/service-contracts/Attribute/SubscribedService.php',
+        'Symfony\\Contracts\\Service\\ResetInterface' => __DIR__ . '/..' . '/symfony/service-contracts/ResetInterface.php',
+        'Symfony\\Contracts\\Service\\ServiceLocatorTrait' => __DIR__ . '/..' . '/symfony/service-contracts/ServiceLocatorTrait.php',
+        'Symfony\\Contracts\\Service\\ServiceProviderInterface' => __DIR__ . '/..' . '/symfony/service-contracts/ServiceProviderInterface.php',
+        'Symfony\\Contracts\\Service\\ServiceSubscriberInterface' => __DIR__ . '/..' . '/symfony/service-contracts/ServiceSubscriberInterface.php',
+        'Symfony\\Contracts\\Service\\ServiceSubscriberTrait' => __DIR__ . '/..' . '/symfony/service-contracts/ServiceSubscriberTrait.php',
+        'Symfony\\Contracts\\Service\\Test\\ServiceLocatorTest' => __DIR__ . '/..' . '/symfony/service-contracts/Test/ServiceLocatorTest.php',
+        'Symfony\\Polyfill\\Php73\\Php73' => __DIR__ . '/..' . '/symfony/polyfill-php73/Php73.php',
+        'Symfony\\Polyfill\\Php80\\Php80' => __DIR__ . '/..' . '/symfony/polyfill-php80/Php80.php',
+        'Symfony\\Polyfill\\Php80\\PhpToken' => __DIR__ . '/..' . '/symfony/polyfill-php80/PhpToken.php',
+        'UnhandledMatchError' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php',
+        'ValueError' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/ValueError.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
diff --git a/advancedcontentfilter/vendor/composer/installed.json b/advancedcontentfilter/vendor/composer/installed.json
index 1a84a8fd..07e02c7f 100644
--- a/advancedcontentfilter/vendor/composer/installed.json
+++ b/advancedcontentfilter/vendor/composer/installed.json
@@ -97,29 +97,24 @@
     },
     {
         "name": "psr/container",
-        "version": "2.0.2",
-        "version_normalized": "2.0.2.0",
+        "version": "1.1.2",
+        "version_normalized": "1.1.2.0",
         "source": {
             "type": "git",
             "url": "https://github.com/php-fig/container.git",
-            "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
+            "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
-            "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+            "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
+            "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
             "shasum": ""
         },
         "require": {
             "php": ">=7.4.0"
         },
-        "time": "2021-11-05T16:47:00+00:00",
+        "time": "2021-11-05T16:50:12+00:00",
         "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.0.x-dev"
-            }
-        },
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
@@ -202,27 +197,27 @@
     },
     {
         "name": "psr/http-message",
-        "version": "1.1",
-        "version_normalized": "1.1.0.0",
+        "version": "2.0",
+        "version_normalized": "2.0.0.0",
         "source": {
             "type": "git",
             "url": "https://github.com/php-fig/http-message.git",
-            "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
+            "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
-            "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+            "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+            "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
             "shasum": ""
         },
         "require": {
             "php": "^7.2 || ^8.0"
         },
-        "time": "2023-04-04T09:50:52+00:00",
+        "time": "2023-04-04T09:54:51+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "1.1.x-dev"
+                "dev-master": "2.0.x-dev"
             }
         },
         "installation-source": "dist",
@@ -238,7 +233,7 @@
         "authors": [
             {
                 "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
+                "homepage": "https://www.php-fig.org/"
             }
         ],
         "description": "Common interface for HTTP messages",
@@ -411,69 +406,19 @@
             "psr-3"
         ]
     },
-    {
-        "name": "psr/simple-cache",
-        "version": "1.0.1",
-        "version_normalized": "1.0.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/simple-cache.git",
-            "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
-            "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0"
-        },
-        "time": "2017-10-23T01:57:42+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Psr\\SimpleCache\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interfaces for simple caching",
-        "keywords": [
-            "cache",
-            "caching",
-            "psr",
-            "psr-16",
-            "simple-cache"
-        ]
-    },
     {
         "name": "slim/slim",
-        "version": "4.12.0",
-        "version_normalized": "4.12.0.0",
+        "version": "4.13.0",
+        "version_normalized": "4.13.0.0",
         "source": {
             "type": "git",
             "url": "https://github.com/slimphp/Slim.git",
-            "reference": "e9e99c2b24398b967841c6c4c3048622cc7e2b18"
+            "reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/slimphp/Slim/zipball/e9e99c2b24398b967841c6c4c3048622cc7e2b18",
-            "reference": "e9e99c2b24398b967841c6c4c3048622cc7e2b18",
+            "url": "https://api.github.com/repos/slimphp/Slim/zipball/038fd5713d5a41636fdff0e8dcceedecdd17fc17",
+            "reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17",
             "shasum": ""
         },
         "require": {
@@ -482,7 +427,7 @@
             "php": "^7.4 || ^8.0",
             "psr/container": "^1.0 || ^2.0",
             "psr/http-factory": "^1.0",
-            "psr/http-message": "^1.1",
+            "psr/http-message": "^1.1 || ^2.0",
             "psr/http-server-handler": "^1.0",
             "psr/http-server-middleware": "^1.0",
             "psr/log": "^1.1 || ^2.0 || ^3.0"
@@ -490,19 +435,19 @@
         "require-dev": {
             "adriansuter/php-autoload-override": "^1.4",
             "ext-simplexml": "*",
-            "guzzlehttp/psr7": "^2.5",
+            "guzzlehttp/psr7": "^2.6",
             "httpsoft/http-message": "^1.1",
             "httpsoft/http-server-request": "^1.1",
-            "laminas/laminas-diactoros": "^2.17",
+            "laminas/laminas-diactoros": "^2.17 || ^3",
             "nyholm/psr7": "^1.8",
-            "nyholm/psr7-server": "^1.0",
-            "phpspec/prophecy": "^1.17",
-            "phpspec/prophecy-phpunit": "^2.0",
+            "nyholm/psr7-server": "^1.1",
+            "phpspec/prophecy": "^1.19",
+            "phpspec/prophecy-phpunit": "^2.1",
             "phpstan/phpstan": "^1.10",
             "phpunit/phpunit": "^9.6",
             "slim/http": "^1.3",
             "slim/psr7": "^1.6",
-            "squizlabs/php_codesniffer": "^3.7"
+            "squizlabs/php_codesniffer": "^3.9"
         },
         "suggest": {
             "ext-simplexml": "Needed to support XML format in BodyParsingMiddleware",
@@ -510,7 +455,7 @@
             "php-di/php-di": "PHP-DI is the recommended container library to be used with Slim",
             "slim/psr7": "Slim PSR-7 implementation. See https://www.slimframework.com/docs/v4/start/installation.html for more information."
         },
-        "time": "2023-07-23T04:54:29+00:00",
+        "time": "2024-03-03T21:25:30+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -570,40 +515,53 @@
     },
     {
         "name": "symfony/cache",
-        "version": "v3.4.47",
-        "version_normalized": "3.4.47.0",
+        "version": "v4.4.48",
+        "version_normalized": "4.4.48.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/cache.git",
-            "reference": "a7a14c4832760bd1fbd31be2859ffedc9b6ff813"
+            "reference": "3b98ed664887ad197b8ede3da2432787212eb915"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/cache/zipball/a7a14c4832760bd1fbd31be2859ffedc9b6ff813",
-            "reference": "a7a14c4832760bd1fbd31be2859ffedc9b6ff813",
+            "url": "https://api.github.com/repos/symfony/cache/zipball/3b98ed664887ad197b8ede3da2432787212eb915",
+            "reference": "3b98ed664887ad197b8ede3da2432787212eb915",
             "shasum": ""
         },
         "require": {
-            "php": "^5.5.9|>=7.0.8",
-            "psr/cache": "~1.0",
-            "psr/log": "~1.0",
-            "psr/simple-cache": "^1.0",
-            "symfony/polyfill-apcu": "~1.1"
+            "php": ">=7.1.3",
+            "psr/cache": "^1.0|^2.0",
+            "psr/log": "^1|^2|^3",
+            "symfony/cache-contracts": "^1.1.7|^2",
+            "symfony/polyfill-php73": "^1.9",
+            "symfony/polyfill-php80": "^1.16",
+            "symfony/service-contracts": "^1.1|^2",
+            "symfony/var-exporter": "^4.2|^5.0"
         },
         "conflict": {
-            "symfony/var-dumper": "<3.3"
+            "doctrine/dbal": "<2.7",
+            "symfony/dependency-injection": "<3.4",
+            "symfony/http-kernel": "<4.4|>=5.0",
+            "symfony/var-dumper": "<4.4"
         },
         "provide": {
-            "psr/cache-implementation": "1.0",
-            "psr/simple-cache-implementation": "1.0"
+            "psr/cache-implementation": "1.0|2.0",
+            "psr/simple-cache-implementation": "1.0|2.0",
+            "symfony/cache-implementation": "1.0|2.0"
         },
         "require-dev": {
             "cache/integration-tests": "dev-master",
-            "doctrine/cache": "^1.6",
-            "doctrine/dbal": "^2.4|^3.0",
-            "predis/predis": "^1.0"
+            "doctrine/cache": "^1.6|^2.0",
+            "doctrine/dbal": "^2.7|^3.0",
+            "predis/predis": "^1.1",
+            "psr/simple-cache": "^1.0|^2.0",
+            "symfony/config": "^4.2|^5.0",
+            "symfony/dependency-injection": "^3.4|^4.1|^5.0",
+            "symfony/filesystem": "^4.4|^5.0",
+            "symfony/http-kernel": "^4.4",
+            "symfony/var-dumper": "^4.4|^5.0"
         },
-        "time": "2020-10-24T10:57:07+00:00",
+        "time": "2022-10-17T20:21:54+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -628,7 +586,7 @@
                 "homepage": "https://symfony.com/contributors"
             }
         ],
-        "description": "Symfony Cache component with PSR-6, PSR-16, and tags",
+        "description": "Provides extended PSR-6, PSR-16 (and tags) implementations",
         "homepage": "https://symfony.com",
         "keywords": [
             "caching",
@@ -649,6 +607,150 @@
             }
         ]
     },
+    {
+        "name": "symfony/cache-contracts",
+        "version": "v2.5.2",
+        "version_normalized": "2.5.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/cache-contracts.git",
+            "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/64be4a7acb83b6f2bf6de9a02cee6dad41277ebc",
+            "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=7.2.5",
+            "psr/cache": "^1.0|^2.0|^3.0"
+        },
+        "suggest": {
+            "symfony/cache-implementation": ""
+        },
+        "time": "2022-01-02T09:53:40+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-main": "2.5-dev"
+            },
+            "thanks": {
+                "name": "symfony/contracts",
+                "url": "https://github.com/symfony/contracts"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Contracts\\Cache\\": ""
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Nicolas Grekas",
+                "email": "p@tchwork.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Generic abstractions related to caching",
+        "homepage": "https://symfony.com",
+        "keywords": [
+            "abstractions",
+            "contracts",
+            "decoupling",
+            "interfaces",
+            "interoperability",
+            "standards"
+        ],
+        "funding": [
+            {
+                "url": "https://symfony.com/sponsor",
+                "type": "custom"
+            },
+            {
+                "url": "https://github.com/fabpot",
+                "type": "github"
+            },
+            {
+                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                "type": "tidelift"
+            }
+        ]
+    },
+    {
+        "name": "symfony/deprecation-contracts",
+        "version": "v2.5.2",
+        "version_normalized": "2.5.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/deprecation-contracts.git",
+            "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+            "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=7.1"
+        },
+        "time": "2022-01-02T09:53:40+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-main": "2.5-dev"
+            },
+            "thanks": {
+                "name": "symfony/contracts",
+                "url": "https://github.com/symfony/contracts"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "files": [
+                "function.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Nicolas Grekas",
+                "email": "p@tchwork.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "A generic function and convention to trigger deprecation notices",
+        "homepage": "https://symfony.com",
+        "funding": [
+            {
+                "url": "https://symfony.com/sponsor",
+                "type": "custom"
+            },
+            {
+                "url": "https://github.com/fabpot",
+                "type": "github"
+            },
+            {
+                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                "type": "tidelift"
+            }
+        ]
+    },
     {
         "name": "symfony/expression-language",
         "version": "v3.4.47",
@@ -711,82 +813,6 @@
             }
         ]
     },
-    {
-        "name": "symfony/polyfill-apcu",
-        "version": "v1.28.0",
-        "version_normalized": "1.28.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/polyfill-apcu.git",
-            "reference": "c6c2c0f5f4cb0b100c5dfea807ef5cd27bbe9899"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/c6c2c0f5f4cb0b100c5dfea807ef5cd27bbe9899",
-            "reference": "c6c2c0f5f4cb0b100c5dfea807ef5cd27bbe9899",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.1"
-        },
-        "time": "2023-01-26T09:26:14+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-main": "1.28-dev"
-            },
-            "thanks": {
-                "name": "symfony/polyfill",
-                "url": "https://github.com/symfony/polyfill"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "files": [
-                "bootstrap.php"
-            ],
-            "psr-4": {
-                "Symfony\\Polyfill\\Apcu\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Nicolas Grekas",
-                "email": "p@tchwork.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony polyfill backporting apcu_* functions to lower PHP versions",
-        "homepage": "https://symfony.com",
-        "keywords": [
-            "apcu",
-            "compatibility",
-            "polyfill",
-            "portable",
-            "shim"
-        ],
-        "funding": [
-            {
-                "url": "https://symfony.com/sponsor",
-                "type": "custom"
-            },
-            {
-                "url": "https://github.com/fabpot",
-                "type": "github"
-            },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                "type": "tidelift"
-            }
-        ]
-    },
     {
         "name": "symfony/polyfill-php70",
         "version": "v1.20.0",
@@ -852,5 +878,313 @@
                 "type": "tidelift"
             }
         ]
+    },
+    {
+        "name": "symfony/polyfill-php73",
+        "version": "v1.29.0",
+        "version_normalized": "1.29.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/polyfill-php73.git",
+            "reference": "21bd091060673a1177ae842c0ef8fe30893114d2"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2",
+            "reference": "21bd091060673a1177ae842c0ef8fe30893114d2",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=7.1"
+        },
+        "time": "2024-01-29T20:11:03+00:00",
+        "type": "library",
+        "extra": {
+            "thanks": {
+                "name": "symfony/polyfill",
+                "url": "https://github.com/symfony/polyfill"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "files": [
+                "bootstrap.php"
+            ],
+            "psr-4": {
+                "Symfony\\Polyfill\\Php73\\": ""
+            },
+            "classmap": [
+                "Resources/stubs"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Nicolas Grekas",
+                "email": "p@tchwork.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
+        "homepage": "https://symfony.com",
+        "keywords": [
+            "compatibility",
+            "polyfill",
+            "portable",
+            "shim"
+        ],
+        "funding": [
+            {
+                "url": "https://symfony.com/sponsor",
+                "type": "custom"
+            },
+            {
+                "url": "https://github.com/fabpot",
+                "type": "github"
+            },
+            {
+                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                "type": "tidelift"
+            }
+        ]
+    },
+    {
+        "name": "symfony/polyfill-php80",
+        "version": "v1.29.0",
+        "version_normalized": "1.29.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/polyfill-php80.git",
+            "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+            "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=7.1"
+        },
+        "time": "2024-01-29T20:11:03+00:00",
+        "type": "library",
+        "extra": {
+            "thanks": {
+                "name": "symfony/polyfill",
+                "url": "https://github.com/symfony/polyfill"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "files": [
+                "bootstrap.php"
+            ],
+            "psr-4": {
+                "Symfony\\Polyfill\\Php80\\": ""
+            },
+            "classmap": [
+                "Resources/stubs"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Ion Bazan",
+                "email": "ion.bazan@gmail.com"
+            },
+            {
+                "name": "Nicolas Grekas",
+                "email": "p@tchwork.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+        "homepage": "https://symfony.com",
+        "keywords": [
+            "compatibility",
+            "polyfill",
+            "portable",
+            "shim"
+        ],
+        "funding": [
+            {
+                "url": "https://symfony.com/sponsor",
+                "type": "custom"
+            },
+            {
+                "url": "https://github.com/fabpot",
+                "type": "github"
+            },
+            {
+                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                "type": "tidelift"
+            }
+        ]
+    },
+    {
+        "name": "symfony/service-contracts",
+        "version": "v2.5.2",
+        "version_normalized": "2.5.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/service-contracts.git",
+            "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
+            "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=7.2.5",
+            "psr/container": "^1.1",
+            "symfony/deprecation-contracts": "^2.1|^3"
+        },
+        "conflict": {
+            "ext-psr": "<1.1|>=2"
+        },
+        "suggest": {
+            "symfony/service-implementation": ""
+        },
+        "time": "2022-05-30T19:17:29+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-main": "2.5-dev"
+            },
+            "thanks": {
+                "name": "symfony/contracts",
+                "url": "https://github.com/symfony/contracts"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Contracts\\Service\\": ""
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Nicolas Grekas",
+                "email": "p@tchwork.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Generic abstractions related to writing services",
+        "homepage": "https://symfony.com",
+        "keywords": [
+            "abstractions",
+            "contracts",
+            "decoupling",
+            "interfaces",
+            "interoperability",
+            "standards"
+        ],
+        "funding": [
+            {
+                "url": "https://symfony.com/sponsor",
+                "type": "custom"
+            },
+            {
+                "url": "https://github.com/fabpot",
+                "type": "github"
+            },
+            {
+                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                "type": "tidelift"
+            }
+        ]
+    },
+    {
+        "name": "symfony/var-exporter",
+        "version": "v5.4.35",
+        "version_normalized": "5.4.35.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/var-exporter.git",
+            "reference": "abb0a151b62d6b07e816487e20040464af96cae7"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/var-exporter/zipball/abb0a151b62d6b07e816487e20040464af96cae7",
+            "reference": "abb0a151b62d6b07e816487e20040464af96cae7",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=7.2.5",
+            "symfony/polyfill-php80": "^1.16"
+        },
+        "require-dev": {
+            "symfony/var-dumper": "^4.4.9|^5.0.9|^6.0"
+        },
+        "time": "2024-01-23T13:51:25+00:00",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\VarExporter\\": ""
+            },
+            "exclude-from-classmap": [
+                "/Tests/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Nicolas Grekas",
+                "email": "p@tchwork.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Allows exporting any serializable PHP data structure to plain PHP code",
+        "homepage": "https://symfony.com",
+        "keywords": [
+            "clone",
+            "construct",
+            "export",
+            "hydrate",
+            "instantiate",
+            "serialize"
+        ],
+        "funding": [
+            {
+                "url": "https://symfony.com/sponsor",
+                "type": "custom"
+            },
+            {
+                "url": "https://github.com/fabpot",
+                "type": "github"
+            },
+            {
+                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                "type": "tidelift"
+            }
+        ]
     }
 ]
diff --git a/advancedcontentfilter/vendor/psr/container/composer.json b/advancedcontentfilter/vendor/psr/container/composer.json
index baf6cd1a..017f41ea 100644
--- a/advancedcontentfilter/vendor/psr/container/composer.json
+++ b/advancedcontentfilter/vendor/psr/container/composer.json
@@ -18,10 +18,5 @@
         "psr-4": {
             "Psr\\Container\\": "src/"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.0.x-dev"
-        }
     }
 }
diff --git a/advancedcontentfilter/vendor/psr/container/src/ContainerInterface.php b/advancedcontentfilter/vendor/psr/container/src/ContainerInterface.php
index b2cad401..cf8e7fd3 100644
--- a/advancedcontentfilter/vendor/psr/container/src/ContainerInterface.php
+++ b/advancedcontentfilter/vendor/psr/container/src/ContainerInterface.php
@@ -32,5 +32,5 @@ interface ContainerInterface
      *
      * @return bool
      */
-    public function has(string $id): bool;
+    public function has(string $id);
 }
diff --git a/advancedcontentfilter/vendor/psr/http-message/composer.json b/advancedcontentfilter/vendor/psr/http-message/composer.json
index 56e8c0a6..c66e5aba 100644
--- a/advancedcontentfilter/vendor/psr/http-message/composer.json
+++ b/advancedcontentfilter/vendor/psr/http-message/composer.json
@@ -7,7 +7,7 @@
     "authors": [
         {
             "name": "PHP-FIG",
-            "homepage": "http://www.php-fig.org/"
+            "homepage": "https://www.php-fig.org/"
         }
     ],
     "require": {
@@ -20,7 +20,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1.x-dev"
+            "dev-master": "2.0.x-dev"
         }
     }
 }
diff --git a/advancedcontentfilter/vendor/psr/http-message/src/MessageInterface.php b/advancedcontentfilter/vendor/psr/http-message/src/MessageInterface.php
index 8cdb4ed6..a83c9851 100644
--- a/advancedcontentfilter/vendor/psr/http-message/src/MessageInterface.php
+++ b/advancedcontentfilter/vendor/psr/http-message/src/MessageInterface.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Psr\Http\Message;
 
 /**
@@ -25,7 +23,7 @@ interface MessageInterface
      *
      * @return string HTTP protocol version.
      */
-    public function getProtocolVersion();
+    public function getProtocolVersion(): string;
 
     /**
      * Return an instance with the specified HTTP protocol version.
@@ -40,7 +38,7 @@ interface MessageInterface
      * @param string $version HTTP protocol version
      * @return static
      */
-    public function withProtocolVersion(string $version);
+    public function withProtocolVersion(string $version): MessageInterface;
 
     /**
      * Retrieves all message header values.
@@ -67,7 +65,7 @@ interface MessageInterface
      *     key MUST be a header name, and each value MUST be an array of strings
      *     for that header.
      */
-    public function getHeaders();
+    public function getHeaders(): array;
 
     /**
      * Checks if a header exists by the given case-insensitive name.
@@ -77,7 +75,7 @@ interface MessageInterface
      *     name using a case-insensitive string comparison. Returns false if
      *     no matching header name is found in the message.
      */
-    public function hasHeader(string $name);
+    public function hasHeader(string $name): bool;
 
     /**
      * Retrieves a message header value by the given case-insensitive name.
@@ -93,7 +91,7 @@ interface MessageInterface
      *    header. If the header does not appear in the message, this method MUST
      *    return an empty array.
      */
-    public function getHeader(string $name);
+    public function getHeader(string $name): array;
 
     /**
      * Retrieves a comma-separated string of the values for a single header.
@@ -114,7 +112,7 @@ interface MessageInterface
      *    concatenated together using a comma. If the header does not appear in
      *    the message, this method MUST return an empty string.
      */
-    public function getHeaderLine(string $name);
+    public function getHeaderLine(string $name): string;
 
     /**
      * Return an instance with the provided value replacing the specified header.
@@ -131,7 +129,7 @@ interface MessageInterface
      * @return static
      * @throws \InvalidArgumentException for invalid header names or values.
      */
-    public function withHeader(string $name, $value);
+    public function withHeader(string $name, $value): MessageInterface;
 
     /**
      * Return an instance with the specified header appended with the given value.
@@ -149,7 +147,7 @@ interface MessageInterface
      * @return static
      * @throws \InvalidArgumentException for invalid header names or values.
      */
-    public function withAddedHeader(string $name, $value);
+    public function withAddedHeader(string $name, $value): MessageInterface;
 
     /**
      * Return an instance without the specified header.
@@ -163,14 +161,14 @@ interface MessageInterface
      * @param string $name Case-insensitive header field name to remove.
      * @return static
      */
-    public function withoutHeader(string $name);
+    public function withoutHeader(string $name): MessageInterface;
 
     /**
      * Gets the body of the message.
      *
      * @return StreamInterface Returns the body as a stream.
      */
-    public function getBody();
+    public function getBody(): StreamInterface;
 
     /**
      * Return an instance with the specified message body.
@@ -185,5 +183,5 @@ interface MessageInterface
      * @return static
      * @throws \InvalidArgumentException When the body is not valid.
      */
-    public function withBody(StreamInterface $body);
+    public function withBody(StreamInterface $body): MessageInterface;
 }
diff --git a/advancedcontentfilter/vendor/psr/http-message/src/RequestInterface.php b/advancedcontentfilter/vendor/psr/http-message/src/RequestInterface.php
index 38066df6..33f85e55 100644
--- a/advancedcontentfilter/vendor/psr/http-message/src/RequestInterface.php
+++ b/advancedcontentfilter/vendor/psr/http-message/src/RequestInterface.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Psr\Http\Message;
 
 /**
@@ -41,7 +39,7 @@ interface RequestInterface extends MessageInterface
      *
      * @return string
      */
-    public function getRequestTarget();
+    public function getRequestTarget(): string;
 
     /**
      * Return an instance with the specific request-target.
@@ -60,14 +58,15 @@ interface RequestInterface extends MessageInterface
      * @param string $requestTarget
      * @return static
      */
-    public function withRequestTarget(string $requestTarget);
+    public function withRequestTarget(string $requestTarget): RequestInterface;
+
 
     /**
      * Retrieves the HTTP method of the request.
      *
      * @return string Returns the request method.
      */
-    public function getMethod();
+    public function getMethod(): string;
 
     /**
      * Return an instance with the provided HTTP method.
@@ -84,7 +83,7 @@ interface RequestInterface extends MessageInterface
      * @return static
      * @throws \InvalidArgumentException for invalid HTTP methods.
      */
-    public function withMethod(string $method);
+    public function withMethod(string $method): RequestInterface;
 
     /**
      * Retrieves the URI instance.
@@ -95,7 +94,7 @@ interface RequestInterface extends MessageInterface
      * @return UriInterface Returns a UriInterface instance
      *     representing the URI of the request.
      */
-    public function getUri();
+    public function getUri(): UriInterface;
 
     /**
      * Returns an instance with the provided URI.
@@ -127,5 +126,5 @@ interface RequestInterface extends MessageInterface
      * @param bool $preserveHost Preserve the original state of the Host header.
      * @return static
      */
-    public function withUri(UriInterface $uri, bool $preserveHost = false);
+    public function withUri(UriInterface $uri, bool $preserveHost = false): RequestInterface;
 }
diff --git a/advancedcontentfilter/vendor/psr/http-message/src/ResponseInterface.php b/advancedcontentfilter/vendor/psr/http-message/src/ResponseInterface.php
index f85ca48a..e9299a91 100644
--- a/advancedcontentfilter/vendor/psr/http-message/src/ResponseInterface.php
+++ b/advancedcontentfilter/vendor/psr/http-message/src/ResponseInterface.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Psr\Http\Message;
 
 /**
@@ -29,7 +27,7 @@ interface ResponseInterface extends MessageInterface
      *
      * @return int Status code.
      */
-    public function getStatusCode();
+    public function getStatusCode(): int;
 
     /**
      * Return an instance with the specified status code and, optionally, reason phrase.
@@ -51,7 +49,7 @@ interface ResponseInterface extends MessageInterface
      * @return static
      * @throws \InvalidArgumentException For invalid status code arguments.
      */
-    public function withStatus(int $code, string $reasonPhrase = '');
+    public function withStatus(int $code, string $reasonPhrase = ''): ResponseInterface;
 
     /**
      * Gets the response reason phrase associated with the status code.
@@ -66,5 +64,5 @@ interface ResponseInterface extends MessageInterface
      * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
      * @return string Reason phrase; must return an empty string if none present.
      */
-    public function getReasonPhrase();
+    public function getReasonPhrase(): string;
 }
diff --git a/advancedcontentfilter/vendor/psr/http-message/src/ServerRequestInterface.php b/advancedcontentfilter/vendor/psr/http-message/src/ServerRequestInterface.php
index 5e6d9649..8625d0e1 100644
--- a/advancedcontentfilter/vendor/psr/http-message/src/ServerRequestInterface.php
+++ b/advancedcontentfilter/vendor/psr/http-message/src/ServerRequestInterface.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Psr\Http\Message;
 
 /**
@@ -53,7 +51,7 @@ interface ServerRequestInterface extends RequestInterface
      *
      * @return array
      */
-    public function getServerParams();
+    public function getServerParams(): array;
 
     /**
      * Retrieve cookies.
@@ -65,7 +63,7 @@ interface ServerRequestInterface extends RequestInterface
      *
      * @return array
      */
-    public function getCookieParams();
+    public function getCookieParams(): array;
 
     /**
      * Return an instance with the specified cookies.
@@ -84,7 +82,7 @@ interface ServerRequestInterface extends RequestInterface
      * @param array $cookies Array of key/value pairs representing cookies.
      * @return static
      */
-    public function withCookieParams(array $cookies);
+    public function withCookieParams(array $cookies): ServerRequestInterface;
 
     /**
      * Retrieve query string arguments.
@@ -98,7 +96,7 @@ interface ServerRequestInterface extends RequestInterface
      *
      * @return array
      */
-    public function getQueryParams();
+    public function getQueryParams(): array;
 
     /**
      * Return an instance with the specified query string arguments.
@@ -122,7 +120,7 @@ interface ServerRequestInterface extends RequestInterface
      *     $_GET.
      * @return static
      */
-    public function withQueryParams(array $query);
+    public function withQueryParams(array $query): ServerRequestInterface;
 
     /**
      * Retrieve normalized file upload data.
@@ -136,7 +134,7 @@ interface ServerRequestInterface extends RequestInterface
      * @return array An array tree of UploadedFileInterface instances; an empty
      *     array MUST be returned if no data is present.
      */
-    public function getUploadedFiles();
+    public function getUploadedFiles(): array;
 
     /**
      * Create a new instance with the specified uploaded files.
@@ -149,7 +147,7 @@ interface ServerRequestInterface extends RequestInterface
      * @return static
      * @throws \InvalidArgumentException if an invalid structure is provided.
      */
-    public function withUploadedFiles(array $uploadedFiles);
+    public function withUploadedFiles(array $uploadedFiles): ServerRequestInterface;
 
     /**
      * Retrieve any parameters provided in the request body.
@@ -196,7 +194,7 @@ interface ServerRequestInterface extends RequestInterface
      * @throws \InvalidArgumentException if an unsupported argument type is
      *     provided.
      */
-    public function withParsedBody($data);
+    public function withParsedBody($data): ServerRequestInterface;
 
     /**
      * Retrieve attributes derived from the request.
@@ -209,7 +207,7 @@ interface ServerRequestInterface extends RequestInterface
      *
      * @return array Attributes derived from the request.
      */
-    public function getAttributes();
+    public function getAttributes(): array;
 
     /**
      * Retrieve a single derived request attribute.
@@ -243,7 +241,7 @@ interface ServerRequestInterface extends RequestInterface
      * @param mixed $value The value of the attribute.
      * @return static
      */
-    public function withAttribute(string $name, $value);
+    public function withAttribute(string $name, $value): ServerRequestInterface;
 
     /**
      * Return an instance that removes the specified derived request attribute.
@@ -259,5 +257,5 @@ interface ServerRequestInterface extends RequestInterface
      * @param string $name The attribute name.
      * @return static
      */
-    public function withoutAttribute(string $name);
+    public function withoutAttribute(string $name): ServerRequestInterface;
 }
diff --git a/advancedcontentfilter/vendor/psr/http-message/src/StreamInterface.php b/advancedcontentfilter/vendor/psr/http-message/src/StreamInterface.php
index 59246639..a62aabb8 100644
--- a/advancedcontentfilter/vendor/psr/http-message/src/StreamInterface.php
+++ b/advancedcontentfilter/vendor/psr/http-message/src/StreamInterface.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Psr\Http\Message;
 
 /**
@@ -27,14 +25,14 @@ interface StreamInterface
      * @see http://php.net/manual/en/language.oop5.magic.php#object.tostring
      * @return string
      */
-    public function __toString();
+    public function __toString(): string;
 
     /**
      * Closes the stream and any underlying resources.
      *
      * @return void
      */
-    public function close();
+    public function close(): void;
 
     /**
      * Separates any underlying resources from the stream.
@@ -50,7 +48,7 @@ interface StreamInterface
      *
      * @return int|null Returns the size in bytes if known, or null if unknown.
      */
-    public function getSize();
+    public function getSize(): ?int;
 
     /**
      * Returns the current position of the file read/write pointer
@@ -58,21 +56,21 @@ interface StreamInterface
      * @return int Position of the file pointer
      * @throws \RuntimeException on error.
      */
-    public function tell();
+    public function tell(): int;
 
     /**
      * Returns true if the stream is at the end of the stream.
      *
      * @return bool
      */
-    public function eof();
+    public function eof(): bool;
 
     /**
      * Returns whether or not the stream is seekable.
      *
      * @return bool
      */
-    public function isSeekable();
+    public function isSeekable(): bool;
 
     /**
      * Seek to a position in the stream.
@@ -86,7 +84,7 @@ interface StreamInterface
      *     SEEK_END: Set position to end-of-stream plus offset.
      * @throws \RuntimeException on failure.
      */
-    public function seek(int $offset, int $whence = SEEK_SET);
+    public function seek(int $offset, int $whence = SEEK_SET): void;
 
     /**
      * Seek to the beginning of the stream.
@@ -98,14 +96,14 @@ interface StreamInterface
      * @link http://www.php.net/manual/en/function.fseek.php
      * @throws \RuntimeException on failure.
      */
-    public function rewind();
+    public function rewind(): void;
 
     /**
      * Returns whether or not the stream is writable.
      *
      * @return bool
      */
-    public function isWritable();
+    public function isWritable(): bool;
 
     /**
      * Write data to the stream.
@@ -114,14 +112,14 @@ interface StreamInterface
      * @return int Returns the number of bytes written to the stream.
      * @throws \RuntimeException on failure.
      */
-    public function write(string $string);
+    public function write(string $string): int;
 
     /**
      * Returns whether or not the stream is readable.
      *
      * @return bool
      */
-    public function isReadable();
+    public function isReadable(): bool;
 
     /**
      * Read data from the stream.
@@ -133,7 +131,7 @@ interface StreamInterface
      *     if no bytes are available.
      * @throws \RuntimeException if an error occurs.
      */
-    public function read(int $length);
+    public function read(int $length): string;
 
     /**
      * Returns the remaining contents in a string
@@ -142,7 +140,7 @@ interface StreamInterface
      * @throws \RuntimeException if unable to read or an error occurs while
      *     reading.
      */
-    public function getContents();
+    public function getContents(): string;
 
     /**
      * Get stream metadata as an associative array or retrieve a specific key.
diff --git a/advancedcontentfilter/vendor/psr/http-message/src/UploadedFileInterface.php b/advancedcontentfilter/vendor/psr/http-message/src/UploadedFileInterface.php
index aba63215..dd19d653 100644
--- a/advancedcontentfilter/vendor/psr/http-message/src/UploadedFileInterface.php
+++ b/advancedcontentfilter/vendor/psr/http-message/src/UploadedFileInterface.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Psr\Http\Message;
 
 /**
@@ -30,7 +28,7 @@ interface UploadedFileInterface
      * @throws \RuntimeException in cases when no stream is available or can be
      *     created.
      */
-    public function getStream();
+    public function getStream(): StreamInterface;
 
     /**
      * Move the uploaded file to a new location.
@@ -64,7 +62,7 @@ interface UploadedFileInterface
      * @throws \RuntimeException on any error during the move operation, or on
      *     the second or subsequent call to the method.
      */
-    public function moveTo(string $targetPath);
+    public function moveTo(string $targetPath): void;
     
     /**
      * Retrieve the file size.
@@ -75,7 +73,7 @@ interface UploadedFileInterface
      *
      * @return int|null The file size in bytes or null if unknown.
      */
-    public function getSize();
+    public function getSize(): ?int;
     
     /**
      * Retrieve the error associated with the uploaded file.
@@ -91,7 +89,7 @@ interface UploadedFileInterface
      * @see http://php.net/manual/en/features.file-upload.errors.php
      * @return int One of PHP's UPLOAD_ERR_XXX constants.
      */
-    public function getError();
+    public function getError(): int;
     
     /**
      * Retrieve the filename sent by the client.
@@ -106,7 +104,7 @@ interface UploadedFileInterface
      * @return string|null The filename sent by the client or null if none
      *     was provided.
      */
-    public function getClientFilename();
+    public function getClientFilename(): ?string;
     
     /**
      * Retrieve the media type sent by the client.
@@ -121,5 +119,5 @@ interface UploadedFileInterface
      * @return string|null The media type sent by the client or null if none
      *     was provided.
      */
-    public function getClientMediaType();
+    public function getClientMediaType(): ?string;
 }
diff --git a/advancedcontentfilter/vendor/psr/http-message/src/UriInterface.php b/advancedcontentfilter/vendor/psr/http-message/src/UriInterface.php
index d974de0d..15e2cf28 100644
--- a/advancedcontentfilter/vendor/psr/http-message/src/UriInterface.php
+++ b/advancedcontentfilter/vendor/psr/http-message/src/UriInterface.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Psr\Http\Message;
 
 /**
@@ -40,7 +38,7 @@ interface UriInterface
      * @see https://tools.ietf.org/html/rfc3986#section-3.1
      * @return string The URI scheme.
      */
-    public function getScheme();
+    public function getScheme(): string;
 
     /**
      * Retrieve the authority component of the URI.
@@ -60,7 +58,7 @@ interface UriInterface
      * @see https://tools.ietf.org/html/rfc3986#section-3.2
      * @return string The URI authority, in "[user-info@]host[:port]" format.
      */
-    public function getAuthority();
+    public function getAuthority(): string;
 
     /**
      * Retrieve the user information component of the URI.
@@ -77,7 +75,7 @@ interface UriInterface
      *
      * @return string The URI user information, in "username[:password]" format.
      */
-    public function getUserInfo();
+    public function getUserInfo(): string;
 
     /**
      * Retrieve the host component of the URI.
@@ -90,7 +88,7 @@ interface UriInterface
      * @see http://tools.ietf.org/html/rfc3986#section-3.2.2
      * @return string The URI host.
      */
-    public function getHost();
+    public function getHost(): string;
 
     /**
      * Retrieve the port component of the URI.
@@ -107,7 +105,7 @@ interface UriInterface
      *
      * @return null|int The URI port.
      */
-    public function getPort();
+    public function getPort(): ?int;
 
     /**
      * Retrieve the path component of the URI.
@@ -134,7 +132,7 @@ interface UriInterface
      * @see https://tools.ietf.org/html/rfc3986#section-3.3
      * @return string The URI path.
      */
-    public function getPath();
+    public function getPath(): string;
 
     /**
      * Retrieve the query string of the URI.
@@ -156,7 +154,7 @@ interface UriInterface
      * @see https://tools.ietf.org/html/rfc3986#section-3.4
      * @return string The URI query string.
      */
-    public function getQuery();
+    public function getQuery(): string;
 
     /**
      * Retrieve the fragment component of the URI.
@@ -174,7 +172,7 @@ interface UriInterface
      * @see https://tools.ietf.org/html/rfc3986#section-3.5
      * @return string The URI fragment.
      */
-    public function getFragment();
+    public function getFragment(): string;
 
     /**
      * Return an instance with the specified scheme.
@@ -191,7 +189,7 @@ interface UriInterface
      * @return static A new instance with the specified scheme.
      * @throws \InvalidArgumentException for invalid or unsupported schemes.
      */
-    public function withScheme(string $scheme);
+    public function withScheme(string $scheme): UriInterface;
 
     /**
      * Return an instance with the specified user information.
@@ -207,7 +205,7 @@ interface UriInterface
      * @param null|string $password The password associated with $user.
      * @return static A new instance with the specified user information.
      */
-    public function withUserInfo(string $user, ?string $password = null);
+    public function withUserInfo(string $user, ?string $password = null): UriInterface;
 
     /**
      * Return an instance with the specified host.
@@ -221,7 +219,7 @@ interface UriInterface
      * @return static A new instance with the specified host.
      * @throws \InvalidArgumentException for invalid hostnames.
      */
-    public function withHost(string $host);
+    public function withHost(string $host): UriInterface;
 
     /**
      * Return an instance with the specified port.
@@ -240,7 +238,7 @@ interface UriInterface
      * @return static A new instance with the specified port.
      * @throws \InvalidArgumentException for invalid ports.
      */
-    public function withPort(?int $port);
+    public function withPort(?int $port): UriInterface;
 
     /**
      * Return an instance with the specified path.
@@ -264,7 +262,7 @@ interface UriInterface
      * @return static A new instance with the specified path.
      * @throws \InvalidArgumentException for invalid paths.
      */
-    public function withPath(string $path);
+    public function withPath(string $path): UriInterface;
 
     /**
      * Return an instance with the specified query string.
@@ -281,7 +279,7 @@ interface UriInterface
      * @return static A new instance with the specified query string.
      * @throws \InvalidArgumentException for invalid query strings.
      */
-    public function withQuery(string $query);
+    public function withQuery(string $query): UriInterface;
 
     /**
      * Return an instance with the specified URI fragment.
@@ -297,7 +295,7 @@ interface UriInterface
      * @param string $fragment The fragment to use with the new instance.
      * @return static A new instance with the specified fragment.
      */
-    public function withFragment(string $fragment);
+    public function withFragment(string $fragment): UriInterface;
 
     /**
      * Return the string representation as a URI reference.
@@ -322,5 +320,5 @@ interface UriInterface
      * @see http://tools.ietf.org/html/rfc3986#section-4.1
      * @return string
      */
-    public function __toString();
+    public function __toString(): string;
 }
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpTooManyRequestsException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpTooManyRequestsException.php
new file mode 100644
index 00000000..be4b29bb
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpTooManyRequestsException.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\Exception;
+
+class HttpTooManyRequestsException extends HttpSpecializedException
+{
+    /**
+     * @var int
+     */
+    protected $code = 429;
+
+    /**
+     * @var string
+     */
+    protected $message = 'Too many requests.';
+
+    protected string $title = '429 Too Many Requests';
+    protected string $description = 'The client application has surpassed its rate limit, ' .
+                                    'or number of requests they can send in a given period of time.';
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/composer.json b/advancedcontentfilter/vendor/slim/slim/composer.json
index 36c0c1d1..f98064ff 100644
--- a/advancedcontentfilter/vendor/slim/slim/composer.json
+++ b/advancedcontentfilter/vendor/slim/slim/composer.json
@@ -48,7 +48,7 @@
         "nikic/fast-route": "^1.3",
         "psr/container": "^1.0 || ^2.0",
         "psr/http-factory": "^1.0",
-        "psr/http-message": "^1.1",
+        "psr/http-message": "^1.1 || ^2.0",
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0",
         "psr/log": "^1.1 || ^2.0 || ^3.0"
@@ -56,19 +56,19 @@
     "require-dev": {
         "ext-simplexml": "*",
         "adriansuter/php-autoload-override": "^1.4",
-        "guzzlehttp/psr7": "^2.5",
+        "guzzlehttp/psr7": "^2.6",
         "httpsoft/http-message": "^1.1",
         "httpsoft/http-server-request": "^1.1",
-        "laminas/laminas-diactoros": "^2.17",
+        "laminas/laminas-diactoros": "^2.17 || ^3",
         "nyholm/psr7": "^1.8",
-        "nyholm/psr7-server": "^1.0",
-        "phpspec/prophecy": "^1.17",
-        "phpspec/prophecy-phpunit": "^2.0",
+        "nyholm/psr7-server": "^1.1",
+        "phpspec/prophecy": "^1.19",
+        "phpspec/prophecy-phpunit": "^2.1",
         "phpstan/phpstan": "^1.10",
         "phpunit/phpunit": "^9.6",
         "slim/http": "^1.3",
         "slim/psr7": "^1.6",
-        "squizlabs/php_codesniffer": "^3.7"
+        "squizlabs/php_codesniffer": "^3.9"
     },
     "autoload": {
         "psr-4": {
diff --git a/advancedcontentfilter/vendor/symfony/cache-contracts/.gitignore b/advancedcontentfilter/vendor/symfony/cache-contracts/.gitignore
new file mode 100644
index 00000000..c49a5d8d
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache-contracts/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/advancedcontentfilter/vendor/symfony/cache-contracts/CHANGELOG.md b/advancedcontentfilter/vendor/symfony/cache-contracts/CHANGELOG.md
new file mode 100644
index 00000000..7932e261
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache-contracts/CHANGELOG.md
@@ -0,0 +1,5 @@
+CHANGELOG
+=========
+
+The changelog is maintained for all Symfony contracts at the following URL:
+https://github.com/symfony/contracts/blob/main/CHANGELOG.md
diff --git a/advancedcontentfilter/vendor/symfony/cache-contracts/CacheInterface.php b/advancedcontentfilter/vendor/symfony/cache-contracts/CacheInterface.php
new file mode 100644
index 00000000..67e4dfd3
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache-contracts/CacheInterface.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Contracts\Cache;
+
+use Psr\Cache\CacheItemInterface;
+use Psr\Cache\InvalidArgumentException;
+
+/**
+ * Covers most simple to advanced caching needs.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+interface CacheInterface
+{
+    /**
+     * Fetches a value from the pool or computes it if not found.
+     *
+     * On cache misses, a callback is called that should return the missing value.
+     * This callback is given a PSR-6 CacheItemInterface instance corresponding to the
+     * requested key, that could be used e.g. for expiration control. It could also
+     * be an ItemInterface instance when its additional features are needed.
+     *
+     * @param string                     $key       The key of the item to retrieve from the cache
+     * @param callable|CallbackInterface $callback  Should return the computed value for the given key/item
+     * @param float|null                 $beta      A float that, as it grows, controls the likeliness of triggering
+     *                                              early expiration. 0 disables it, INF forces immediate expiration.
+     *                                              The default (or providing null) is implementation dependent but should
+     *                                              typically be 1.0, which should provide optimal stampede protection.
+     *                                              See https://en.wikipedia.org/wiki/Cache_stampede#Probabilistic_early_expiration
+     * @param array                      &$metadata The metadata of the cached item {@see ItemInterface::getMetadata()}
+     *
+     * @return mixed
+     *
+     * @throws InvalidArgumentException When $key is not valid or when $beta is negative
+     */
+    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null);
+
+    /**
+     * Removes an item from the pool.
+     *
+     * @param string $key The key to delete
+     *
+     * @throws InvalidArgumentException When $key is not valid
+     *
+     * @return bool True if the item was successfully removed, false if there was any error
+     */
+    public function delete(string $key): bool;
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache-contracts/CacheTrait.php b/advancedcontentfilter/vendor/symfony/cache-contracts/CacheTrait.php
new file mode 100644
index 00000000..d340e069
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache-contracts/CacheTrait.php
@@ -0,0 +1,80 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Contracts\Cache;
+
+use Psr\Cache\CacheItemPoolInterface;
+use Psr\Cache\InvalidArgumentException;
+use Psr\Log\LoggerInterface;
+
+// Help opcache.preload discover always-needed symbols
+class_exists(InvalidArgumentException::class);
+
+/**
+ * An implementation of CacheInterface for PSR-6 CacheItemPoolInterface classes.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+trait CacheTrait
+{
+    /**
+     * {@inheritdoc}
+     *
+     * @return mixed
+     */
+    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
+    {
+        return $this->doGet($this, $key, $callback, $beta, $metadata);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function delete(string $key): bool
+    {
+        return $this->deleteItem($key);
+    }
+
+    private function doGet(CacheItemPoolInterface $pool, string $key, callable $callback, ?float $beta, array &$metadata = null, LoggerInterface $logger = null)
+    {
+        if (0 > $beta = $beta ?? 1.0) {
+            throw new class(sprintf('Argument "$beta" provided to "%s::get()" must be a positive number, %f given.', static::class, $beta)) extends \InvalidArgumentException implements InvalidArgumentException { };
+        }
+
+        $item = $pool->getItem($key);
+        $recompute = !$item->isHit() || \INF === $beta;
+        $metadata = $item instanceof ItemInterface ? $item->getMetadata() : [];
+
+        if (!$recompute && $metadata) {
+            $expiry = $metadata[ItemInterface::METADATA_EXPIRY] ?? false;
+            $ctime = $metadata[ItemInterface::METADATA_CTIME] ?? false;
+
+            if ($recompute = $ctime && $expiry && $expiry <= ($now = microtime(true)) - $ctime / 1000 * $beta * log(random_int(1, \PHP_INT_MAX) / \PHP_INT_MAX)) {
+                // force applying defaultLifetime to expiry
+                $item->expiresAt(null);
+                $logger && $logger->info('Item "{key}" elected for early recomputation {delta}s before its expiration', [
+                    'key' => $key,
+                    'delta' => sprintf('%.1f', $expiry - $now),
+                ]);
+            }
+        }
+
+        if ($recompute) {
+            $save = true;
+            $item->set($callback($item, $save));
+            if ($save) {
+                $pool->save($item);
+            }
+        }
+
+        return $item->get();
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache-contracts/CallbackInterface.php b/advancedcontentfilter/vendor/symfony/cache-contracts/CallbackInterface.php
new file mode 100644
index 00000000..7dae2aac
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache-contracts/CallbackInterface.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Contracts\Cache;
+
+use Psr\Cache\CacheItemInterface;
+
+/**
+ * Computes and returns the cached value of an item.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+interface CallbackInterface
+{
+    /**
+     * @param CacheItemInterface|ItemInterface $item  The item to compute the value for
+     * @param bool                             &$save Should be set to false when the value should not be saved in the pool
+     *
+     * @return mixed The computed value for the passed item
+     */
+    public function __invoke(CacheItemInterface $item, bool &$save);
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache-contracts/ItemInterface.php b/advancedcontentfilter/vendor/symfony/cache-contracts/ItemInterface.php
new file mode 100644
index 00000000..10c04889
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache-contracts/ItemInterface.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Contracts\Cache;
+
+use Psr\Cache\CacheException;
+use Psr\Cache\CacheItemInterface;
+use Psr\Cache\InvalidArgumentException;
+
+/**
+ * Augments PSR-6's CacheItemInterface with support for tags and metadata.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+interface ItemInterface extends CacheItemInterface
+{
+    /**
+     * References the Unix timestamp stating when the item will expire.
+     */
+    public const METADATA_EXPIRY = 'expiry';
+
+    /**
+     * References the time the item took to be created, in milliseconds.
+     */
+    public const METADATA_CTIME = 'ctime';
+
+    /**
+     * References the list of tags that were assigned to the item, as string[].
+     */
+    public const METADATA_TAGS = 'tags';
+
+    /**
+     * Reserved characters that cannot be used in a key or tag.
+     */
+    public const RESERVED_CHARACTERS = '{}()/\@:';
+
+    /**
+     * Adds a tag to a cache item.
+     *
+     * Tags are strings that follow the same validation rules as keys.
+     *
+     * @param string|string[] $tags A tag or array of tags
+     *
+     * @return $this
+     *
+     * @throws InvalidArgumentException When $tag is not valid
+     * @throws CacheException           When the item comes from a pool that is not tag-aware
+     */
+    public function tag($tags): self;
+
+    /**
+     * Returns a list of metadata info that were saved alongside with the cached value.
+     *
+     * See ItemInterface::METADATA_* consts for keys potentially found in the returned array.
+     */
+    public function getMetadata(): array;
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache-contracts/LICENSE b/advancedcontentfilter/vendor/symfony/cache-contracts/LICENSE
new file mode 100644
index 00000000..74cdc2db
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache-contracts/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2018-2022 Fabien Potencier
+
+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/advancedcontentfilter/vendor/symfony/cache-contracts/README.md b/advancedcontentfilter/vendor/symfony/cache-contracts/README.md
new file mode 100644
index 00000000..7085a699
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache-contracts/README.md
@@ -0,0 +1,9 @@
+Symfony Cache Contracts
+=======================
+
+A set of abstractions extracted out of the Symfony components.
+
+Can be used to build on semantics that the Symfony components proved useful - and
+that already have battle tested implementations.
+
+See https://github.com/symfony/contracts/blob/main/README.md for more information.
diff --git a/advancedcontentfilter/vendor/symfony/cache-contracts/TagAwareCacheInterface.php b/advancedcontentfilter/vendor/symfony/cache-contracts/TagAwareCacheInterface.php
new file mode 100644
index 00000000..7c4cf111
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache-contracts/TagAwareCacheInterface.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Contracts\Cache;
+
+use Psr\Cache\InvalidArgumentException;
+
+/**
+ * Allows invalidating cached items using tags.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+interface TagAwareCacheInterface extends CacheInterface
+{
+    /**
+     * Invalidates cached items using tags.
+     *
+     * When implemented on a PSR-6 pool, invalidation should not apply
+     * to deferred items. Instead, they should be committed as usual.
+     * This allows replacing old tagged values by new ones without
+     * race conditions.
+     *
+     * @param string[] $tags An array of tags to invalidate
+     *
+     * @return bool True on success
+     *
+     * @throws InvalidArgumentException When $tags is not valid
+     */
+    public function invalidateTags(array $tags);
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache-contracts/composer.json b/advancedcontentfilter/vendor/symfony/cache-contracts/composer.json
new file mode 100644
index 00000000..9f45e178
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache-contracts/composer.json
@@ -0,0 +1,38 @@
+{
+    "name": "symfony/cache-contracts",
+    "type": "library",
+    "description": "Generic abstractions related to caching",
+    "keywords": ["abstractions", "contracts", "decoupling", "interfaces", "interoperability", "standards"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Nicolas Grekas",
+            "email": "p@tchwork.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=7.2.5",
+        "psr/cache": "^1.0|^2.0|^3.0"
+    },
+    "suggest": {
+        "symfony/cache-implementation": ""
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Contracts\\Cache\\": "" }
+    },
+    "minimum-stability": "dev",
+    "extra": {
+        "branch-alias": {
+            "dev-main": "2.5-dev"
+        },
+        "thanks": {
+            "name": "symfony/contracts",
+            "url": "https://github.com/symfony/contracts"
+        }
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/AbstractAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/AbstractAdapter.php
index ab7dc960..65647442 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/AbstractAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/AbstractAdapter.php
@@ -11,37 +11,32 @@
 
 namespace Symfony\Component\Cache\Adapter;
 
-use Psr\Cache\CacheItemInterface;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\ResettableInterface;
-use Symfony\Component\Cache\Traits\AbstractTrait;
+use Symfony\Component\Cache\Traits\AbstractAdapterTrait;
+use Symfony\Component\Cache\Traits\ContractsTrait;
+use Symfony\Contracts\Cache\CacheInterface;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
-abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface, ResettableInterface
+abstract class AbstractAdapter implements AdapterInterface, CacheInterface, LoggerAwareInterface, ResettableInterface
 {
+    use AbstractAdapterTrait;
+    use ContractsTrait;
+
     /**
      * @internal
      */
-    const NS_SEPARATOR = ':';
-
-    use AbstractTrait;
+    protected const NS_SEPARATOR = ':';
 
     private static $apcuSupported;
     private static $phpFilesSupported;
 
-    private $createCacheItem;
-    private $mergeByLifetime;
-
-    /**
-     * @param string $namespace
-     * @param int    $defaultLifetime
-     */
-    protected function __construct($namespace = '', $defaultLifetime = 0)
+    protected function __construct(string $namespace = '', int $defaultLifetime = 0)
     {
         $this->namespace = '' === $namespace ? '' : CacheItem::validateKey($namespace).static::NS_SEPARATOR;
         if (null !== $this->maxIdLength && \strlen($namespace) > $this->maxIdLength - 24) {
@@ -51,31 +46,45 @@ abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface
             static function ($key, $value, $isHit) {
                 $item = new CacheItem();
                 $item->key = $key;
-                $item->value = $value;
+                $item->value = $v = $value;
                 $item->isHit = $isHit;
+                // Detect wrapped values that encode for their expiry and creation duration
+                // For compactness, these values are packed in the key of an array using
+                // magic numbers in the form 9D-..-..-..-..-00-..-..-..-5F
+                if (\is_array($v) && 1 === \count($v) && 10 === \strlen($k = (string) array_key_first($v)) && "\x9D" === $k[0] && "\0" === $k[5] && "\x5F" === $k[9]) {
+                    $item->value = $v[$k];
+                    $v = unpack('Ve/Nc', substr($k, 1, -1));
+                    $item->metadata[CacheItem::METADATA_EXPIRY] = $v['e'] + CacheItem::METADATA_EXPIRY_OFFSET;
+                    $item->metadata[CacheItem::METADATA_CTIME] = $v['c'];
+                }
 
                 return $item;
             },
             null,
             CacheItem::class
         );
-        $getId = function ($key) { return $this->getId((string) $key); };
+        $getId = \Closure::fromCallable([$this, 'getId']);
         $this->mergeByLifetime = \Closure::bind(
             static function ($deferred, $namespace, &$expiredIds) use ($getId, $defaultLifetime) {
                 $byLifetime = [];
-                $now = time();
+                $now = microtime(true);
                 $expiredIds = [];
 
                 foreach ($deferred as $key => $item) {
+                    $key = (string) $key;
                     if (null === $item->expiry) {
-                        $byLifetime[0 < $defaultLifetime ? $defaultLifetime : 0][$getId($key)] = $item->value;
-                    } elseif (0 === $item->expiry) {
-                        $byLifetime[0][$getId($key)] = $item->value;
-                    } elseif ($item->expiry > $now) {
-                        $byLifetime[$item->expiry - $now][$getId($key)] = $item->value;
-                    } else {
+                        $ttl = 0 < $defaultLifetime ? $defaultLifetime : 0;
+                    } elseif (!$item->expiry) {
+                        $ttl = 0;
+                    } elseif (0 >= $ttl = (int) (0.1 + $item->expiry - $now)) {
                         $expiredIds[] = $getId($key);
+                        continue;
                     }
+                    if (isset(($metadata = $item->newMetadata)[CacheItem::METADATA_TAGS])) {
+                        unset($metadata[CacheItem::METADATA_TAGS]);
+                    }
+                    // For compactness, expiry and creation duration are packed in the key of an array, using magic numbers as separators
+                    $byLifetime[$ttl][$getId($key)] = $metadata ? ["\x9D".pack('VN', (int) (0.1 + $metadata[self::METADATA_EXPIRY] - self::METADATA_EXPIRY_OFFSET), $metadata[self::METADATA_CTIME])."\x5F" => $item->value] : $item->value;
                 }
 
                 return $byLifetime;
@@ -86,6 +95,10 @@ abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface
     }
 
     /**
+     * Returns the best possible adapter that your runtime supports.
+     *
+     * Using ApcuAdapter makes system caches compatible with read-only filesystems.
+     *
      * @param string $namespace
      * @param int    $defaultLifetime
      * @param string $version
@@ -95,37 +108,25 @@ abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface
      */
     public static function createSystemCache($namespace, $defaultLifetime, $version, $directory, LoggerInterface $logger = null)
     {
-        if (null === self::$apcuSupported) {
-            self::$apcuSupported = ApcuAdapter::isSupported();
+        $opcache = new PhpFilesAdapter($namespace, $defaultLifetime, $directory, true);
+        if (null !== $logger) {
+            $opcache->setLogger($logger);
         }
 
-        if (!self::$apcuSupported && null === self::$phpFilesSupported) {
-            self::$phpFilesSupported = PhpFilesAdapter::isSupported();
-        }
-
-        if (self::$phpFilesSupported) {
-            $opcache = new PhpFilesAdapter($namespace, $defaultLifetime, $directory);
-            if (null !== $logger) {
-                $opcache->setLogger($logger);
-            }
-
+        if (!self::$apcuSupported = self::$apcuSupported ?? ApcuAdapter::isSupported()) {
             return $opcache;
         }
 
-        $fs = new FilesystemAdapter($namespace, $defaultLifetime, $directory);
-        if (null !== $logger) {
-            $fs->setLogger($logger);
-        }
-        if (!self::$apcuSupported || (\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) && !filter_var(ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN))) {
-            return $fs;
+        if (\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) && !filter_var(\ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN)) {
+            return $opcache;
         }
 
-        $apcu = new ApcuAdapter($namespace, (int) $defaultLifetime / 5, $version);
+        $apcu = new ApcuAdapter($namespace, intdiv($defaultLifetime, 5), $version);
         if (null !== $logger) {
             $apcu->setLogger($logger);
         }
 
-        return new ChainAdapter([$apcu, $fs]);
+        return new ChainAdapter([$apcu, $opcache]);
     }
 
     public static function createConnection($dsn, array $options = [])
@@ -133,10 +134,10 @@ abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface
         if (!\is_string($dsn)) {
             throw new InvalidArgumentException(sprintf('The "%s()" method expect argument #1 to be string, "%s" given.', __METHOD__, \gettype($dsn)));
         }
-        if (0 === strpos($dsn, 'redis://')) {
+        if (str_starts_with($dsn, 'redis:') || str_starts_with($dsn, 'rediss:')) {
             return RedisAdapter::createConnection($dsn, $options);
         }
-        if (0 === strpos($dsn, 'memcached://')) {
+        if (str_starts_with($dsn, 'memcached:')) {
             return MemcachedAdapter::createConnection($dsn, $options);
         }
 
@@ -145,81 +146,8 @@ abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface
 
     /**
      * {@inheritdoc}
-     */
-    public function getItem($key)
-    {
-        if ($this->deferred) {
-            $this->commit();
-        }
-        $id = $this->getId($key);
-
-        $f = $this->createCacheItem;
-        $isHit = false;
-        $value = null;
-
-        try {
-            foreach ($this->doFetch([$id]) as $value) {
-                $isHit = true;
-            }
-        } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to fetch key "{key}"', ['key' => $key, 'exception' => $e]);
-        }
-
-        return $f($key, $value, $isHit);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getItems(array $keys = [])
-    {
-        if ($this->deferred) {
-            $this->commit();
-        }
-        $ids = [];
-
-        foreach ($keys as $key) {
-            $ids[] = $this->getId($key);
-        }
-        try {
-            $items = $this->doFetch($ids);
-        } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to fetch requested items', ['keys' => $keys, 'exception' => $e]);
-            $items = [];
-        }
-        $ids = array_combine($ids, $keys);
-
-        return $this->generateItems($items, $ids);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function save(CacheItemInterface $item)
-    {
-        if (!$item instanceof CacheItem) {
-            return false;
-        }
-        $this->deferred[$item->getKey()] = $item;
-
-        return $this->commit();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function saveDeferred(CacheItemInterface $item)
-    {
-        if (!$item instanceof CacheItem) {
-            return false;
-        }
-        $this->deferred[$item->getKey()] = $item;
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
+     *
+     * @return bool
      */
     public function commit()
     {
@@ -229,7 +157,12 @@ abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface
         $retry = $this->deferred = [];
 
         if ($expiredIds) {
-            $this->doDelete($expiredIds);
+            try {
+                $this->doDelete($expiredIds);
+            } catch (\Exception $e) {
+                $ok = false;
+                CacheItem::log($this->logger, 'Failed to delete expired items: '.$e->getMessage(), ['exception' => $e, 'cache-adapter' => get_debug_type($this)]);
+            }
         }
         foreach ($byLifetime as $lifetime => $values) {
             try {
@@ -244,7 +177,8 @@ abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface
                     $ok = false;
                     $v = $values[$id];
                     $type = \is_object($v) ? \get_class($v) : \gettype($v);
-                    CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', ['key' => substr($id, \strlen($this->namespace)), 'type' => $type, 'exception' => $e instanceof \Exception ? $e : null]);
+                    $message = sprintf('Failed to save key "{key}" of type %s%s', $type, $e instanceof \Exception ? ': '.$e->getMessage() : '.');
+                    CacheItem::log($this->logger, $message, ['key' => substr($id, \strlen($this->namespace)), 'exception' => $e instanceof \Exception ? $e : null]);
                 }
             } else {
                 foreach ($values as $id => $v) {
@@ -266,49 +200,11 @@ abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface
                 }
                 $ok = false;
                 $type = \is_object($v) ? \get_class($v) : \gettype($v);
-                CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', ['key' => substr($id, \strlen($this->namespace)), 'type' => $type, 'exception' => $e instanceof \Exception ? $e : null]);
+                $message = sprintf('Failed to save key "{key}" of type %s%s', $type, $e instanceof \Exception ? ': '.$e->getMessage() : '.');
+                CacheItem::log($this->logger, $message, ['key' => substr($id, \strlen($this->namespace)), 'exception' => $e instanceof \Exception ? $e : null]);
             }
         }
 
         return $ok;
     }
-
-    public function __sleep()
-    {
-        throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
-    }
-
-    public function __wakeup()
-    {
-        throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
-    }
-
-    public function __destruct()
-    {
-        if ($this->deferred) {
-            $this->commit();
-        }
-    }
-
-    private function generateItems($items, &$keys)
-    {
-        $f = $this->createCacheItem;
-
-        try {
-            foreach ($items as $id => $value) {
-                if (!isset($keys[$id])) {
-                    $id = key($keys);
-                }
-                $key = $keys[$id];
-                unset($keys[$id]);
-                yield $key => $f($key, $value, true);
-            }
-        } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to fetch requested items', ['keys' => array_values($keys), 'exception' => $e]);
-        }
-
-        foreach ($keys as $key) {
-            yield $key => $f($key, null, false);
-        }
-    }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/AbstractTagAwareAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/AbstractTagAwareAdapter.php
new file mode 100644
index 00000000..6b62ae98
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/AbstractTagAwareAdapter.php
@@ -0,0 +1,334 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Adapter;
+
+use Psr\Log\LoggerAwareInterface;
+use Symfony\Component\Cache\CacheItem;
+use Symfony\Component\Cache\Exception\InvalidArgumentException;
+use Symfony\Component\Cache\ResettableInterface;
+use Symfony\Component\Cache\Traits\AbstractAdapterTrait;
+use Symfony\Component\Cache\Traits\ContractsTrait;
+use Symfony\Contracts\Cache\TagAwareCacheInterface;
+
+/**
+ * Abstract for native TagAware adapters.
+ *
+ * To keep info on tags, the tags are both serialized as part of cache value and provided as tag ids
+ * to Adapters on operations when needed for storage to doSave(), doDelete() & doInvalidate().
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ * @author André Rømcke <andre.romcke+symfony@gmail.com>
+ *
+ * @internal
+ */
+abstract class AbstractTagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterface, LoggerAwareInterface, ResettableInterface
+{
+    use AbstractAdapterTrait;
+    use ContractsTrait;
+
+    private const TAGS_PREFIX = "\0tags\0";
+
+    protected function __construct(string $namespace = '', int $defaultLifetime = 0)
+    {
+        $this->namespace = '' === $namespace ? '' : CacheItem::validateKey($namespace).':';
+        if (null !== $this->maxIdLength && \strlen($namespace) > $this->maxIdLength - 24) {
+            throw new InvalidArgumentException(sprintf('Namespace must be %d chars max, %d given ("%s").', $this->maxIdLength - 24, \strlen($namespace), $namespace));
+        }
+        $this->createCacheItem = \Closure::bind(
+            static function ($key, $value, $isHit) {
+                $item = new CacheItem();
+                $item->key = $key;
+                $item->isTaggable = true;
+                // If structure does not match what we expect return item as is (no value and not a hit)
+                if (!\is_array($value) || !\array_key_exists('value', $value)) {
+                    return $item;
+                }
+                $item->isHit = $isHit;
+                // Extract value, tags and meta data from the cache value
+                $item->value = $value['value'];
+                $item->metadata[CacheItem::METADATA_TAGS] = $value['tags'] ?? [];
+                if (isset($value['meta'])) {
+                    // For compactness these values are packed, & expiry is offset to reduce size
+                    $v = unpack('Ve/Nc', $value['meta']);
+                    $item->metadata[CacheItem::METADATA_EXPIRY] = $v['e'] + CacheItem::METADATA_EXPIRY_OFFSET;
+                    $item->metadata[CacheItem::METADATA_CTIME] = $v['c'];
+                }
+
+                return $item;
+            },
+            null,
+            CacheItem::class
+        );
+        $getId = \Closure::fromCallable([$this, 'getId']);
+        $tagPrefix = self::TAGS_PREFIX;
+        $this->mergeByLifetime = \Closure::bind(
+            static function ($deferred, &$expiredIds) use ($getId, $tagPrefix, $defaultLifetime) {
+                $byLifetime = [];
+                $now = microtime(true);
+                $expiredIds = [];
+
+                foreach ($deferred as $key => $item) {
+                    $key = (string) $key;
+                    if (null === $item->expiry) {
+                        $ttl = 0 < $defaultLifetime ? $defaultLifetime : 0;
+                    } elseif (!$item->expiry) {
+                        $ttl = 0;
+                    } elseif (0 >= $ttl = (int) (0.1 + $item->expiry - $now)) {
+                        $expiredIds[] = $getId($key);
+                        continue;
+                    }
+                    // Store Value and Tags on the cache value
+                    if (isset(($metadata = $item->newMetadata)[CacheItem::METADATA_TAGS])) {
+                        $value = ['value' => $item->value, 'tags' => $metadata[CacheItem::METADATA_TAGS]];
+                        unset($metadata[CacheItem::METADATA_TAGS]);
+                    } else {
+                        $value = ['value' => $item->value, 'tags' => []];
+                    }
+
+                    if ($metadata) {
+                        // For compactness, expiry and creation duration are packed, using magic numbers as separators
+                        $value['meta'] = pack('VN', (int) (0.1 + $metadata[self::METADATA_EXPIRY] - self::METADATA_EXPIRY_OFFSET), $metadata[self::METADATA_CTIME]);
+                    }
+
+                    // Extract tag changes, these should be removed from values in doSave()
+                    $value['tag-operations'] = ['add' => [], 'remove' => []];
+                    $oldTags = $item->metadata[CacheItem::METADATA_TAGS] ?? [];
+                    foreach (array_diff($value['tags'], $oldTags) as $addedTag) {
+                        $value['tag-operations']['add'][] = $getId($tagPrefix.$addedTag);
+                    }
+                    foreach (array_diff($oldTags, $value['tags']) as $removedTag) {
+                        $value['tag-operations']['remove'][] = $getId($tagPrefix.$removedTag);
+                    }
+
+                    $byLifetime[$ttl][$getId($key)] = $value;
+                    $item->metadata = $item->newMetadata;
+                }
+
+                return $byLifetime;
+            },
+            null,
+            CacheItem::class
+        );
+    }
+
+    /**
+     * Persists several cache items immediately.
+     *
+     * @param array   $values        The values to cache, indexed by their cache identifier
+     * @param int     $lifetime      The lifetime of the cached values, 0 for persisting until manual cleaning
+     * @param array[] $addTagData    Hash where key is tag id, and array value is list of cache id's to add to tag
+     * @param array[] $removeTagData Hash where key is tag id, and array value is list of cache id's to remove to tag
+     *
+     * @return array The identifiers that failed to be cached or a boolean stating if caching succeeded or not
+     */
+    abstract protected function doSave(array $values, int $lifetime, array $addTagData = [], array $removeTagData = []): array;
+
+    /**
+     * Removes multiple items from the pool and their corresponding tags.
+     *
+     * @param array $ids An array of identifiers that should be removed from the pool
+     *
+     * @return bool True if the items were successfully removed, false otherwise
+     */
+    abstract protected function doDelete(array $ids);
+
+    /**
+     * Removes relations between tags and deleted items.
+     *
+     * @param array $tagData Array of tag => key identifiers that should be removed from the pool
+     */
+    abstract protected function doDeleteTagRelations(array $tagData): bool;
+
+    /**
+     * Invalidates cached items using tags.
+     *
+     * @param string[] $tagIds An array of tags to invalidate, key is tag and value is tag id
+     *
+     * @return bool True on success
+     */
+    abstract protected function doInvalidate(array $tagIds): bool;
+
+    /**
+     * Delete items and yields the tags they were bound to.
+     */
+    protected function doDeleteYieldTags(array $ids): iterable
+    {
+        foreach ($this->doFetch($ids) as $id => $value) {
+            yield $id => \is_array($value) && \is_array($value['tags'] ?? null) ? $value['tags'] : [];
+        }
+
+        $this->doDelete($ids);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function commit(): bool
+    {
+        $ok = true;
+        $byLifetime = $this->mergeByLifetime;
+        $byLifetime = $byLifetime($this->deferred, $expiredIds);
+        $retry = $this->deferred = [];
+
+        if ($expiredIds) {
+            // Tags are not cleaned up in this case, however that is done on invalidateTags().
+            try {
+                $this->doDelete($expiredIds);
+            } catch (\Exception $e) {
+                $ok = false;
+                CacheItem::log($this->logger, 'Failed to delete expired items: '.$e->getMessage(), ['exception' => $e, 'cache-adapter' => get_debug_type($this)]);
+            }
+        }
+        foreach ($byLifetime as $lifetime => $values) {
+            try {
+                $values = $this->extractTagData($values, $addTagData, $removeTagData);
+                $e = $this->doSave($values, $lifetime, $addTagData, $removeTagData);
+            } catch (\Exception $e) {
+            }
+            if (true === $e || [] === $e) {
+                continue;
+            }
+            if (\is_array($e) || 1 === \count($values)) {
+                foreach (\is_array($e) ? $e : array_keys($values) as $id) {
+                    $ok = false;
+                    $v = $values[$id];
+                    $type = \is_object($v) ? \get_class($v) : \gettype($v);
+                    $message = sprintf('Failed to save key "{key}" of type %s%s', $type, $e instanceof \Exception ? ': '.$e->getMessage() : '.');
+                    CacheItem::log($this->logger, $message, ['key' => substr($id, \strlen($this->namespace)), 'exception' => $e instanceof \Exception ? $e : null]);
+                }
+            } else {
+                foreach ($values as $id => $v) {
+                    $retry[$lifetime][] = $id;
+                }
+            }
+        }
+
+        // When bulk-save failed, retry each item individually
+        foreach ($retry as $lifetime => $ids) {
+            foreach ($ids as $id) {
+                try {
+                    $v = $byLifetime[$lifetime][$id];
+                    $values = $this->extractTagData([$id => $v], $addTagData, $removeTagData);
+                    $e = $this->doSave($values, $lifetime, $addTagData, $removeTagData);
+                } catch (\Exception $e) {
+                }
+                if (true === $e || [] === $e) {
+                    continue;
+                }
+                $ok = false;
+                $type = \is_object($v) ? \get_class($v) : \gettype($v);
+                $message = sprintf('Failed to save key "{key}" of type %s%s', $type, $e instanceof \Exception ? ': '.$e->getMessage() : '.');
+                CacheItem::log($this->logger, $message, ['key' => substr($id, \strlen($this->namespace)), 'exception' => $e instanceof \Exception ? $e : null]);
+            }
+        }
+
+        return $ok;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function deleteItems(array $keys): bool
+    {
+        if (!$keys) {
+            return true;
+        }
+
+        $ok = true;
+        $ids = [];
+        $tagData = [];
+
+        foreach ($keys as $key) {
+            $ids[$key] = $this->getId($key);
+            unset($this->deferred[$key]);
+        }
+
+        try {
+            foreach ($this->doDeleteYieldTags(array_values($ids)) as $id => $tags) {
+                foreach ($tags as $tag) {
+                    $tagData[$this->getId(self::TAGS_PREFIX.$tag)][] = $id;
+                }
+            }
+        } catch (\Exception $e) {
+            $ok = false;
+        }
+
+        try {
+            if ((!$tagData || $this->doDeleteTagRelations($tagData)) && $ok) {
+                return true;
+            }
+        } catch (\Exception $e) {
+        }
+
+        // When bulk-delete failed, retry each item individually
+        foreach ($ids as $key => $id) {
+            try {
+                $e = null;
+                if ($this->doDelete([$id])) {
+                    continue;
+                }
+            } catch (\Exception $e) {
+            }
+            $message = 'Failed to delete key "{key}"'.($e instanceof \Exception ? ': '.$e->getMessage() : '.');
+            CacheItem::log($this->logger, $message, ['key' => $key, 'exception' => $e]);
+            $ok = false;
+        }
+
+        return $ok;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function invalidateTags(array $tags)
+    {
+        if (empty($tags)) {
+            return false;
+        }
+
+        $tagIds = [];
+        foreach (array_unique($tags) as $tag) {
+            $tagIds[] = $this->getId(self::TAGS_PREFIX.$tag);
+        }
+
+        try {
+            if ($this->doInvalidate($tagIds)) {
+                return true;
+            }
+        } catch (\Exception $e) {
+            CacheItem::log($this->logger, 'Failed to invalidate tags: '.$e->getMessage(), ['exception' => $e, 'cache-adapter' => get_debug_type($this)]);
+        }
+
+        return false;
+    }
+
+    /**
+     * Extracts tags operation data from $values set in mergeByLifetime, and returns values without it.
+     */
+    private function extractTagData(array $values, ?array &$addTagData, ?array &$removeTagData): array
+    {
+        $addTagData = $removeTagData = [];
+        foreach ($values as $id => $value) {
+            foreach ($value['tag-operations']['add'] as $tag => $tagId) {
+                $addTagData[$tagId][] = $id;
+            }
+
+            foreach ($value['tag-operations']['remove'] as $tag => $tagId) {
+                $removeTagData[$tagId][] = $id;
+            }
+
+            unset($values[$id]['tag-operations']);
+        }
+
+        return $values;
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/AdapterInterface.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/AdapterInterface.php
index 85fe0768..9e359e17 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/AdapterInterface.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/AdapterInterface.php
@@ -14,6 +14,9 @@ namespace Symfony\Component\Cache\Adapter;
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\CacheItem;
 
+// Help opcache.preload discover always-needed symbols
+class_exists(CacheItem::class);
+
 /**
  * Interface for adapters managing instances of Symfony's CacheItem.
  *
@@ -34,4 +37,13 @@ interface AdapterInterface extends CacheItemPoolInterface
      * @return \Traversable|CacheItem[]
      */
     public function getItems(array $keys = []);
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param string $prefix
+     *
+     * @return bool
+     */
+    public function clear(/* string $prefix = '' */);
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/ApcuAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/ApcuAdapter.php
index 50554ed6..7db39565 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/ApcuAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/ApcuAdapter.php
@@ -18,13 +18,9 @@ class ApcuAdapter extends AbstractAdapter
     use ApcuTrait;
 
     /**
-     * @param string      $namespace
-     * @param int         $defaultLifetime
-     * @param string|null $version
-     *
      * @throws CacheException if APCu is not enabled
      */
-    public function __construct($namespace = '', $defaultLifetime = 0, $version = null)
+    public function __construct(string $namespace = '', int $defaultLifetime = 0, string $version = null)
     {
         $this->init($namespace, $defaultLifetime, $version);
     }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/ArrayAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/ArrayAdapter.php
index 33f55a86..20043dec 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/ArrayAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/ArrayAdapter.php
@@ -16,11 +16,12 @@ use Psr\Log\LoggerAwareInterface;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\ResettableInterface;
 use Symfony\Component\Cache\Traits\ArrayTrait;
+use Symfony\Contracts\Cache\CacheInterface;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
-class ArrayAdapter implements AdapterInterface, LoggerAwareInterface, ResettableInterface
+class ArrayAdapter implements AdapterInterface, CacheInterface, LoggerAwareInterface, ResettableInterface
 {
     use ArrayTrait;
 
@@ -28,10 +29,9 @@ class ArrayAdapter implements AdapterInterface, LoggerAwareInterface, Resettable
     private $defaultLifetime;
 
     /**
-     * @param int  $defaultLifetime
      * @param bool $storeSerialized Disabling serialization can lead to cache corruptions when storing mutable values but increases performance otherwise
      */
-    public function __construct($defaultLifetime = 0, $storeSerialized = true)
+    public function __construct(int $defaultLifetime = 0, bool $storeSerialized = true)
     {
         $this->defaultLifetime = $defaultLifetime;
         $this->storeSerialized = $storeSerialized;
@@ -49,27 +49,35 @@ class ArrayAdapter implements AdapterInterface, LoggerAwareInterface, Resettable
         );
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
+    {
+        $item = $this->getItem($key);
+        $metadata = $item->getMetadata();
+
+        // ArrayAdapter works in memory, we don't care about stampede protection
+        if (\INF === $beta || !$item->isHit()) {
+            $save = true;
+            $item->set($callback($item, $save));
+            if ($save) {
+                $this->save($item);
+            }
+        }
+
+        return $item->get();
+    }
+
     /**
      * {@inheritdoc}
      */
     public function getItem($key)
     {
-        $isHit = $this->hasItem($key);
-        try {
-            if (!$isHit) {
-                $this->values[$key] = $value = null;
-            } elseif (!$this->storeSerialized) {
-                $value = $this->values[$key];
-            } elseif ('b:0;' === $value = $this->values[$key]) {
-                $value = false;
-            } elseif (false === $value = unserialize($value)) {
-                $this->values[$key] = $value = null;
-                $isHit = false;
-            }
-        } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to unserialize key "{key}"', ['key' => $key, 'exception' => $e]);
+        if (!$isHit = $this->hasItem($key)) {
             $this->values[$key] = $value = null;
-            $isHit = false;
+        } else {
+            $value = $this->storeSerialized ? $this->unfreeze($key, $isHit) : $this->values[$key];
         }
         $f = $this->createCacheItem;
 
@@ -82,14 +90,18 @@ class ArrayAdapter implements AdapterInterface, LoggerAwareInterface, Resettable
     public function getItems(array $keys = [])
     {
         foreach ($keys as $key) {
-            CacheItem::validateKey($key);
+            if (!\is_string($key) || !isset($this->expiries[$key])) {
+                CacheItem::validateKey($key);
+            }
         }
 
-        return $this->generateItems($keys, time(), $this->createCacheItem);
+        return $this->generateItems($keys, microtime(true), $this->createCacheItem);
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function deleteItems(array $keys)
     {
@@ -102,6 +114,8 @@ class ArrayAdapter implements AdapterInterface, LoggerAwareInterface, Resettable
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function save(CacheItemInterface $item)
     {
@@ -113,37 +127,32 @@ class ArrayAdapter implements AdapterInterface, LoggerAwareInterface, Resettable
         $value = $item["\0*\0value"];
         $expiry = $item["\0*\0expiry"];
 
-        if (0 === $expiry) {
-            $expiry = \PHP_INT_MAX;
-        }
+        if (null !== $expiry) {
+            if (!$expiry) {
+                $expiry = \PHP_INT_MAX;
+            } elseif ($expiry <= microtime(true)) {
+                $this->deleteItem($key);
 
-        if (null !== $expiry && $expiry <= time()) {
-            $this->deleteItem($key);
-
-            return true;
-        }
-        if ($this->storeSerialized) {
-            try {
-                $value = serialize($value);
-            } catch (\Exception $e) {
-                $type = \is_object($value) ? \get_class($value) : \gettype($value);
-                CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', ['key' => $key, 'type' => $type, 'exception' => $e]);
-
-                return false;
+                return true;
             }
         }
+        if ($this->storeSerialized && null === $value = $this->freeze($value, $key)) {
+            return false;
+        }
         if (null === $expiry && 0 < $this->defaultLifetime) {
-            $expiry = time() + $this->defaultLifetime;
+            $expiry = microtime(true) + $this->defaultLifetime;
         }
 
         $this->values[$key] = $value;
-        $this->expiries[$key] = null !== $expiry ? $expiry : \PHP_INT_MAX;
+        $this->expiries[$key] = $expiry ?? \PHP_INT_MAX;
 
         return true;
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function saveDeferred(CacheItemInterface $item)
     {
@@ -152,9 +161,19 @@ class ArrayAdapter implements AdapterInterface, LoggerAwareInterface, Resettable
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function commit()
     {
         return true;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function delete(string $key): bool
+    {
+        return $this->deleteItem($key);
+    }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/ChainAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/ChainAdapter.php
index fdb28846..57fb096b 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/ChainAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/ChainAdapter.php
@@ -17,6 +17,9 @@ use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\ResettableInterface;
+use Symfony\Component\Cache\Traits\ContractsTrait;
+use Symfony\Contracts\Cache\CacheInterface;
+use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * Chains several adapters together.
@@ -26,8 +29,10 @@ use Symfony\Component\Cache\ResettableInterface;
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableInterface
+class ChainAdapter implements AdapterInterface, CacheInterface, PruneableInterface, ResettableInterface
 {
+    use ContractsTrait;
+
     private $adapters = [];
     private $adapterCount;
     private $syncItem;
@@ -36,7 +41,7 @@ class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableIn
      * @param CacheItemPoolInterface[] $adapters        The ordered list of adapters used to fetch cached items
      * @param int                      $defaultLifetime The default lifetime of items propagated from lower adapters to upper ones
      */
-    public function __construct(array $adapters, $defaultLifetime = 0)
+    public function __construct(array $adapters, int $defaultLifetime = 0)
     {
         if (!$adapters) {
             throw new InvalidArgumentException('At least one adapter must be specified.');
@@ -46,7 +51,7 @@ class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableIn
             if (!$adapter instanceof CacheItemPoolInterface) {
                 throw new InvalidArgumentException(sprintf('The class "%s" does not implement the "%s" interface.', \get_class($adapter), CacheItemPoolInterface::class));
             }
-            if (\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) && $adapter instanceof ApcuAdapter && !filter_var(ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN)) {
+            if (\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) && $adapter instanceof ApcuAdapter && !filter_var(\ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN)) {
                 continue; // skip putting APCu in the chain when the backend is disabled
             }
 
@@ -59,11 +64,18 @@ class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableIn
         $this->adapterCount = \count($this->adapters);
 
         $this->syncItem = \Closure::bind(
-            static function ($sourceItem, $item) use ($defaultLifetime) {
+            static function ($sourceItem, $item, $sourceMetadata = null) use ($defaultLifetime) {
+                $sourceItem->isTaggable = false;
+                $sourceMetadata = $sourceMetadata ?? $sourceItem->metadata;
+                unset($sourceMetadata[CacheItem::METADATA_TAGS]);
+
                 $item->value = $sourceItem->value;
                 $item->isHit = $sourceItem->isHit;
+                $item->metadata = $item->newMetadata = $sourceItem->metadata = $sourceMetadata;
 
-                if (0 < $defaultLifetime) {
+                if (isset($item->metadata[CacheItem::METADATA_EXPIRY])) {
+                    $item->expiresAt(\DateTime::createFromFormat('U.u', sprintf('%.6F', $item->metadata[CacheItem::METADATA_EXPIRY])));
+                } elseif (0 < $defaultLifetime) {
                     $item->expiresAfter($defaultLifetime);
                 }
 
@@ -74,6 +86,43 @@ class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableIn
         );
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
+    {
+        $doSave = true;
+        $callback = static function (CacheItem $item, bool &$save) use ($callback, &$doSave) {
+            $value = $callback($item, $save);
+            $doSave = $save;
+
+            return $value;
+        };
+
+        $lastItem = null;
+        $i = 0;
+        $wrap = function (CacheItem $item = null, bool &$save = true) use ($key, $callback, $beta, &$wrap, &$i, &$doSave, &$lastItem, &$metadata) {
+            $adapter = $this->adapters[$i];
+            if (isset($this->adapters[++$i])) {
+                $callback = $wrap;
+                $beta = \INF === $beta ? \INF : 0;
+            }
+            if ($adapter instanceof CacheInterface) {
+                $value = $adapter->get($key, $callback, $beta, $metadata);
+            } else {
+                $value = $this->doGet($adapter, $key, $callback, $beta, $metadata);
+            }
+            if (null !== $item) {
+                ($this->syncItem)($lastItem = $lastItem ?? $item, $item, $metadata);
+            }
+            $save = $doSave;
+
+            return $value;
+        };
+
+        return $wrap();
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -107,12 +156,12 @@ class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableIn
         return $this->generateItems($this->adapters[0]->getItems($keys), 0);
     }
 
-    private function generateItems($items, $adapterIndex)
+    private function generateItems(iterable $items, int $adapterIndex)
     {
         $missing = [];
         $misses = [];
         $nextAdapterIndex = $adapterIndex + 1;
-        $nextAdapter = isset($this->adapters[$nextAdapterIndex]) ? $this->adapters[$nextAdapterIndex] : null;
+        $nextAdapter = $this->adapters[$nextAdapterIndex] ?? null;
 
         foreach ($items as $k => $item) {
             if (!$nextAdapter || $item->isHit()) {
@@ -140,6 +189,8 @@ class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableIn
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function hasItem($key)
     {
@@ -154,14 +205,23 @@ class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableIn
 
     /**
      * {@inheritdoc}
+     *
+     * @param string $prefix
+     *
+     * @return bool
      */
-    public function clear()
+    public function clear(/* string $prefix = '' */)
     {
+        $prefix = 0 < \func_num_args() ? (string) func_get_arg(0) : '';
         $cleared = true;
         $i = $this->adapterCount;
 
         while ($i--) {
-            $cleared = $this->adapters[$i]->clear() && $cleared;
+            if ($this->adapters[$i] instanceof AdapterInterface) {
+                $cleared = $this->adapters[$i]->clear($prefix) && $cleared;
+            } else {
+                $cleared = $this->adapters[$i]->clear() && $cleared;
+            }
         }
 
         return $cleared;
@@ -169,6 +229,8 @@ class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableIn
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function deleteItem($key)
     {
@@ -184,6 +246,8 @@ class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableIn
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function deleteItems(array $keys)
     {
@@ -199,6 +263,8 @@ class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableIn
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function save(CacheItemInterface $item)
     {
@@ -214,6 +280,8 @@ class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableIn
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function saveDeferred(CacheItemInterface $item)
     {
@@ -229,6 +297,8 @@ class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableIn
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function commit()
     {
@@ -264,7 +334,7 @@ class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableIn
     public function reset()
     {
         foreach ($this->adapters as $adapter) {
-            if ($adapter instanceof ResettableInterface) {
+            if ($adapter instanceof ResetInterface) {
                 $adapter->reset();
             }
         }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/DoctrineAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/DoctrineAdapter.php
index 8081d7dc..75ae4cb7 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/DoctrineAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/DoctrineAdapter.php
@@ -18,11 +18,7 @@ class DoctrineAdapter extends AbstractAdapter
 {
     use DoctrineTrait;
 
-    /**
-     * @param string $namespace
-     * @param int    $defaultLifetime
-     */
-    public function __construct(CacheProvider $provider, $namespace = '', $defaultLifetime = 0)
+    public function __construct(CacheProvider $provider, string $namespace = '', int $defaultLifetime = 0)
     {
         parent::__construct('', $defaultLifetime);
         $this->provider = $provider;
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/FilesystemAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/FilesystemAdapter.php
index d071964e..7185dd48 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/FilesystemAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/FilesystemAdapter.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Cache\Adapter;
 
+use Symfony\Component\Cache\Marshaller\DefaultMarshaller;
+use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\Traits\FilesystemTrait;
 
@@ -18,13 +20,9 @@ class FilesystemAdapter extends AbstractAdapter implements PruneableInterface
 {
     use FilesystemTrait;
 
-    /**
-     * @param string      $namespace
-     * @param int         $defaultLifetime
-     * @param string|null $directory
-     */
-    public function __construct($namespace = '', $defaultLifetime = 0, $directory = null)
+    public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, MarshallerInterface $marshaller = null)
     {
+        $this->marshaller = $marshaller ?? new DefaultMarshaller();
         parent::__construct('', $defaultLifetime);
         $this->init($namespace, $directory);
     }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/FilesystemTagAwareAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/FilesystemTagAwareAdapter.php
new file mode 100644
index 00000000..6dccbf08
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/FilesystemTagAwareAdapter.php
@@ -0,0 +1,239 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Adapter;
+
+use Symfony\Component\Cache\Marshaller\MarshallerInterface;
+use Symfony\Component\Cache\Marshaller\TagAwareMarshaller;
+use Symfony\Component\Cache\PruneableInterface;
+use Symfony\Component\Cache\Traits\FilesystemTrait;
+
+/**
+ * Stores tag id <> cache id relationship as a symlink, and lookup on invalidation calls.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ * @author André Rømcke <andre.romcke+symfony@gmail.com>
+ */
+class FilesystemTagAwareAdapter extends AbstractTagAwareAdapter implements PruneableInterface
+{
+    use FilesystemTrait {
+        doClear as private doClearCache;
+        doSave as private doSaveCache;
+    }
+
+    /**
+     * Folder used for tag symlinks.
+     */
+    private const TAG_FOLDER = 'tags';
+
+    public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, MarshallerInterface $marshaller = null)
+    {
+        $this->marshaller = new TagAwareMarshaller($marshaller);
+        parent::__construct('', $defaultLifetime);
+        $this->init($namespace, $directory);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doClear($namespace)
+    {
+        $ok = $this->doClearCache($namespace);
+
+        if ('' !== $namespace) {
+            return $ok;
+        }
+
+        set_error_handler(static function () {});
+        $chars = '+-ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+
+        try {
+            foreach ($this->scanHashDir($this->directory.self::TAG_FOLDER.\DIRECTORY_SEPARATOR) as $dir) {
+                if (rename($dir, $renamed = substr_replace($dir, bin2hex(random_bytes(4)), -8))) {
+                    $dir = $renamed.\DIRECTORY_SEPARATOR;
+                } else {
+                    $dir .= \DIRECTORY_SEPARATOR;
+                    $renamed = null;
+                }
+
+                for ($i = 0; $i < 38; ++$i) {
+                    if (!file_exists($dir.$chars[$i])) {
+                        continue;
+                    }
+                    for ($j = 0; $j < 38; ++$j) {
+                        if (!file_exists($d = $dir.$chars[$i].\DIRECTORY_SEPARATOR.$chars[$j])) {
+                            continue;
+                        }
+                        foreach (scandir($d, \SCANDIR_SORT_NONE) ?: [] as $link) {
+                            if ('.' !== $link && '..' !== $link && (null !== $renamed || !realpath($d.\DIRECTORY_SEPARATOR.$link))) {
+                                unlink($d.\DIRECTORY_SEPARATOR.$link);
+                            }
+                        }
+                        null === $renamed ?: rmdir($d);
+                    }
+                    null === $renamed ?: rmdir($dir.$chars[$i]);
+                }
+                null === $renamed ?: rmdir($renamed);
+            }
+        } finally {
+            restore_error_handler();
+        }
+
+        return $ok;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doSave(array $values, int $lifetime, array $addTagData = [], array $removeTagData = []): array
+    {
+        $failed = $this->doSaveCache($values, $lifetime);
+
+        // Add Tags as symlinks
+        foreach ($addTagData as $tagId => $ids) {
+            $tagFolder = $this->getTagFolder($tagId);
+            foreach ($ids as $id) {
+                if ($failed && \in_array($id, $failed, true)) {
+                    continue;
+                }
+
+                $file = $this->getFile($id);
+
+                if (!@symlink($file, $tagLink = $this->getFile($id, true, $tagFolder)) && !is_link($tagLink)) {
+                    @unlink($file);
+                    $failed[] = $id;
+                }
+            }
+        }
+
+        // Unlink removed Tags
+        foreach ($removeTagData as $tagId => $ids) {
+            $tagFolder = $this->getTagFolder($tagId);
+            foreach ($ids as $id) {
+                if ($failed && \in_array($id, $failed, true)) {
+                    continue;
+                }
+
+                @unlink($this->getFile($id, false, $tagFolder));
+            }
+        }
+
+        return $failed;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doDeleteYieldTags(array $ids): iterable
+    {
+        foreach ($ids as $id) {
+            $file = $this->getFile($id);
+            if (!file_exists($file) || !$h = @fopen($file, 'r')) {
+                continue;
+            }
+
+            if ((\PHP_VERSION_ID >= 70300 || '\\' !== \DIRECTORY_SEPARATOR) && !@unlink($file)) {
+                fclose($h);
+                continue;
+            }
+
+            $meta = explode("\n", fread($h, 4096), 3)[2] ?? '';
+
+            // detect the compact format used in marshall() using magic numbers in the form 9D-..-..-..-..-00-..-..-..-5F
+            if (13 < \strlen($meta) && "\x9D" === $meta[0] && "\0" === $meta[5] && "\x5F" === $meta[9]) {
+                $meta[9] = "\0";
+                $tagLen = unpack('Nlen', $meta, 9)['len'];
+                $meta = substr($meta, 13, $tagLen);
+
+                if (0 < $tagLen -= \strlen($meta)) {
+                    $meta .= fread($h, $tagLen);
+                }
+
+                try {
+                    yield $id => '' === $meta ? [] : $this->marshaller->unmarshall($meta);
+                } catch (\Exception $e) {
+                    yield $id => [];
+                }
+            }
+
+            fclose($h);
+
+            if (\PHP_VERSION_ID < 70300 && '\\' === \DIRECTORY_SEPARATOR) {
+                @unlink($file);
+            }
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doDeleteTagRelations(array $tagData): bool
+    {
+        foreach ($tagData as $tagId => $idList) {
+            $tagFolder = $this->getTagFolder($tagId);
+            foreach ($idList as $id) {
+                @unlink($this->getFile($id, false, $tagFolder));
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doInvalidate(array $tagIds): bool
+    {
+        foreach ($tagIds as $tagId) {
+            if (!file_exists($tagFolder = $this->getTagFolder($tagId))) {
+                continue;
+            }
+
+            set_error_handler(static function () {});
+
+            try {
+                if (rename($tagFolder, $renamed = substr_replace($tagFolder, bin2hex(random_bytes(4)), -9))) {
+                    $tagFolder = $renamed.\DIRECTORY_SEPARATOR;
+                } else {
+                    $renamed = null;
+                }
+
+                foreach ($this->scanHashDir($tagFolder) as $itemLink) {
+                    unlink(realpath($itemLink) ?: $itemLink);
+                    unlink($itemLink);
+                }
+
+                if (null === $renamed) {
+                    continue;
+                }
+
+                $chars = '+-ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+
+                for ($i = 0; $i < 38; ++$i) {
+                    for ($j = 0; $j < 38; ++$j) {
+                        rmdir($tagFolder.$chars[$i].\DIRECTORY_SEPARATOR.$chars[$j]);
+                    }
+                    rmdir($tagFolder.$chars[$i]);
+                }
+                rmdir($renamed);
+            } finally {
+                restore_error_handler();
+            }
+        }
+
+        return true;
+    }
+
+    private function getTagFolder(string $tagId): string
+    {
+        return $this->getFile($tagId, false, $this->directory.self::TAG_FOLDER.\DIRECTORY_SEPARATOR).\DIRECTORY_SEPARATOR;
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/MemcachedAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/MemcachedAdapter.php
index 5637141a..b678bb5d 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/MemcachedAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/MemcachedAdapter.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Cache\Adapter;
 
+use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 use Symfony\Component\Cache\Traits\MemcachedTrait;
 
 class MemcachedAdapter extends AbstractAdapter
@@ -29,8 +30,8 @@ class MemcachedAdapter extends AbstractAdapter
      *
      * Using a MemcachedAdapter as a pure items store is fine.
      */
-    public function __construct(\Memcached $client, $namespace = '', $defaultLifetime = 0)
+    public function __construct(\Memcached $client, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
     {
-        $this->init($client, $namespace, $defaultLifetime);
+        $this->init($client, $namespace, $defaultLifetime, $marshaller);
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/NullAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/NullAdapter.php
index c81a1cd6..3c2979bd 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/NullAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/NullAdapter.php
@@ -13,11 +13,12 @@ namespace Symfony\Component\Cache\Adapter;
 
 use Psr\Cache\CacheItemInterface;
 use Symfony\Component\Cache\CacheItem;
+use Symfony\Contracts\Cache\CacheInterface;
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
  */
-class NullAdapter implements AdapterInterface
+class NullAdapter implements AdapterInterface, CacheInterface
 {
     private $createCacheItem;
 
@@ -36,6 +37,16 @@ class NullAdapter implements AdapterInterface
         );
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
+    {
+        $save = true;
+
+        return $callback(($this->createCacheItem)($key), $save);
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -56,6 +67,8 @@ class NullAdapter implements AdapterInterface
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function hasItem($key)
     {
@@ -64,14 +77,20 @@ class NullAdapter implements AdapterInterface
 
     /**
      * {@inheritdoc}
+     *
+     * @param string $prefix
+     *
+     * @return bool
      */
-    public function clear()
+    public function clear(/* string $prefix = '' */)
     {
         return true;
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function deleteItem($key)
     {
@@ -80,6 +99,8 @@ class NullAdapter implements AdapterInterface
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function deleteItems(array $keys)
     {
@@ -88,26 +109,40 @@ class NullAdapter implements AdapterInterface
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function save(CacheItemInterface $item)
     {
-        return false;
+        return true;
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function saveDeferred(CacheItemInterface $item)
     {
-        return false;
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return bool
+     */
+    public function commit()
+    {
+        return true;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function commit()
+    public function delete(string $key): bool
     {
-        return false;
+        return $this->deleteItem($key);
     }
 
     private function generateItems(array $keys)
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/PdoAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/PdoAdapter.php
index 59038679..d118736a 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/PdoAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/PdoAdapter.php
@@ -13,6 +13,7 @@ namespace Symfony\Component\Cache\Adapter;
 
 use Doctrine\DBAL\Connection;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
+use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\Traits\PdoTrait;
 
@@ -27,6 +28,9 @@ class PdoAdapter extends AbstractAdapter implements PruneableInterface
      * a Doctrine DBAL Connection or a DSN string that will be used to
      * lazy-connect to the database when the cache is actually used.
      *
+     * When a Doctrine DBAL Connection is passed, the cache table is created
+     * automatically when possible. Otherwise, use the createTable() method.
+     *
      * List of available options:
      *  * db_table: The name of the table [default: cache_items]
      *  * db_id_col: The column where to store the cache id [default: item_id]
@@ -37,17 +41,14 @@ class PdoAdapter extends AbstractAdapter implements PruneableInterface
      *  * db_password: The password when lazy-connect [default: '']
      *  * db_connection_options: An array of driver-specific connection options [default: []]
      *
-     * @param \PDO|Connection|string $connOrDsn       A \PDO or Connection instance or DSN string or null
-     * @param string                 $namespace
-     * @param int                    $defaultLifetime
-     * @param array                  $options         An associative array of options
+     * @param \PDO|Connection|string $connOrDsn a \PDO or Connection instance or DSN string or null
      *
      * @throws InvalidArgumentException When first argument is not PDO nor Connection nor string
      * @throws InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION
      * @throws InvalidArgumentException When namespace contains invalid characters
      */
-    public function __construct($connOrDsn, $namespace = '', $defaultLifetime = 0, array $options = [])
+    public function __construct($connOrDsn, string $namespace = '', int $defaultLifetime = 0, array $options = [], MarshallerInterface $marshaller = null)
     {
-        $this->init($connOrDsn, $namespace, $defaultLifetime, $options);
+        $this->init($connOrDsn, $namespace, $defaultLifetime, $options, $marshaller);
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/PhpArrayAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/PhpArrayAdapter.php
index 47a259c1..bdce6e1a 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/PhpArrayAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/PhpArrayAdapter.php
@@ -17,7 +17,9 @@ use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\ResettableInterface;
+use Symfony\Component\Cache\Traits\ContractsTrait;
 use Symfony\Component\Cache\Traits\PhpArrayTrait;
+use Symfony\Contracts\Cache\CacheInterface;
 
 /**
  * Caches items at warm up time using a PHP array that is stored in shared memory by OPCache since PHP 7.0.
@@ -26,8 +28,9 @@ use Symfony\Component\Cache\Traits\PhpArrayTrait;
  * @author Titouan Galopin <galopintitouan@gmail.com>
  * @author Nicolas Grekas <p@tchwork.com>
  */
-class PhpArrayAdapter implements AdapterInterface, PruneableInterface, ResettableInterface
+class PhpArrayAdapter implements AdapterInterface, CacheInterface, PruneableInterface, ResettableInterface
 {
+    use ContractsTrait;
     use PhpArrayTrait;
 
     private $createCacheItem;
@@ -36,11 +39,10 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
      * @param string           $file         The PHP file were values are cached
      * @param AdapterInterface $fallbackPool A pool to fallback on when an item is not hit
      */
-    public function __construct($file, AdapterInterface $fallbackPool)
+    public function __construct(string $file, AdapterInterface $fallbackPool)
     {
         $this->file = $file;
         $this->pool = $fallbackPool;
-        $this->zendDetectUnicode = filter_var(ini_get('zend.detect_unicode'), \FILTER_VALIDATE_BOOLEAN);
         $this->createCacheItem = \Closure::bind(
             static function ($key, $value, $isHit) {
                 $item = new CacheItem();
@@ -56,9 +58,7 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
     }
 
     /**
-     * This adapter should only be used on PHP 7.0+ to take advantage of how PHP
-     * stores arrays in its latest versions. This factory method decorates the given
-     * fallback pool with this adapter only if the current PHP version is supported.
+     * This adapter takes advantage of how PHP stores arrays in its latest versions.
      *
      * @param string                 $file         The PHP file were values are cached
      * @param CacheItemPoolInterface $fallbackPool A pool to fallback on when an item is not hit
@@ -67,15 +67,44 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
      */
     public static function create($file, CacheItemPoolInterface $fallbackPool)
     {
-        if (\PHP_VERSION_ID >= 70000) {
-            if (!$fallbackPool instanceof AdapterInterface) {
-                $fallbackPool = new ProxyAdapter($fallbackPool);
-            }
-
-            return new static($file, $fallbackPool);
+        if (!$fallbackPool instanceof AdapterInterface) {
+            $fallbackPool = new ProxyAdapter($fallbackPool);
         }
 
-        return $fallbackPool;
+        return new static($file, $fallbackPool);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
+    {
+        if (null === $this->values) {
+            $this->initialize();
+        }
+        if (!isset($this->keys[$key])) {
+            get_from_pool:
+            if ($this->pool instanceof CacheInterface) {
+                return $this->pool->get($key, $callback, $beta, $metadata);
+            }
+
+            return $this->doGet($this->pool, $key, $callback, $beta, $metadata);
+        }
+        $value = $this->values[$this->keys[$key]];
+
+        if ('N;' === $value) {
+            return null;
+        }
+        try {
+            if ($value instanceof \Closure) {
+                return $value();
+            }
+        } catch (\Throwable $e) {
+            unset($this->keys[$key]);
+            goto get_from_pool;
+        }
+
+        return $value;
     }
 
     /**
@@ -89,23 +118,19 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
         if (null === $this->values) {
             $this->initialize();
         }
-        if (!isset($this->values[$key])) {
+        if (!isset($this->keys[$key])) {
             return $this->pool->getItem($key);
         }
 
-        $value = $this->values[$key];
+        $value = $this->values[$this->keys[$key]];
         $isHit = true;
 
         if ('N;' === $value) {
             $value = null;
-        } elseif (\is_string($value) && isset($value[2]) && ':' === $value[1]) {
+        } elseif ($value instanceof \Closure) {
             try {
-                $e = null;
-                $value = unserialize($value);
-            } catch (\Error $e) {
-            } catch (\Exception $e) {
-            }
-            if (null !== $e) {
+                $value = $value();
+            } catch (\Throwable $e) {
                 $value = null;
                 $isHit = false;
             }
@@ -135,6 +160,8 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function hasItem($key)
     {
@@ -145,11 +172,13 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
             $this->initialize();
         }
 
-        return isset($this->values[$key]) || $this->pool->hasItem($key);
+        return isset($this->keys[$key]) || $this->pool->hasItem($key);
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function deleteItem($key)
     {
@@ -160,11 +189,13 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
             $this->initialize();
         }
 
-        return !isset($this->values[$key]) && $this->pool->deleteItem($key);
+        return !isset($this->keys[$key]) && $this->pool->deleteItem($key);
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function deleteItems(array $keys)
     {
@@ -176,7 +207,7 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
                 throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
             }
 
-            if (isset($this->values[$key])) {
+            if (isset($this->keys[$key])) {
                 $deleted = false;
             } else {
                 $fallbackKeys[] = $key;
@@ -195,6 +226,8 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function save(CacheItemInterface $item)
     {
@@ -202,11 +235,13 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
             $this->initialize();
         }
 
-        return !isset($this->values[$item->getKey()]) && $this->pool->save($item);
+        return !isset($this->keys[$item->getKey()]) && $this->pool->save($item);
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function saveDeferred(CacheItemInterface $item)
     {
@@ -214,37 +249,34 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
             $this->initialize();
         }
 
-        return !isset($this->values[$item->getKey()]) && $this->pool->saveDeferred($item);
+        return !isset($this->keys[$item->getKey()]) && $this->pool->saveDeferred($item);
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function commit()
     {
         return $this->pool->commit();
     }
 
-    /**
-     * @return \Generator
-     */
-    private function generateItems(array $keys)
+    private function generateItems(array $keys): \Generator
     {
         $f = $this->createCacheItem;
         $fallbackKeys = [];
 
         foreach ($keys as $key) {
-            if (isset($this->values[$key])) {
-                $value = $this->values[$key];
+            if (isset($this->keys[$key])) {
+                $value = $this->values[$this->keys[$key]];
 
                 if ('N;' === $value) {
                     yield $key => $f($key, null, true);
-                } elseif (\is_string($value) && isset($value[2]) && ':' === $value[1]) {
+                } elseif ($value instanceof \Closure) {
                     try {
-                        yield $key => $f($key, unserialize($value), true);
-                    } catch (\Error $e) {
-                        yield $key => $f($key, null, false);
-                    } catch (\Exception $e) {
+                        yield $key => $f($key, $value(), true);
+                    } catch (\Throwable $e) {
                         yield $key => $f($key, null, false);
                     }
                 } else {
@@ -256,9 +288,7 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
         }
 
         if ($fallbackKeys) {
-            foreach ($this->pool->getItems($fallbackKeys) as $key => $item) {
-                yield $key => $item;
-            }
+            yield from $this->pool->getItems($fallbackKeys);
         }
     }
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/PhpFilesAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/PhpFilesAdapter.php
index b56143c2..10938a0a 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/PhpFilesAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/PhpFilesAdapter.php
@@ -20,22 +20,19 @@ class PhpFilesAdapter extends AbstractAdapter implements PruneableInterface
     use PhpFilesTrait;
 
     /**
-     * @param string      $namespace
-     * @param int         $defaultLifetime
-     * @param string|null $directory
+     * @param $appendOnly Set to `true` to gain extra performance when the items stored in this pool never expire.
+     *                    Doing so is encouraged because it fits perfectly OPcache's memory model.
      *
      * @throws CacheException if OPcache is not enabled
      */
-    public function __construct($namespace = '', $defaultLifetime = 0, $directory = null)
+    public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, bool $appendOnly = false)
     {
-        if (!static::isSupported()) {
-            throw new CacheException('OPcache is not enabled.');
-        }
+        $this->appendOnly = $appendOnly;
+        self::$startTime = self::$startTime ?? $_SERVER['REQUEST_TIME'] ?? time();
         parent::__construct('', $defaultLifetime);
         $this->init($namespace, $directory);
-
-        $e = new \Exception();
-        $this->includeHandler = function () use ($e) { throw $e; };
-        $this->zendDetectUnicode = filter_var(ini_get('zend.detect_unicode'), \FILTER_VALIDATE_BOOLEAN);
+        $this->includeHandler = static function ($type, $msg, $file, $line) {
+            throw new \ErrorException($msg, 0, $type, $file, $line);
+        };
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/ProxyAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/ProxyAdapter.php
index c89a760e..e006ea01 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/ProxyAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/ProxyAdapter.php
@@ -16,26 +16,26 @@ use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\ResettableInterface;
+use Symfony\Component\Cache\Traits\ContractsTrait;
 use Symfony\Component\Cache\Traits\ProxyTrait;
+use Symfony\Contracts\Cache\CacheInterface;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
-class ProxyAdapter implements AdapterInterface, PruneableInterface, ResettableInterface
+class ProxyAdapter implements AdapterInterface, CacheInterface, PruneableInterface, ResettableInterface
 {
+    use ContractsTrait;
     use ProxyTrait;
 
     private $namespace;
     private $namespaceLen;
     private $createCacheItem;
+    private $setInnerItem;
     private $poolHash;
     private $defaultLifetime;
 
-    /**
-     * @param string $namespace
-     * @param int    $defaultLifetime
-     */
-    public function __construct(CacheItemPoolInterface $pool, $namespace = '', $defaultLifetime = 0)
+    public function __construct(CacheItemPoolInterface $pool, string $namespace = '', int $defaultLifetime = 0)
     {
         $this->pool = $pool;
         $this->poolHash = $poolHash = spl_object_hash($pool);
@@ -46,20 +46,71 @@ class ProxyAdapter implements AdapterInterface, PruneableInterface, ResettableIn
             static function ($key, $innerItem) use ($poolHash) {
                 $item = new CacheItem();
                 $item->key = $key;
+
+                if (null === $innerItem) {
+                    return $item;
+                }
+
+                $item->value = $v = $innerItem->get();
+                $item->isHit = $innerItem->isHit();
+                $item->innerItem = $innerItem;
                 $item->poolHash = $poolHash;
 
-                if (null !== $innerItem) {
-                    $item->value = $innerItem->get();
-                    $item->isHit = $innerItem->isHit();
-                    $item->innerItem = $innerItem;
-                    $innerItem->set(null);
+                // Detect wrapped values that encode for their expiry and creation duration
+                // For compactness, these values are packed in the key of an array using
+                // magic numbers in the form 9D-..-..-..-..-00-..-..-..-5F
+                if (\is_array($v) && 1 === \count($v) && 10 === \strlen($k = (string) array_key_first($v)) && "\x9D" === $k[0] && "\0" === $k[5] && "\x5F" === $k[9]) {
+                    $item->value = $v[$k];
+                    $v = unpack('Ve/Nc', substr($k, 1, -1));
+                    $item->metadata[CacheItem::METADATA_EXPIRY] = $v['e'] + CacheItem::METADATA_EXPIRY_OFFSET;
+                    $item->metadata[CacheItem::METADATA_CTIME] = $v['c'];
+                } elseif ($innerItem instanceof CacheItem) {
+                    $item->metadata = $innerItem->metadata;
                 }
+                $innerItem->set(null);
 
                 return $item;
             },
             null,
             CacheItem::class
         );
+        $this->setInnerItem = \Closure::bind(
+            /**
+             * @param array $item A CacheItem cast to (array); accessing protected properties requires adding the "\0*\0" PHP prefix
+             */
+            static function (CacheItemInterface $innerItem, array $item) {
+                // Tags are stored separately, no need to account for them when considering this item's newly set metadata
+                if (isset(($metadata = $item["\0*\0newMetadata"])[CacheItem::METADATA_TAGS])) {
+                    unset($metadata[CacheItem::METADATA_TAGS]);
+                }
+                if ($metadata) {
+                    // For compactness, expiry and creation duration are packed in the key of an array, using magic numbers as separators
+                    $item["\0*\0value"] = ["\x9D".pack('VN', (int) (0.1 + $metadata[self::METADATA_EXPIRY] - self::METADATA_EXPIRY_OFFSET), $metadata[self::METADATA_CTIME])."\x5F" => $item["\0*\0value"]];
+                }
+                $innerItem->set($item["\0*\0value"]);
+                $innerItem->expiresAt(null !== $item["\0*\0expiry"] ? \DateTime::createFromFormat('U.u', sprintf('%.6F', $item["\0*\0expiry"])) : null);
+            },
+            null,
+            CacheItem::class
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
+    {
+        if (!$this->pool instanceof CacheInterface) {
+            return $this->doGet($this, $key, $callback, $beta, $metadata);
+        }
+
+        return $this->pool->get($this->getId($key), function ($innerItem, bool &$save) use ($key, $callback) {
+            $item = ($this->createCacheItem)($key, $innerItem);
+            $item->set($value = $callback($item, $save));
+            ($this->setInnerItem)($innerItem, (array) $item);
+
+            return $value;
+        }, $beta, $metadata);
     }
 
     /**
@@ -89,6 +140,8 @@ class ProxyAdapter implements AdapterInterface, PruneableInterface, ResettableIn
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function hasItem($key)
     {
@@ -97,14 +150,26 @@ class ProxyAdapter implements AdapterInterface, PruneableInterface, ResettableIn
 
     /**
      * {@inheritdoc}
+     *
+     * @param string $prefix
+     *
+     * @return bool
      */
-    public function clear()
+    public function clear(/* string $prefix = '' */)
     {
+        $prefix = 0 < \func_num_args() ? (string) func_get_arg(0) : '';
+
+        if ($this->pool instanceof AdapterInterface) {
+            return $this->pool->clear($this->namespace.$prefix);
+        }
+
         return $this->pool->clear();
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function deleteItem($key)
     {
@@ -113,6 +178,8 @@ class ProxyAdapter implements AdapterInterface, PruneableInterface, ResettableIn
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function deleteItems(array $keys)
     {
@@ -127,6 +194,8 @@ class ProxyAdapter implements AdapterInterface, PruneableInterface, ResettableIn
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function save(CacheItemInterface $item)
     {
@@ -135,6 +204,8 @@ class ProxyAdapter implements AdapterInterface, PruneableInterface, ResettableIn
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function saveDeferred(CacheItemInterface $item)
     {
@@ -143,21 +214,22 @@ class ProxyAdapter implements AdapterInterface, PruneableInterface, ResettableIn
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function commit()
     {
         return $this->pool->commit();
     }
 
-    private function doSave(CacheItemInterface $item, $method)
+    private function doSave(CacheItemInterface $item, string $method)
     {
         if (!$item instanceof CacheItem) {
             return false;
         }
         $item = (array) $item;
-        $expiry = $item["\0*\0expiry"];
-        if (null === $expiry && 0 < $this->defaultLifetime) {
-            $expiry = time() + $this->defaultLifetime;
+        if (null === $item["\0*\0expiry"] && 0 < $this->defaultLifetime) {
+            $item["\0*\0expiry"] = microtime(true) + $this->defaultLifetime;
         }
 
         if ($item["\0*\0poolHash"] === $this->poolHash && $item["\0*\0innerItem"]) {
@@ -171,13 +243,12 @@ class ProxyAdapter implements AdapterInterface, PruneableInterface, ResettableIn
             $innerItem = $this->pool->getItem($this->namespace.$item["\0*\0key"]);
         }
 
-        $innerItem->set($item["\0*\0value"]);
-        $innerItem->expiresAt(null !== $expiry ? \DateTime::createFromFormat('U', $expiry) : null);
+        ($this->setInnerItem)($innerItem, $item);
 
         return $this->pool->$method($innerItem);
     }
 
-    private function generateItems($items)
+    private function generateItems(iterable $items)
     {
         $f = $this->createCacheItem;
 
@@ -190,7 +261,7 @@ class ProxyAdapter implements AdapterInterface, PruneableInterface, ResettableIn
         }
     }
 
-    private function getId($key)
+    private function getId($key): string
     {
         CacheItem::validateKey($key);
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/Psr16Adapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/Psr16Adapter.php
new file mode 100644
index 00000000..e959d784
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/Psr16Adapter.php
@@ -0,0 +1,86 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Adapter;
+
+use Psr\SimpleCache\CacheInterface;
+use Symfony\Component\Cache\PruneableInterface;
+use Symfony\Component\Cache\ResettableInterface;
+use Symfony\Component\Cache\Traits\ProxyTrait;
+
+/**
+ * Turns a PSR-16 cache into a PSR-6 one.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class Psr16Adapter extends AbstractAdapter implements PruneableInterface, ResettableInterface
+{
+    use ProxyTrait;
+
+    /**
+     * @internal
+     */
+    protected const NS_SEPARATOR = '_';
+
+    private $miss;
+
+    public function __construct(CacheInterface $pool, string $namespace = '', int $defaultLifetime = 0)
+    {
+        parent::__construct($namespace, $defaultLifetime);
+
+        $this->pool = $pool;
+        $this->miss = new \stdClass();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFetch(array $ids)
+    {
+        foreach ($this->pool->getMultiple($ids, $this->miss) as $key => $value) {
+            if ($this->miss !== $value) {
+                yield $key => $value;
+            }
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doHave($id)
+    {
+        return $this->pool->has($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doClear($namespace)
+    {
+        return $this->pool->clear();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doDelete(array $ids)
+    {
+        return $this->pool->deleteMultiple($ids);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doSave(array $values, int $lifetime)
+    {
+        return $this->pool->setMultiple($values, 0 === $lifetime ? null : $lifetime);
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/RedisAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/RedisAdapter.php
index c1e17997..eb5950e5 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/RedisAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/RedisAdapter.php
@@ -11,6 +11,9 @@
 
 namespace Symfony\Component\Cache\Adapter;
 
+use Symfony\Component\Cache\Marshaller\MarshallerInterface;
+use Symfony\Component\Cache\Traits\RedisClusterProxy;
+use Symfony\Component\Cache\Traits\RedisProxy;
 use Symfony\Component\Cache\Traits\RedisTrait;
 
 class RedisAdapter extends AbstractAdapter
@@ -18,12 +21,12 @@ class RedisAdapter extends AbstractAdapter
     use RedisTrait;
 
     /**
-     * @param \Redis|\RedisArray|\RedisCluster|\Predis\Client $redisClient     The redis client
-     * @param string                                          $namespace       The default namespace
-     * @param int                                             $defaultLifetime The default lifetime
+     * @param \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy|RedisClusterProxy $redis           The redis client
+     * @param string                                                                                $namespace       The default namespace
+     * @param int                                                                                   $defaultLifetime The default lifetime
      */
-    public function __construct($redisClient, $namespace = '', $defaultLifetime = 0)
+    public function __construct($redis, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
     {
-        $this->init($redisClient, $namespace, $defaultLifetime);
+        $this->init($redis, $namespace, $defaultLifetime, $marshaller);
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/RedisTagAwareAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/RedisTagAwareAdapter.php
new file mode 100644
index 00000000..fd263da3
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/RedisTagAwareAdapter.php
@@ -0,0 +1,321 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Adapter;
+
+use Predis\Connection\Aggregate\ClusterInterface;
+use Predis\Connection\Aggregate\PredisCluster;
+use Predis\Connection\Aggregate\ReplicationInterface;
+use Predis\Response\ErrorInterface;
+use Predis\Response\Status;
+use Symfony\Component\Cache\CacheItem;
+use Symfony\Component\Cache\Exception\InvalidArgumentException;
+use Symfony\Component\Cache\Exception\LogicException;
+use Symfony\Component\Cache\Marshaller\DeflateMarshaller;
+use Symfony\Component\Cache\Marshaller\MarshallerInterface;
+use Symfony\Component\Cache\Marshaller\TagAwareMarshaller;
+use Symfony\Component\Cache\Traits\RedisClusterProxy;
+use Symfony\Component\Cache\Traits\RedisProxy;
+use Symfony\Component\Cache\Traits\RedisTrait;
+
+/**
+ * Stores tag id <> cache id relationship as a Redis Set.
+ *
+ * Set (tag relation info) is stored without expiry (non-volatile), while cache always gets an expiry (volatile) even
+ * if not set by caller. Thus if you configure redis with the right eviction policy you can be safe this tag <> cache
+ * relationship survives eviction (cache cleanup when Redis runs out of memory).
+ *
+ * Redis server 2.8+ with any `volatile-*` eviction policy, OR `noeviction` if you're sure memory will NEVER fill up
+ *
+ * Design limitations:
+ *  - Max 4 billion cache keys per cache tag as limited by Redis Set datatype.
+ *    E.g. If you use a "all" items tag for expiry instead of clear(), that limits you to 4 billion cache items also.
+ *
+ * @see https://redis.io/topics/lru-cache#eviction-policies Documentation for Redis eviction policies.
+ * @see https://redis.io/topics/data-types#sets Documentation for Redis Set datatype.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ * @author André Rømcke <andre.romcke+symfony@gmail.com>
+ */
+class RedisTagAwareAdapter extends AbstractTagAwareAdapter
+{
+    use RedisTrait;
+
+    /**
+     * On cache items without a lifetime set, we set it to 100 days. This is to make sure cache items are
+     * preferred to be evicted over tag Sets, if eviction policy is configured according to requirements.
+     */
+    private const DEFAULT_CACHE_TTL = 8640000;
+
+    /**
+     * @var string|null detected eviction policy used on Redis server
+     */
+    private $redisEvictionPolicy;
+    private $namespace;
+
+    /**
+     * @param \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy|RedisClusterProxy $redis           The redis client
+     * @param string                                                                                $namespace       The default namespace
+     * @param int                                                                                   $defaultLifetime The default lifetime
+     */
+    public function __construct($redis, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
+    {
+        if ($redis instanceof \Predis\ClientInterface && $redis->getConnection() instanceof ClusterInterface && !$redis->getConnection() instanceof PredisCluster) {
+            throw new InvalidArgumentException(sprintf('Unsupported Predis cluster connection: only "%s" is, "%s" given.', PredisCluster::class, \get_class($redis->getConnection())));
+        }
+
+        if (\defined('Redis::OPT_COMPRESSION') && ($redis instanceof \Redis || $redis instanceof \RedisArray || $redis instanceof \RedisCluster)) {
+            $compression = $redis->getOption(\Redis::OPT_COMPRESSION);
+
+            foreach (\is_array($compression) ? $compression : [$compression] as $c) {
+                if (\Redis::COMPRESSION_NONE !== $c) {
+                    throw new InvalidArgumentException(sprintf('phpredis compression must be disabled when using "%s", use "%s" instead.', static::class, DeflateMarshaller::class));
+                }
+            }
+        }
+
+        $this->init($redis, $namespace, $defaultLifetime, new TagAwareMarshaller($marshaller));
+        $this->namespace = $namespace;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doSave(array $values, int $lifetime, array $addTagData = [], array $delTagData = []): array
+    {
+        $eviction = $this->getRedisEvictionPolicy();
+        if ('noeviction' !== $eviction && !str_starts_with($eviction, 'volatile-')) {
+            throw new LogicException(sprintf('Redis maxmemory-policy setting "%s" is *not* supported by RedisTagAwareAdapter, use "noeviction" or "volatile-*" eviction policies.', $eviction));
+        }
+
+        // serialize values
+        if (!$serialized = $this->marshaller->marshall($values, $failed)) {
+            return $failed;
+        }
+
+        // While pipeline isn't supported on RedisCluster, other setups will at least benefit from doing this in one op
+        $results = $this->pipeline(static function () use ($serialized, $lifetime, $addTagData, $delTagData, $failed) {
+            // Store cache items, force a ttl if none is set, as there is no MSETEX we need to set each one
+            foreach ($serialized as $id => $value) {
+                yield 'setEx' => [
+                    $id,
+                    0 >= $lifetime ? self::DEFAULT_CACHE_TTL : $lifetime,
+                    $value,
+                ];
+            }
+
+            // Add and Remove Tags
+            foreach ($addTagData as $tagId => $ids) {
+                if (!$failed || $ids = array_diff($ids, $failed)) {
+                    yield 'sAdd' => array_merge([$tagId], $ids);
+                }
+            }
+
+            foreach ($delTagData as $tagId => $ids) {
+                if (!$failed || $ids = array_diff($ids, $failed)) {
+                    yield 'sRem' => array_merge([$tagId], $ids);
+                }
+            }
+        });
+
+        foreach ($results as $id => $result) {
+            // Skip results of SADD/SREM operations, they'll be 1 or 0 depending on if set value already existed or not
+            if (is_numeric($result)) {
+                continue;
+            }
+            // setEx results
+            if (true !== $result && (!$result instanceof Status || Status::get('OK') !== $result)) {
+                $failed[] = $id;
+            }
+        }
+
+        return $failed;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doDeleteYieldTags(array $ids): iterable
+    {
+        $lua = <<<'EOLUA'
+            local v = redis.call('GET', KEYS[1])
+            redis.call('DEL', KEYS[1])
+
+            if not v or v:len() <= 13 or v:byte(1) ~= 0x9D or v:byte(6) ~= 0 or v:byte(10) ~= 0x5F then
+                return ''
+            end
+
+            return v:sub(14, 13 + v:byte(13) + v:byte(12) * 256 + v:byte(11) * 65536)
+EOLUA;
+
+        $results = $this->pipeline(function () use ($ids, $lua) {
+            foreach ($ids as $id) {
+                yield 'eval' => $this->redis instanceof \Predis\ClientInterface ? [$lua, 1, $id] : [$lua, [$id], 1];
+            }
+        });
+
+        foreach ($results as $id => $result) {
+            if ($result instanceof \RedisException || $result instanceof ErrorInterface) {
+                CacheItem::log($this->logger, 'Failed to delete key "{key}": '.$result->getMessage(), ['key' => substr($id, \strlen($this->namespace)), 'exception' => $result]);
+
+                continue;
+            }
+
+            try {
+                yield $id => !\is_string($result) || '' === $result ? [] : $this->marshaller->unmarshall($result);
+            } catch (\Exception $e) {
+                yield $id => [];
+            }
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doDeleteTagRelations(array $tagData): bool
+    {
+        $results = $this->pipeline(static function () use ($tagData) {
+            foreach ($tagData as $tagId => $idList) {
+                array_unshift($idList, $tagId);
+                yield 'sRem' => $idList;
+            }
+        });
+        foreach ($results as $result) {
+            // no-op
+        }
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doInvalidate(array $tagIds): bool
+    {
+        // This script scans the set of items linked to tag: it empties the set
+        // and removes the linked items. When the set is still not empty after
+        // the scan, it means we're in cluster mode and that the linked items
+        // are on other nodes: we move the links to a temporary set and we
+        // garbage collect that set from the client side.
+
+        $lua = <<<'EOLUA'
+            redis.replicate_commands()
+
+            local cursor = '0'
+            local id = KEYS[1]
+            repeat
+                local result = redis.call('SSCAN', id, cursor, 'COUNT', 5000);
+                cursor = result[1];
+                local rems = {}
+
+                for _, v in ipairs(result[2]) do
+                    local ok, _ = pcall(redis.call, 'DEL', ARGV[1]..v)
+                    if ok then
+                        table.insert(rems, v)
+                    end
+                end
+                if 0 < #rems then
+                    redis.call('SREM', id, unpack(rems))
+                end
+            until '0' == cursor;
+
+            redis.call('SUNIONSTORE', '{'..id..'}'..id, id)
+            redis.call('DEL', id)
+
+            return redis.call('SSCAN', '{'..id..'}'..id, '0', 'COUNT', 5000)
+EOLUA;
+
+        $results = $this->pipeline(function () use ($tagIds, $lua) {
+            if ($this->redis instanceof \Predis\ClientInterface) {
+                $prefix = $this->redis->getOptions()->prefix ? $this->redis->getOptions()->prefix->getPrefix() : '';
+            } elseif (\is_array($prefix = $this->redis->getOption(\Redis::OPT_PREFIX) ?? '')) {
+                $prefix = current($prefix);
+            }
+
+            foreach ($tagIds as $id) {
+                yield 'eval' => $this->redis instanceof \Predis\ClientInterface ? [$lua, 1, $id, $prefix] : [$lua, [$id, $prefix], 1];
+            }
+        });
+
+        $lua = <<<'EOLUA'
+            redis.replicate_commands()
+
+            local id = KEYS[1]
+            local cursor = table.remove(ARGV)
+            redis.call('SREM', '{'..id..'}'..id, unpack(ARGV))
+
+            return redis.call('SSCAN', '{'..id..'}'..id, cursor, 'COUNT', 5000)
+EOLUA;
+
+        $success = true;
+        foreach ($results as $id => $values) {
+            if ($values instanceof \RedisException || $values instanceof ErrorInterface) {
+                CacheItem::log($this->logger, 'Failed to invalidate key "{key}": '.$values->getMessage(), ['key' => substr($id, \strlen($this->namespace)), 'exception' => $values]);
+                $success = false;
+
+                continue;
+            }
+
+            [$cursor, $ids] = $values;
+
+            while ($ids || '0' !== $cursor) {
+                $this->doDelete($ids);
+
+                $evalArgs = [$id, $cursor];
+                array_splice($evalArgs, 1, 0, $ids);
+
+                if ($this->redis instanceof \Predis\ClientInterface) {
+                    array_unshift($evalArgs, $lua, 1);
+                } else {
+                    $evalArgs = [$lua, $evalArgs, 1];
+                }
+
+                $results = $this->pipeline(function () use ($evalArgs) {
+                    yield 'eval' => $evalArgs;
+                });
+
+                foreach ($results as [$cursor, $ids]) {
+                    // no-op
+                }
+            }
+        }
+
+        return $success;
+    }
+
+    private function getRedisEvictionPolicy(): string
+    {
+        if (null !== $this->redisEvictionPolicy) {
+            return $this->redisEvictionPolicy;
+        }
+
+        $hosts = $this->getHosts();
+        $host = reset($hosts);
+        if ($host instanceof \Predis\Client && $host->getConnection() instanceof ReplicationInterface) {
+            // Predis supports info command only on the master in replication environments
+            $hosts = [$host->getClientFor('master')];
+        }
+
+        foreach ($hosts as $host) {
+            $info = $host->info('Memory');
+
+            if ($info instanceof ErrorInterface) {
+                continue;
+            }
+
+            $info = $info['Memory'] ?? $info;
+
+            return $this->redisEvictionPolicy = $info['maxmemory_policy'];
+        }
+
+        return $this->redisEvictionPolicy = '';
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/SimpleCacheAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/SimpleCacheAdapter.php
index d3d0ede6..5f14a85b 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/SimpleCacheAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/SimpleCacheAdapter.php
@@ -11,73 +11,11 @@
 
 namespace Symfony\Component\Cache\Adapter;
 
-use Psr\SimpleCache\CacheInterface;
-use Symfony\Component\Cache\PruneableInterface;
-use Symfony\Component\Cache\Traits\ProxyTrait;
+@trigger_error(sprintf('The "%s" class is @deprecated since Symfony 4.3, use "Psr16Adapter" instead.', SimpleCacheAdapter::class), \E_USER_DEPRECATED);
 
 /**
- * @author Nicolas Grekas <p@tchwork.com>
+ * @deprecated since Symfony 4.3, use Psr16Adapter instead.
  */
-class SimpleCacheAdapter extends AbstractAdapter implements PruneableInterface
+class SimpleCacheAdapter extends Psr16Adapter
 {
-    /**
-     * @internal
-     */
-    const NS_SEPARATOR = '_';
-
-    use ProxyTrait;
-
-    private $miss;
-
-    public function __construct(CacheInterface $pool, $namespace = '', $defaultLifetime = 0)
-    {
-        parent::__construct($namespace, $defaultLifetime);
-
-        $this->pool = $pool;
-        $this->miss = new \stdClass();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch(array $ids)
-    {
-        foreach ($this->pool->getMultiple($ids, $this->miss) as $key => $value) {
-            if ($this->miss !== $value) {
-                yield $key => $value;
-            }
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doHave($id)
-    {
-        return $this->pool->has($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doClear($namespace)
-    {
-        return $this->pool->clear();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete(array $ids)
-    {
-        return $this->pool->deleteMultiple($ids);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave(array $values, $lifetime)
-    {
-        return $this->pool->setMultiple($values, 0 === $lifetime ? null : $lifetime);
-    }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/TagAwareAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/TagAwareAdapter.php
index febe5090..105d4a64 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/TagAwareAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/TagAwareAdapter.php
@@ -13,20 +13,26 @@ namespace Symfony\Component\Cache\Adapter;
 
 use Psr\Cache\CacheItemInterface;
 use Psr\Cache\InvalidArgumentException;
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LoggerAwareTrait;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\ResettableInterface;
+use Symfony\Component\Cache\Traits\ContractsTrait;
 use Symfony\Component\Cache\Traits\ProxyTrait;
+use Symfony\Contracts\Cache\TagAwareCacheInterface;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
-class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, ResettableInterface
+class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterface, PruneableInterface, ResettableInterface, LoggerAwareInterface
 {
-    const TAGS_PREFIX = "\0tags\0";
-
+    use ContractsTrait;
+    use LoggerAwareTrait;
     use ProxyTrait;
 
+    public const TAGS_PREFIX = "\0tags\0";
+
     private $deferred = [];
     private $createCacheItem;
     private $setCacheItemTags;
@@ -36,7 +42,7 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
     private $knownTagVersions = [];
     private $knownTagVersionsTtl;
 
-    public function __construct(AdapterInterface $itemsPool, AdapterInterface $tagsPool = null, $knownTagVersionsTtl = 0.15)
+    public function __construct(AdapterInterface $itemsPool, AdapterInterface $tagsPool = null, float $knownTagVersionsTtl = 0.15)
     {
         $this->pool = $itemsPool;
         $this->tags = $tagsPool ?: $itemsPool;
@@ -56,12 +62,13 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
         );
         $this->setCacheItemTags = \Closure::bind(
             static function (CacheItem $item, $key, array &$itemTags) {
+                $item->isTaggable = true;
                 if (!$item->isHit) {
                     return $item;
                 }
                 if (isset($itemTags[$key])) {
                     foreach ($itemTags[$key] as $tag => $version) {
-                        $item->prevTags[$tag] = $tag;
+                        $item->metadata[CacheItem::METADATA_TAGS][$tag] = $tag;
                     }
                     unset($itemTags[$key]);
                 } else {
@@ -78,7 +85,8 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
             static function ($deferred) {
                 $tagsByKey = [];
                 foreach ($deferred as $key => $item) {
-                    $tagsByKey[$key] = $item->tags;
+                    $tagsByKey[$key] = $item->newMetadata[CacheItem::METADATA_TAGS] ?? [];
+                    $item->metadata = $item->newMetadata;
                 }
 
                 return $tagsByKey;
@@ -145,12 +153,15 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function hasItem($key)
     {
-        if ($this->deferred) {
+        if (\is_string($key) && isset($this->deferred[$key])) {
             $this->commit();
         }
+
         if (!$this->pool->hasItem($key)) {
             return false;
         }
@@ -166,9 +177,11 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
         }
 
         foreach ($this->getTagVersions([$itemTags]) as $tag => $version) {
-            if ($itemTags[$tag] !== $version && 1 !== $itemTags[$tag] - $version) {
-                return false;
+            if ($itemTags[$tag] === $version || \is_int($itemTags[$tag]) && \is_int($version) && 1 === $itemTags[$tag] - $version) {
+                continue;
             }
+
+            return false;
         }
 
         return true;
@@ -191,18 +204,21 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
      */
     public function getItems(array $keys = [])
     {
-        if ($this->deferred) {
-            $this->commit();
-        }
         $tagKeys = [];
+        $commit = false;
 
         foreach ($keys as $key) {
             if ('' !== $key && \is_string($key)) {
+                $commit = $commit || isset($this->deferred[$key]);
                 $key = static::TAGS_PREFIX.$key;
                 $tagKeys[$key] = $key;
             }
         }
 
+        if ($commit) {
+            $this->commit();
+        }
+
         try {
             $items = $this->pool->getItems($tagKeys + $keys);
         } catch (InvalidArgumentException $e) {
@@ -216,16 +232,36 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
 
     /**
      * {@inheritdoc}
+     *
+     * @param string $prefix
+     *
+     * @return bool
      */
-    public function clear()
+    public function clear(/* string $prefix = '' */)
     {
-        $this->deferred = [];
+        $prefix = 0 < \func_num_args() ? (string) func_get_arg(0) : '';
+
+        if ('' !== $prefix) {
+            foreach ($this->deferred as $key => $item) {
+                if (str_starts_with($key, $prefix)) {
+                    unset($this->deferred[$key]);
+                }
+            }
+        } else {
+            $this->deferred = [];
+        }
+
+        if ($this->pool instanceof AdapterInterface) {
+            return $this->pool->clear($prefix);
+        }
 
         return $this->pool->clear();
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function deleteItem($key)
     {
@@ -234,6 +270,8 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function deleteItems(array $keys)
     {
@@ -248,6 +286,8 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function save(CacheItemInterface $item)
     {
@@ -261,6 +301,8 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function saveDeferred(CacheItemInterface $item)
     {
@@ -274,12 +316,17 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function commit()
     {
         return $this->invalidateTags([]);
     }
 
+    /**
+     * @return array
+     */
     public function __sleep()
     {
         throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
@@ -295,7 +342,7 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
         $this->commit();
     }
 
-    private function generateItems($items, array $tagKeys)
+    private function generateItems(iterable $items, array $tagKeys)
     {
         $bufferedItems = $itemTags = [];
         $f = $this->setCacheItemTags;
@@ -321,10 +368,11 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
 
                 foreach ($itemTags as $key => $tags) {
                     foreach ($tags as $tag => $version) {
-                        if ($tagVersions[$tag] !== $version && 1 !== $version - $tagVersions[$tag]) {
-                            unset($itemTags[$key]);
-                            continue 2;
+                        if ($tagVersions[$tag] === $version || \is_int($version) && \is_int($tagVersions[$tag]) && 1 === $version - $tagVersions[$tag]) {
+                            continue;
                         }
+                        unset($itemTags[$key]);
+                        continue 2;
                     }
                 }
                 $tagVersions = $tagKeys = null;
@@ -363,7 +411,7 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
         $tags = [];
         foreach ($tagVersions as $tag => $version) {
             $tags[$tag.static::TAGS_PREFIX] = $tag;
-            if ($fetchTagVersions || !isset($this->knownTagVersions[$tag])) {
+            if ($fetchTagVersions || !isset($this->knownTagVersions[$tag]) || !\is_int($version)) {
                 $fetchTagVersions = true;
                 continue;
             }
@@ -385,6 +433,10 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
             if (isset($invalidatedTags[$tag])) {
                 $invalidatedTags[$tag] = $version->set(++$tagVersions[$tag]);
             }
+            if (!\is_int($tagVersions[$tag])) {
+                unset($this->knownTagVersions[$tag]);
+                continue;
+            }
             $this->knownTagVersions[$tag] = [$now, $tagVersions[$tag]];
         }
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/TraceableAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/TraceableAdapter.php
index cc855c13..9e65b2ef 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/TraceableAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/TraceableAdapter.php
@@ -12,8 +12,11 @@
 namespace Symfony\Component\Cache\Adapter;
 
 use Psr\Cache\CacheItemInterface;
+use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\ResettableInterface;
+use Symfony\Contracts\Cache\CacheInterface;
+use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * An adapter that collects data about all cache calls.
@@ -22,7 +25,7 @@ use Symfony\Component\Cache\ResettableInterface;
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  * @author Nicolas Grekas <p@tchwork.com>
  */
-class TraceableAdapter implements AdapterInterface, PruneableInterface, ResettableInterface
+class TraceableAdapter implements AdapterInterface, CacheInterface, PruneableInterface, ResettableInterface
 {
     protected $pool;
     private $calls = [];
@@ -32,6 +35,38 @@ class TraceableAdapter implements AdapterInterface, PruneableInterface, Resettab
         $this->pool = $pool;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
+    {
+        if (!$this->pool instanceof CacheInterface) {
+            throw new \BadMethodCallException(sprintf('Cannot call "%s::get()": this class doesn\'t implement "%s".', \get_class($this->pool), CacheInterface::class));
+        }
+
+        $isHit = true;
+        $callback = function (CacheItem $item, bool &$save) use ($callback, &$isHit) {
+            $isHit = $item->isHit();
+
+            return $callback($item, $save);
+        };
+
+        $event = $this->start(__FUNCTION__);
+        try {
+            $value = $this->pool->get($key, $callback, $beta, $metadata);
+            $event->result[$key] = \is_object($value) ? \get_class($value) : \gettype($value);
+        } finally {
+            $event->end = microtime(true);
+        }
+        if ($isHit) {
+            ++$event->hits;
+        } else {
+            ++$event->misses;
+        }
+
+        return $value;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -54,6 +89,8 @@ class TraceableAdapter implements AdapterInterface, PruneableInterface, Resettab
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function hasItem($key)
     {
@@ -67,6 +104,8 @@ class TraceableAdapter implements AdapterInterface, PruneableInterface, Resettab
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function deleteItem($key)
     {
@@ -80,6 +119,8 @@ class TraceableAdapter implements AdapterInterface, PruneableInterface, Resettab
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function save(CacheItemInterface $item)
     {
@@ -93,6 +134,8 @@ class TraceableAdapter implements AdapterInterface, PruneableInterface, Resettab
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function saveDeferred(CacheItemInterface $item)
     {
@@ -132,11 +175,20 @@ class TraceableAdapter implements AdapterInterface, PruneableInterface, Resettab
 
     /**
      * {@inheritdoc}
+     *
+     * @param string $prefix
+     *
+     * @return bool
      */
-    public function clear()
+    public function clear(/* string $prefix = '' */)
     {
+        $prefix = 0 < \func_num_args() ? (string) func_get_arg(0) : '';
         $event = $this->start(__FUNCTION__);
         try {
+            if ($this->pool instanceof AdapterInterface) {
+                return $event->result = $this->pool->clear($prefix);
+            }
+
             return $event->result = $this->pool->clear();
         } finally {
             $event->end = microtime(true);
@@ -145,6 +197,8 @@ class TraceableAdapter implements AdapterInterface, PruneableInterface, Resettab
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function deleteItems(array $keys)
     {
@@ -159,6 +213,8 @@ class TraceableAdapter implements AdapterInterface, PruneableInterface, Resettab
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function commit()
     {
@@ -191,13 +247,26 @@ class TraceableAdapter implements AdapterInterface, PruneableInterface, Resettab
      */
     public function reset()
     {
-        if ($this->pool instanceof ResettableInterface) {
+        if ($this->pool instanceof ResetInterface) {
             $this->pool->reset();
         }
 
         $this->clearCalls();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function delete(string $key): bool
+    {
+        $event = $this->start(__FUNCTION__);
+        try {
+            return $event->result[$key] = $this->pool->deleteItem($key);
+        } finally {
+            $event->end = microtime(true);
+        }
+    }
+
     public function getCalls()
     {
         return $this->calls;
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/TraceableTagAwareAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/TraceableTagAwareAdapter.php
index de68955d..69461b8b 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/TraceableTagAwareAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/TraceableTagAwareAdapter.php
@@ -11,10 +11,12 @@
 
 namespace Symfony\Component\Cache\Adapter;
 
+use Symfony\Contracts\Cache\TagAwareCacheInterface;
+
 /**
  * @author Robin Chalas <robin.chalas@gmail.com>
  */
-class TraceableTagAwareAdapter extends TraceableAdapter implements TagAwareAdapterInterface
+class TraceableTagAwareAdapter extends TraceableAdapter implements TagAwareAdapterInterface, TagAwareCacheInterface
 {
     public function __construct(TagAwareAdapterInterface $pool)
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/CHANGELOG.md b/advancedcontentfilter/vendor/symfony/cache/CHANGELOG.md
index 11c1b936..435eaf3d 100644
--- a/advancedcontentfilter/vendor/symfony/cache/CHANGELOG.md
+++ b/advancedcontentfilter/vendor/symfony/cache/CHANGELOG.md
@@ -1,6 +1,43 @@
 CHANGELOG
 =========
 
+4.4.0
+-----
+
+ * added support for connecting to Redis Sentinel clusters
+ * added argument `$prefix` to `AdapterInterface::clear()`
+ * improved `RedisTagAwareAdapter` to support Redis server >= 2.8 and up to 4B items per tag
+ * added `TagAwareMarshaller` for optimized data storage when using `AbstractTagAwareAdapter`
+ * added `DeflateMarshaller` to compress serialized values
+ * removed support for phpredis 4 `compression`
+ * [BC BREAK] `RedisTagAwareAdapter` is not compatible with `RedisCluster` from `Predis` anymore, use `phpredis` instead
+ * Marked the `CacheDataCollector` class as `@final`.
+
+4.3.0
+-----
+
+ * removed `psr/simple-cache` dependency, run `composer require psr/simple-cache` if you need it
+ * deprecated all PSR-16 adapters, use `Psr16Cache` or `Symfony\Contracts\Cache\CacheInterface` implementations instead
+ * deprecated `SimpleCacheAdapter`, use `Psr16Adapter` instead
+
+4.2.0
+-----
+
+ * added support for connecting to Redis clusters via DSN
+ * added support for configuring multiple Memcached servers via DSN
+ * added `MarshallerInterface` and `DefaultMarshaller` to allow changing the serializer and provide one that automatically uses igbinary when available
+ * implemented `CacheInterface`, which provides stampede protection via probabilistic early expiration and should become the preferred way to use a cache
+ * added sub-second expiry accuracy for backends that support it
+ * added support for phpredis 4 `compression` and `tcp_keepalive` options
+ * added automatic table creation when using Doctrine DBAL with PDO-based backends
+ * throw `LogicException` when `CacheItem::tag()` is called on an item coming from a non tag-aware pool
+ * deprecated `CacheItem::getPreviousTags()`, use `CacheItem::getMetadata()` instead
+ * deprecated the `AbstractAdapter::unserialize()` and `AbstractCache::unserialize()` methods
+ * added `CacheCollectorPass` (originally in `FrameworkBundle`)
+ * added `CachePoolClearerPass` (originally in `FrameworkBundle`)
+ * added `CachePoolPass` (originally in `FrameworkBundle`)
+ * added `CachePoolPrunerPass` (originally in `FrameworkBundle`)
+
 3.4.0
 -----
 
@@ -13,7 +50,7 @@ CHANGELOG
 3.3.0
 -----
 
- * [EXPERIMENTAL] added CacheItem::getPreviousTags() to get bound tags coming from the pool storage if any
+ * added CacheItem::getPreviousTags() to get bound tags coming from the pool storage if any
  * added PSR-16 "Simple Cache" implementations for all existing PSR-6 adapters
  * added Psr6Cache and SimpleCacheAdapter for bidirectional interoperability between PSR-6 and PSR-16
  * added MemcachedAdapter (PSR-6) and MemcachedCache (PSR-16)
diff --git a/advancedcontentfilter/vendor/symfony/cache/CacheItem.php b/advancedcontentfilter/vendor/symfony/cache/CacheItem.php
index 7ae6568c..4dd6fd7c 100644
--- a/advancedcontentfilter/vendor/symfony/cache/CacheItem.php
+++ b/advancedcontentfilter/vendor/symfony/cache/CacheItem.php
@@ -11,34 +11,40 @@
 
 namespace Symfony\Component\Cache;
 
-use Psr\Cache\CacheItemInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
+use Symfony\Component\Cache\Exception\LogicException;
+use Symfony\Contracts\Cache\ItemInterface;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
-final class CacheItem implements CacheItemInterface
+final class CacheItem implements ItemInterface
 {
+    private const METADATA_EXPIRY_OFFSET = 1527506807;
+
     protected $key;
     protected $value;
     protected $isHit = false;
     protected $expiry;
-    protected $tags = [];
-    protected $prevTags = [];
+    protected $metadata = [];
+    protected $newMetadata = [];
     protected $innerItem;
     protected $poolHash;
+    protected $isTaggable = false;
 
     /**
      * {@inheritdoc}
      */
-    public function getKey()
+    public function getKey(): string
     {
         return $this->key;
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @return mixed
      */
     public function get()
     {
@@ -48,7 +54,7 @@ final class CacheItem implements CacheItemInterface
     /**
      * {@inheritdoc}
      */
-    public function isHit()
+    public function isHit(): bool
     {
         return $this->isHit;
     }
@@ -58,7 +64,7 @@ final class CacheItem implements CacheItemInterface
      *
      * @return $this
      */
-    public function set($value)
+    public function set($value): self
     {
         $this->value = $value;
 
@@ -70,12 +76,12 @@ final class CacheItem implements CacheItemInterface
      *
      * @return $this
      */
-    public function expiresAt($expiration)
+    public function expiresAt($expiration): self
     {
         if (null === $expiration) {
             $this->expiry = null;
         } elseif ($expiration instanceof \DateTimeInterface) {
-            $this->expiry = (int) $expiration->format('U');
+            $this->expiry = (float) $expiration->format('U.u');
         } else {
             throw new InvalidArgumentException(sprintf('Expiration date must implement DateTimeInterface or be null, "%s" given.', \is_object($expiration) ? \get_class($expiration) : \gettype($expiration)));
         }
@@ -88,14 +94,14 @@ final class CacheItem implements CacheItemInterface
      *
      * @return $this
      */
-    public function expiresAfter($time)
+    public function expiresAfter($time): self
     {
         if (null === $time) {
             $this->expiry = null;
         } elseif ($time instanceof \DateInterval) {
-            $this->expiry = (int) \DateTime::createFromFormat('U', time())->add($time)->format('U');
+            $this->expiry = microtime(true) + \DateTime::createFromFormat('U', 0)->add($time)->format('U.u');
         } elseif (\is_int($time)) {
-            $this->expiry = $time + time();
+            $this->expiry = $time + microtime(true);
         } else {
             throw new InvalidArgumentException(sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given.', \is_object($time) ? \get_class($time) : \gettype($time)));
         }
@@ -104,58 +110,64 @@ final class CacheItem implements CacheItemInterface
     }
 
     /**
-     * Adds a tag to a cache item.
-     *
-     * @param string|string[] $tags A tag or array of tags
-     *
-     * @return $this
-     *
-     * @throws InvalidArgumentException When $tag is not valid
+     * {@inheritdoc}
      */
-    public function tag($tags)
+    public function tag($tags): ItemInterface
     {
-        if (!\is_array($tags)) {
+        if (!$this->isTaggable) {
+            throw new LogicException(sprintf('Cache item "%s" comes from a non tag-aware pool: you cannot tag it.', $this->key));
+        }
+        if (!is_iterable($tags)) {
             $tags = [$tags];
         }
         foreach ($tags as $tag) {
-            if (!\is_string($tag)) {
-                throw new InvalidArgumentException(sprintf('Cache tag must be string, "%s" given.', \is_object($tag) ? \get_class($tag) : \gettype($tag)));
+            if (!\is_string($tag) && !(\is_object($tag) && method_exists($tag, '__toString'))) {
+                throw new InvalidArgumentException(sprintf('Cache tag must be string or object that implements __toString(), "%s" given.', \is_object($tag) ? \get_class($tag) : \gettype($tag)));
             }
-            if (isset($this->tags[$tag])) {
+            $tag = (string) $tag;
+            if (isset($this->newMetadata[self::METADATA_TAGS][$tag])) {
                 continue;
             }
             if ('' === $tag) {
                 throw new InvalidArgumentException('Cache tag length must be greater than zero.');
             }
-            if (false !== strpbrk($tag, '{}()/\@:')) {
-                throw new InvalidArgumentException(sprintf('Cache tag "%s" contains reserved characters {}()/\@:.', $tag));
+            if (false !== strpbrk($tag, self::RESERVED_CHARACTERS)) {
+                throw new InvalidArgumentException(sprintf('Cache tag "%s" contains reserved characters "%s".', $tag, self::RESERVED_CHARACTERS));
             }
-            $this->tags[$tag] = $tag;
+            $this->newMetadata[self::METADATA_TAGS][$tag] = $tag;
         }
 
         return $this;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadata(): array
+    {
+        return $this->metadata;
+    }
+
     /**
      * Returns the list of tags bound to the value coming from the pool storage if any.
      *
-     * @return array
+     * @deprecated since Symfony 4.2, use the "getMetadata()" method instead.
      */
-    public function getPreviousTags()
+    public function getPreviousTags(): array
     {
-        return $this->prevTags;
+        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.2, use the "getMetadata()" method instead.', __METHOD__), \E_USER_DEPRECATED);
+
+        return $this->metadata[self::METADATA_TAGS] ?? [];
     }
 
     /**
      * Validates a cache key according to PSR-6.
      *
-     * @param string $key The key to validate
-     *
-     * @return string
+     * @param mixed $key The key to validate
      *
      * @throws InvalidArgumentException When $key is not valid
      */
-    public static function validateKey($key)
+    public static function validateKey($key): string
     {
         if (!\is_string($key)) {
             throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
@@ -163,8 +175,8 @@ final class CacheItem implements CacheItemInterface
         if ('' === $key) {
             throw new InvalidArgumentException('Cache key length must be greater than zero.');
         }
-        if (false !== strpbrk($key, '{}()/\@:')) {
-            throw new InvalidArgumentException(sprintf('Cache key "%s" contains reserved characters {}()/\@:.', $key));
+        if (false !== strpbrk($key, self::RESERVED_CHARACTERS)) {
+            throw new InvalidArgumentException(sprintf('Cache key "%s" contains reserved characters "%s".', $key, self::RESERVED_CHARACTERS));
         }
 
         return $key;
@@ -175,14 +187,14 @@ final class CacheItem implements CacheItemInterface
      *
      * @internal
      */
-    public static function log(LoggerInterface $logger = null, $message, $context = [])
+    public static function log(?LoggerInterface $logger, string $message, array $context = [])
     {
         if ($logger) {
             $logger->warning($message, $context);
         } else {
             $replace = [];
             foreach ($context as $k => $v) {
-                if (is_scalar($v)) {
+                if (\is_scalar($v)) {
                     $replace['{'.$k.'}'] = $v;
                 }
             }
diff --git a/advancedcontentfilter/vendor/symfony/cache/DataCollector/CacheDataCollector.php b/advancedcontentfilter/vendor/symfony/cache/DataCollector/CacheDataCollector.php
index c9e87d5c..9bcd5b06 100644
--- a/advancedcontentfilter/vendor/symfony/cache/DataCollector/CacheDataCollector.php
+++ b/advancedcontentfilter/vendor/symfony/cache/DataCollector/CacheDataCollector.php
@@ -21,6 +21,8 @@ use Symfony\Component\HttpKernel\DataCollector\LateDataCollectorInterface;
 /**
  * @author Aaron Scherer <aequasi@gmail.com>
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ *
+ * @final since Symfony 4.4
  */
 class CacheDataCollector extends DataCollector implements LateDataCollectorInterface
 {
@@ -39,8 +41,10 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
 
     /**
      * {@inheritdoc}
+     *
+     * @param \Throwable|null $exception
      */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
+    public function collect(Request $request, Response $response/* , \Throwable $exception = null */)
     {
         $empty = ['calls' => [], 'config' => [], 'options' => [], 'statistics' => []];
         $this->data = ['instances' => $empty, 'total' => $empty];
@@ -62,7 +66,7 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
 
     public function lateCollect()
     {
-        $this->data = $this->cloneVar($this->data);
+        $this->data['instances']['calls'] = $this->cloneVar($this->data['instances']['calls']);
     }
 
     /**
@@ -103,10 +107,7 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
         return $this->data['instances']['calls'];
     }
 
-    /**
-     * @return array
-     */
-    private function calculateStatistics()
+    private function calculateStatistics(): array
     {
         $statistics = [];
         foreach ($this->data['instances']['calls'] as $name => $calls) {
@@ -123,7 +124,15 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
             foreach ($calls as $call) {
                 ++$statistics[$name]['calls'];
                 $statistics[$name]['time'] += $call->end - $call->start;
-                if ('getItem' === $call->name) {
+                if ('get' === $call->name) {
+                    ++$statistics[$name]['reads'];
+                    if ($call->hits) {
+                        ++$statistics[$name]['hits'];
+                    } else {
+                        ++$statistics[$name]['misses'];
+                        ++$statistics[$name]['writes'];
+                    }
+                } elseif ('getItem' === $call->name) {
                     ++$statistics[$name]['reads'];
                     if ($call->hits) {
                         ++$statistics[$name]['hits'];
@@ -157,10 +166,7 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
         return $statistics;
     }
 
-    /**
-     * @return array
-     */
-    private function calculateTotalStatistics()
+    private function calculateTotalStatistics(): array
     {
         $statistics = $this->getStatistics();
         $totals = [
diff --git a/advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CacheCollectorPass.php b/advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CacheCollectorPass.php
new file mode 100644
index 00000000..6bbab9da
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CacheCollectorPass.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\DependencyInjection;
+
+use Symfony\Component\Cache\Adapter\TagAwareAdapterInterface;
+use Symfony\Component\Cache\Adapter\TraceableAdapter;
+use Symfony\Component\Cache\Adapter\TraceableTagAwareAdapter;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * Inject a data collector to all the cache services to be able to get detailed statistics.
+ *
+ * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ */
+class CacheCollectorPass implements CompilerPassInterface
+{
+    private $dataCollectorCacheId;
+    private $cachePoolTag;
+    private $cachePoolRecorderInnerSuffix;
+
+    public function __construct(string $dataCollectorCacheId = 'data_collector.cache', string $cachePoolTag = 'cache.pool', string $cachePoolRecorderInnerSuffix = '.recorder_inner')
+    {
+        $this->dataCollectorCacheId = $dataCollectorCacheId;
+        $this->cachePoolTag = $cachePoolTag;
+        $this->cachePoolRecorderInnerSuffix = $cachePoolRecorderInnerSuffix;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        if (!$container->hasDefinition($this->dataCollectorCacheId)) {
+            return;
+        }
+
+        foreach ($container->findTaggedServiceIds($this->cachePoolTag) as $id => $attributes) {
+            $poolName = $attributes[0]['name'] ?? $id;
+
+            $this->addToCollector($id, $poolName, $container);
+        }
+    }
+
+    private function addToCollector(string $id, string $name, ContainerBuilder $container)
+    {
+        $definition = $container->getDefinition($id);
+        if ($definition->isAbstract()) {
+            return;
+        }
+
+        $collectorDefinition = $container->getDefinition($this->dataCollectorCacheId);
+        $recorder = new Definition(is_subclass_of($definition->getClass(), TagAwareAdapterInterface::class) ? TraceableTagAwareAdapter::class : TraceableAdapter::class);
+        $recorder->setTags($definition->getTags());
+        if (!$definition->isPublic() || !$definition->isPrivate()) {
+            $recorder->setPublic($definition->isPublic());
+        }
+        $recorder->setArguments([new Reference($innerId = $id.$this->cachePoolRecorderInnerSuffix)]);
+
+        $definition->setTags([]);
+        $definition->setPublic(false);
+
+        $container->setDefinition($innerId, $definition);
+        $container->setDefinition($id, $recorder);
+
+        // Tell the collector to add the new instance
+        $collectorDefinition->addMethodCall('addInstance', [$name, new Reference($id)]);
+        $collectorDefinition->setPublic(false);
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CachePoolClearerPass.php b/advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CachePoolClearerPass.php
new file mode 100644
index 00000000..3ca89a36
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CachePoolClearerPass.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class CachePoolClearerPass implements CompilerPassInterface
+{
+    private $cachePoolClearerTag;
+
+    public function __construct(string $cachePoolClearerTag = 'cache.pool.clearer')
+    {
+        $this->cachePoolClearerTag = $cachePoolClearerTag;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        $container->getParameterBag()->remove('cache.prefix.seed');
+
+        foreach ($container->findTaggedServiceIds($this->cachePoolClearerTag) as $id => $attr) {
+            $clearer = $container->getDefinition($id);
+            $pools = [];
+            foreach ($clearer->getArgument(0) as $name => $ref) {
+                if ($container->hasDefinition($ref)) {
+                    $pools[$name] = new Reference($ref);
+                }
+            }
+            $clearer->replaceArgument(0, $pools);
+        }
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CachePoolPass.php b/advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CachePoolPass.php
new file mode 100644
index 00000000..c707ad9a
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CachePoolPass.php
@@ -0,0 +1,228 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\DependencyInjection;
+
+use Symfony\Component\Cache\Adapter\AbstractAdapter;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Cache\Adapter\ChainAdapter;
+use Symfony\Component\Cache\Adapter\NullAdapter;
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class CachePoolPass implements CompilerPassInterface
+{
+    private $cachePoolTag;
+    private $kernelResetTag;
+    private $cacheClearerId;
+    private $cachePoolClearerTag;
+    private $cacheSystemClearerId;
+    private $cacheSystemClearerTag;
+
+    public function __construct(string $cachePoolTag = 'cache.pool', string $kernelResetTag = 'kernel.reset', string $cacheClearerId = 'cache.global_clearer', string $cachePoolClearerTag = 'cache.pool.clearer', string $cacheSystemClearerId = 'cache.system_clearer', string $cacheSystemClearerTag = 'kernel.cache_clearer')
+    {
+        $this->cachePoolTag = $cachePoolTag;
+        $this->kernelResetTag = $kernelResetTag;
+        $this->cacheClearerId = $cacheClearerId;
+        $this->cachePoolClearerTag = $cachePoolClearerTag;
+        $this->cacheSystemClearerId = $cacheSystemClearerId;
+        $this->cacheSystemClearerTag = $cacheSystemClearerTag;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        if ($container->hasParameter('cache.prefix.seed')) {
+            $seed = '.'.$container->getParameterBag()->resolveValue($container->getParameter('cache.prefix.seed'));
+        } else {
+            $seed = '_'.$container->getParameter('kernel.project_dir');
+        }
+        $seed .= '.'.$container->getParameter('kernel.container_class');
+
+        $allPools = [];
+        $clearers = [];
+        $attributes = [
+            'provider',
+            'name',
+            'namespace',
+            'default_lifetime',
+            'reset',
+        ];
+        foreach ($container->findTaggedServiceIds($this->cachePoolTag) as $id => $tags) {
+            $adapter = $pool = $container->getDefinition($id);
+            if ($pool->isAbstract()) {
+                continue;
+            }
+            $class = $adapter->getClass();
+            while ($adapter instanceof ChildDefinition) {
+                $adapter = $container->findDefinition($adapter->getParent());
+                $class = $class ?: $adapter->getClass();
+                if ($t = $adapter->getTag($this->cachePoolTag)) {
+                    $tags[0] += $t[0];
+                }
+            }
+            $name = $tags[0]['name'] ?? $id;
+            if (!isset($tags[0]['namespace'])) {
+                $namespaceSeed = $seed;
+                if (null !== $class) {
+                    $namespaceSeed .= '.'.$class;
+                }
+
+                $tags[0]['namespace'] = $this->getNamespace($namespaceSeed, $name);
+            }
+            if (isset($tags[0]['clearer'])) {
+                $clearer = $tags[0]['clearer'];
+                while ($container->hasAlias($clearer)) {
+                    $clearer = (string) $container->getAlias($clearer);
+                }
+            } else {
+                $clearer = null;
+            }
+            unset($tags[0]['clearer'], $tags[0]['name']);
+
+            if (isset($tags[0]['provider'])) {
+                $tags[0]['provider'] = new Reference(static::getServiceProvider($container, $tags[0]['provider']));
+            }
+
+            if (ChainAdapter::class === $class) {
+                $adapters = [];
+                foreach ($adapter->getArgument(0) as $provider => $adapter) {
+                    if ($adapter instanceof ChildDefinition) {
+                        $chainedPool = $adapter;
+                    } else {
+                        $chainedPool = $adapter = new ChildDefinition($adapter);
+                    }
+
+                    $chainedTags = [\is_int($provider) ? [] : ['provider' => $provider]];
+                    $chainedClass = '';
+
+                    while ($adapter instanceof ChildDefinition) {
+                        $adapter = $container->findDefinition($adapter->getParent());
+                        $chainedClass = $chainedClass ?: $adapter->getClass();
+                        if ($t = $adapter->getTag($this->cachePoolTag)) {
+                            $chainedTags[0] += $t[0];
+                        }
+                    }
+
+                    if (ChainAdapter::class === $chainedClass) {
+                        throw new InvalidArgumentException(sprintf('Invalid service "%s": chain of adapters cannot reference another chain, found "%s".', $id, $chainedPool->getParent()));
+                    }
+
+                    $i = 0;
+
+                    if (isset($chainedTags[0]['provider'])) {
+                        $chainedPool->replaceArgument($i++, new Reference(static::getServiceProvider($container, $chainedTags[0]['provider'])));
+                    }
+
+                    if (isset($tags[0]['namespace']) && !\in_array($adapter->getClass(), [ArrayAdapter::class, NullAdapter::class], true)) {
+                        $chainedPool->replaceArgument($i++, $tags[0]['namespace']);
+                    }
+
+                    if (isset($tags[0]['default_lifetime'])) {
+                        $chainedPool->replaceArgument($i++, $tags[0]['default_lifetime']);
+                    }
+
+                    $adapters[] = $chainedPool;
+                }
+
+                $pool->replaceArgument(0, $adapters);
+                unset($tags[0]['provider'], $tags[0]['namespace']);
+                $i = 1;
+            } else {
+                $i = 0;
+            }
+
+            foreach ($attributes as $attr) {
+                if (!isset($tags[0][$attr])) {
+                    // no-op
+                } elseif ('reset' === $attr) {
+                    if ($tags[0][$attr]) {
+                        $pool->addTag($this->kernelResetTag, ['method' => $tags[0][$attr]]);
+                    }
+                } elseif ('namespace' !== $attr || !\in_array($class, [ArrayAdapter::class, NullAdapter::class], true)) {
+                    $pool->replaceArgument($i++, $tags[0][$attr]);
+                }
+                unset($tags[0][$attr]);
+            }
+            if (!empty($tags[0])) {
+                throw new InvalidArgumentException(sprintf('Invalid "%s" tag for service "%s": accepted attributes are "clearer", "provider", "name", "namespace", "default_lifetime" and "reset", found "%s".', $this->cachePoolTag, $id, implode('", "', array_keys($tags[0]))));
+            }
+
+            if (null !== $clearer) {
+                $clearers[$clearer][$name] = new Reference($id, $container::IGNORE_ON_UNINITIALIZED_REFERENCE);
+            }
+
+            $allPools[$name] = new Reference($id, $container::IGNORE_ON_UNINITIALIZED_REFERENCE);
+        }
+
+        $notAliasedCacheClearerId = $this->cacheClearerId;
+        while ($container->hasAlias($this->cacheClearerId)) {
+            $this->cacheClearerId = (string) $container->getAlias($this->cacheClearerId);
+        }
+        if ($container->hasDefinition($this->cacheClearerId)) {
+            $clearers[$notAliasedCacheClearerId] = $allPools;
+        }
+
+        foreach ($clearers as $id => $pools) {
+            $clearer = $container->getDefinition($id);
+            if ($clearer instanceof ChildDefinition) {
+                $clearer->replaceArgument(0, $pools);
+            } else {
+                $clearer->setArgument(0, $pools);
+            }
+            $clearer->addTag($this->cachePoolClearerTag);
+
+            if ($this->cacheSystemClearerId === $id) {
+                $clearer->addTag($this->cacheSystemClearerTag);
+            }
+        }
+
+        if ($container->hasDefinition('console.command.cache_pool_list')) {
+            $container->getDefinition('console.command.cache_pool_list')->replaceArgument(0, array_keys($allPools));
+        }
+    }
+
+    private function getNamespace(string $seed, string $id)
+    {
+        return substr(str_replace('/', '-', base64_encode(hash('sha256', $id.$seed, true))), 0, 10);
+    }
+
+    /**
+     * @internal
+     */
+    public static function getServiceProvider(ContainerBuilder $container, $name)
+    {
+        $container->resolveEnvPlaceholders($name, null, $usedEnvs);
+
+        if ($usedEnvs || preg_match('#^[a-z]++:#', $name)) {
+            $dsn = $name;
+
+            if (!$container->hasDefinition($name = '.cache_connection.'.ContainerBuilder::hash($dsn))) {
+                $definition = new Definition(AbstractAdapter::class);
+                $definition->setPublic(false);
+                $definition->setFactory([AbstractAdapter::class, 'createConnection']);
+                $definition->setArguments([$dsn, ['lazy' => true]]);
+                $container->setDefinition($name, $definition);
+            }
+        }
+
+        return $name;
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CachePoolPrunerPass.php b/advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CachePoolPrunerPass.php
new file mode 100644
index 00000000..e5699623
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CachePoolPrunerPass.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\DependencyInjection;
+
+use Symfony\Component\Cache\PruneableInterface;
+use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * @author Rob Frawley 2nd <rmf@src.run>
+ */
+class CachePoolPrunerPass implements CompilerPassInterface
+{
+    private $cacheCommandServiceId;
+    private $cachePoolTag;
+
+    public function __construct(string $cacheCommandServiceId = 'console.command.cache_pool_prune', string $cachePoolTag = 'cache.pool')
+    {
+        $this->cacheCommandServiceId = $cacheCommandServiceId;
+        $this->cachePoolTag = $cachePoolTag;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        if (!$container->hasDefinition($this->cacheCommandServiceId)) {
+            return;
+        }
+
+        $services = [];
+
+        foreach ($container->findTaggedServiceIds($this->cachePoolTag) as $id => $tags) {
+            $class = $container->getParameterBag()->resolveValue($container->getDefinition($id)->getClass());
+
+            if (!$reflection = $container->getReflectionClass($class)) {
+                throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
+            }
+
+            if ($reflection->implementsInterface(PruneableInterface::class)) {
+                $services[$id] = new Reference($id);
+            }
+        }
+
+        $container->getDefinition($this->cacheCommandServiceId)->replaceArgument(0, new IteratorArgument($services));
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/DoctrineProvider.php b/advancedcontentfilter/vendor/symfony/cache/DoctrineProvider.php
index 4c5cd0cb..f6ac5745 100644
--- a/advancedcontentfilter/vendor/symfony/cache/DoctrineProvider.php
+++ b/advancedcontentfilter/vendor/symfony/cache/DoctrineProvider.php
@@ -13,6 +13,11 @@ namespace Symfony\Component\Cache;
 
 use Doctrine\Common\Cache\CacheProvider;
 use Psr\Cache\CacheItemPoolInterface;
+use Symfony\Contracts\Service\ResetInterface;
+
+if (!class_exists(CacheProvider::class)) {
+    return;
+}
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
@@ -39,7 +44,7 @@ class DoctrineProvider extends CacheProvider implements PruneableInterface, Rese
      */
     public function reset()
     {
-        if ($this->pool instanceof ResettableInterface) {
+        if ($this->pool instanceof ResetInterface) {
             $this->pool->reset();
         }
         $this->setNamespace($this->getNamespace());
@@ -47,6 +52,8 @@ class DoctrineProvider extends CacheProvider implements PruneableInterface, Rese
 
     /**
      * {@inheritdoc}
+     *
+     * @return mixed
      */
     protected function doFetch($id)
     {
@@ -57,6 +64,8 @@ class DoctrineProvider extends CacheProvider implements PruneableInterface, Rese
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     protected function doContains($id)
     {
@@ -65,6 +74,8 @@ class DoctrineProvider extends CacheProvider implements PruneableInterface, Rese
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     protected function doSave($id, $data, $lifeTime = 0)
     {
@@ -79,6 +90,8 @@ class DoctrineProvider extends CacheProvider implements PruneableInterface, Rese
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     protected function doDelete($id)
     {
@@ -87,6 +100,8 @@ class DoctrineProvider extends CacheProvider implements PruneableInterface, Rese
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     protected function doFlush()
     {
@@ -95,6 +110,8 @@ class DoctrineProvider extends CacheProvider implements PruneableInterface, Rese
 
     /**
      * {@inheritdoc}
+     *
+     * @return array|null
      */
     protected function doGetStats()
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Exception/CacheException.php b/advancedcontentfilter/vendor/symfony/cache/Exception/CacheException.php
index e87b2db8..d2e975b2 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Exception/CacheException.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Exception/CacheException.php
@@ -14,6 +14,12 @@ namespace Symfony\Component\Cache\Exception;
 use Psr\Cache\CacheException as Psr6CacheInterface;
 use Psr\SimpleCache\CacheException as SimpleCacheInterface;
 
-class CacheException extends \Exception implements Psr6CacheInterface, SimpleCacheInterface
-{
+if (interface_exists(SimpleCacheInterface::class)) {
+    class CacheException extends \Exception implements Psr6CacheInterface, SimpleCacheInterface
+    {
+    }
+} else {
+    class CacheException extends \Exception implements Psr6CacheInterface
+    {
+    }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Exception/InvalidArgumentException.php b/advancedcontentfilter/vendor/symfony/cache/Exception/InvalidArgumentException.php
index 828bf3ed..7f9584a2 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Exception/InvalidArgumentException.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Exception/InvalidArgumentException.php
@@ -14,6 +14,12 @@ namespace Symfony\Component\Cache\Exception;
 use Psr\Cache\InvalidArgumentException as Psr6CacheInterface;
 use Psr\SimpleCache\InvalidArgumentException as SimpleCacheInterface;
 
-class InvalidArgumentException extends \InvalidArgumentException implements Psr6CacheInterface, SimpleCacheInterface
-{
+if (interface_exists(SimpleCacheInterface::class)) {
+    class InvalidArgumentException extends \InvalidArgumentException implements Psr6CacheInterface, SimpleCacheInterface
+    {
+    }
+} else {
+    class InvalidArgumentException extends \InvalidArgumentException implements Psr6CacheInterface
+    {
+    }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Exception/LogicException.php b/advancedcontentfilter/vendor/symfony/cache/Exception/LogicException.php
new file mode 100644
index 00000000..9ffa7ed6
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache/Exception/LogicException.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Exception;
+
+use Psr\Cache\CacheException as Psr6CacheInterface;
+use Psr\SimpleCache\CacheException as SimpleCacheInterface;
+
+if (interface_exists(SimpleCacheInterface::class)) {
+    class LogicException extends \LogicException implements Psr6CacheInterface, SimpleCacheInterface
+    {
+    }
+} else {
+    class LogicException extends \LogicException implements Psr6CacheInterface
+    {
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/LICENSE b/advancedcontentfilter/vendor/symfony/cache/LICENSE
index a7ec7080..7fa95390 100644
--- a/advancedcontentfilter/vendor/symfony/cache/LICENSE
+++ b/advancedcontentfilter/vendor/symfony/cache/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2016-2020 Fabien Potencier
+Copyright (c) 2016-2022 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/advancedcontentfilter/vendor/symfony/cache/LockRegistry.php b/advancedcontentfilter/vendor/symfony/cache/LockRegistry.php
new file mode 100644
index 00000000..26574f10
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache/LockRegistry.php
@@ -0,0 +1,161 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache;
+
+use Psr\Log\LoggerInterface;
+use Symfony\Contracts\Cache\CacheInterface;
+use Symfony\Contracts\Cache\ItemInterface;
+
+/**
+ * LockRegistry is used internally by existing adapters to protect against cache stampede.
+ *
+ * It does so by wrapping the computation of items in a pool of locks.
+ * Foreach each apps, there can be at most 20 concurrent processes that
+ * compute items at the same time and only one per cache-key.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+final class LockRegistry
+{
+    private static $openedFiles = [];
+    private static $lockedFiles;
+    private static $signalingException;
+    private static $signalingCallback;
+
+    /**
+     * The number of items in this list controls the max number of concurrent processes.
+     */
+    private static $files = [
+        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'AbstractAdapter.php',
+        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'AbstractTagAwareAdapter.php',
+        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'AdapterInterface.php',
+        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'ApcuAdapter.php',
+        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'ArrayAdapter.php',
+        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'ChainAdapter.php',
+        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'DoctrineAdapter.php',
+        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'FilesystemAdapter.php',
+        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'FilesystemTagAwareAdapter.php',
+        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'MemcachedAdapter.php',
+        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'NullAdapter.php',
+        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'PdoAdapter.php',
+        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'PhpArrayAdapter.php',
+        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'PhpFilesAdapter.php',
+        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'ProxyAdapter.php',
+        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'Psr16Adapter.php',
+        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'RedisAdapter.php',
+        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'RedisTagAwareAdapter.php',
+        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'SimpleCacheAdapter.php',
+        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'TagAwareAdapter.php',
+        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'TagAwareAdapterInterface.php',
+        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'TraceableAdapter.php',
+        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'TraceableTagAwareAdapter.php',
+    ];
+
+    /**
+     * Defines a set of existing files that will be used as keys to acquire locks.
+     *
+     * @return array The previously defined set of files
+     */
+    public static function setFiles(array $files): array
+    {
+        $previousFiles = self::$files;
+        self::$files = $files;
+
+        foreach (self::$openedFiles as $file) {
+            if ($file) {
+                flock($file, \LOCK_UN);
+                fclose($file);
+            }
+        }
+        self::$openedFiles = self::$lockedFiles = [];
+
+        return $previousFiles;
+    }
+
+    public static function compute(callable $callback, ItemInterface $item, bool &$save, CacheInterface $pool, \Closure $setMetadata = null, LoggerInterface $logger = null)
+    {
+        if ('\\' === \DIRECTORY_SEPARATOR && null === self::$lockedFiles) {
+            // disable locking on Windows by default
+            self::$files = self::$lockedFiles = [];
+        }
+
+        $key = self::$files ? abs(crc32($item->getKey())) % \count(self::$files) : -1;
+
+        if ($key < 0 || self::$lockedFiles || !$lock = self::open($key)) {
+            return $callback($item, $save);
+        }
+
+        self::$signalingException ?? self::$signalingException = unserialize("O:9:\"Exception\":1:{s:16:\"\0Exception\0trace\";a:0:{}}");
+        self::$signalingCallback ?? self::$signalingCallback = function () { throw self::$signalingException; };
+
+        while (true) {
+            try {
+                // race to get the lock in non-blocking mode
+                $locked = flock($lock, \LOCK_EX | \LOCK_NB, $wouldBlock);
+
+                if ($locked || !$wouldBlock) {
+                    $logger && $logger->info(sprintf('Lock %s, now computing item "{key}"', $locked ? 'acquired' : 'not supported'), ['key' => $item->getKey()]);
+                    self::$lockedFiles[$key] = true;
+
+                    $value = $callback($item, $save);
+
+                    if ($save) {
+                        if ($setMetadata) {
+                            $setMetadata($item);
+                        }
+
+                        $pool->save($item->set($value));
+                        $save = false;
+                    }
+
+                    return $value;
+                }
+                // if we failed the race, retry locking in blocking mode to wait for the winner
+                $logger && $logger->info('Item "{key}" is locked, waiting for it to be released', ['key' => $item->getKey()]);
+                flock($lock, \LOCK_SH);
+            } finally {
+                flock($lock, \LOCK_UN);
+                unset(self::$lockedFiles[$key]);
+            }
+
+            try {
+                $value = $pool->get($item->getKey(), self::$signalingCallback, 0);
+                $logger && $logger->info('Item "{key}" retrieved after lock was released', ['key' => $item->getKey()]);
+                $save = false;
+
+                return $value;
+            } catch (\Exception $e) {
+                if (self::$signalingException !== $e) {
+                    throw $e;
+                }
+                $logger && $logger->info('Item "{key}" not found while lock was released, now retrying', ['key' => $item->getKey()]);
+            }
+        }
+
+        return null;
+    }
+
+    private static function open(int $key)
+    {
+        if (null !== $h = self::$openedFiles[$key] ?? null) {
+            return $h;
+        }
+        set_error_handler(function () {});
+        try {
+            $h = fopen(self::$files[$key], 'r+');
+        } finally {
+            restore_error_handler();
+        }
+
+        return self::$openedFiles[$key] = $h ?: @fopen(self::$files[$key], 'r');
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Marshaller/DefaultMarshaller.php b/advancedcontentfilter/vendor/symfony/cache/Marshaller/DefaultMarshaller.php
new file mode 100644
index 00000000..7493a2ef
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache/Marshaller/DefaultMarshaller.php
@@ -0,0 +1,99 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Marshaller;
+
+use Symfony\Component\Cache\Exception\CacheException;
+
+/**
+ * Serializes/unserializes values using igbinary_serialize() if available, serialize() otherwise.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class DefaultMarshaller implements MarshallerInterface
+{
+    private $useIgbinarySerialize = true;
+
+    public function __construct(bool $useIgbinarySerialize = null)
+    {
+        if (null === $useIgbinarySerialize) {
+            $useIgbinarySerialize = \extension_loaded('igbinary') && (\PHP_VERSION_ID < 70400 || version_compare('3.1.6', phpversion('igbinary'), '<='));
+        } elseif ($useIgbinarySerialize && (!\extension_loaded('igbinary') || (\PHP_VERSION_ID >= 70400 && version_compare('3.1.6', phpversion('igbinary'), '>')))) {
+            throw new CacheException(\extension_loaded('igbinary') && \PHP_VERSION_ID >= 70400 ? 'Please upgrade the "igbinary" PHP extension to v3.1.6 or higher.' : 'The "igbinary" PHP extension is not loaded.');
+        }
+        $this->useIgbinarySerialize = $useIgbinarySerialize;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function marshall(array $values, ?array &$failed): array
+    {
+        $serialized = $failed = [];
+
+        foreach ($values as $id => $value) {
+            try {
+                if ($this->useIgbinarySerialize) {
+                    $serialized[$id] = igbinary_serialize($value);
+                } else {
+                    $serialized[$id] = serialize($value);
+                }
+            } catch (\Exception $e) {
+                $failed[] = $id;
+            }
+        }
+
+        return $serialized;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function unmarshall(string $value)
+    {
+        if ('b:0;' === $value) {
+            return false;
+        }
+        if ('N;' === $value) {
+            return null;
+        }
+        static $igbinaryNull;
+        if ($value === ($igbinaryNull ?? $igbinaryNull = \extension_loaded('igbinary') ? igbinary_serialize(null) : false)) {
+            return null;
+        }
+        $unserializeCallbackHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');
+        try {
+            if (':' === ($value[1] ?? ':')) {
+                if (false !== $value = unserialize($value)) {
+                    return $value;
+                }
+            } elseif (false === $igbinaryNull) {
+                throw new \RuntimeException('Failed to unserialize values, did you forget to install the "igbinary" extension?');
+            } elseif (null !== $value = igbinary_unserialize($value)) {
+                return $value;
+            }
+
+            throw new \DomainException(error_get_last() ? error_get_last()['message'] : 'Failed to unserialize values.');
+        } catch (\Error $e) {
+            throw new \ErrorException($e->getMessage(), $e->getCode(), \E_ERROR, $e->getFile(), $e->getLine());
+        } finally {
+            ini_set('unserialize_callback_func', $unserializeCallbackHandler);
+        }
+    }
+
+    /**
+     * @internal
+     */
+    public static function handleUnserializeCallback($class)
+    {
+        throw new \DomainException('Class not found: '.$class);
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Marshaller/DeflateMarshaller.php b/advancedcontentfilter/vendor/symfony/cache/Marshaller/DeflateMarshaller.php
new file mode 100644
index 00000000..55448061
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache/Marshaller/DeflateMarshaller.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Marshaller;
+
+use Symfony\Component\Cache\Exception\CacheException;
+
+/**
+ * Compresses values using gzdeflate().
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class DeflateMarshaller implements MarshallerInterface
+{
+    private $marshaller;
+
+    public function __construct(MarshallerInterface $marshaller)
+    {
+        if (!\function_exists('gzdeflate')) {
+            throw new CacheException('The "zlib" PHP extension is not loaded.');
+        }
+
+        $this->marshaller = $marshaller;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function marshall(array $values, ?array &$failed): array
+    {
+        return array_map('gzdeflate', $this->marshaller->marshall($values, $failed));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function unmarshall(string $value)
+    {
+        if (false !== $inflatedValue = @gzinflate($value)) {
+            $value = $inflatedValue;
+        }
+
+        return $this->marshaller->unmarshall($value);
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Marshaller/MarshallerInterface.php b/advancedcontentfilter/vendor/symfony/cache/Marshaller/MarshallerInterface.php
new file mode 100644
index 00000000..cdd6c402
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache/Marshaller/MarshallerInterface.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Marshaller;
+
+/**
+ * Serializes/unserializes PHP values.
+ *
+ * Implementations of this interface MUST deal with errors carefully. They MUST
+ * also deal with forward and backward compatibility at the storage format level.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+interface MarshallerInterface
+{
+    /**
+     * Serializes a list of values.
+     *
+     * When serialization fails for a specific value, no exception should be
+     * thrown. Instead, its key should be listed in $failed.
+     */
+    public function marshall(array $values, ?array &$failed): array;
+
+    /**
+     * Unserializes a single value and throws an exception if anything goes wrong.
+     *
+     * @return mixed
+     *
+     * @throws \Exception Whenever unserialization fails
+     */
+    public function unmarshall(string $value);
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Marshaller/TagAwareMarshaller.php b/advancedcontentfilter/vendor/symfony/cache/Marshaller/TagAwareMarshaller.php
new file mode 100644
index 00000000..5d1e303b
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache/Marshaller/TagAwareMarshaller.php
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Marshaller;
+
+/**
+ * A marshaller optimized for data structures generated by AbstractTagAwareAdapter.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class TagAwareMarshaller implements MarshallerInterface
+{
+    private $marshaller;
+
+    public function __construct(MarshallerInterface $marshaller = null)
+    {
+        $this->marshaller = $marshaller ?? new DefaultMarshaller();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function marshall(array $values, ?array &$failed): array
+    {
+        $failed = $notSerialized = $serialized = [];
+
+        foreach ($values as $id => $value) {
+            if (\is_array($value) && \is_array($value['tags'] ?? null) && \array_key_exists('value', $value) && \count($value) === 2 + (\is_string($value['meta'] ?? null) && 8 === \strlen($value['meta']))) {
+                // if the value is an array with keys "tags", "value" and "meta", use a compact serialization format
+                // magic numbers in the form 9D-..-..-..-..-00-..-..-..-5F allow detecting this format quickly in unmarshall()
+
+                $v = $this->marshaller->marshall($value, $f);
+
+                if ($f) {
+                    $f = [];
+                    $failed[] = $id;
+                } else {
+                    if ([] === $value['tags']) {
+                        $v['tags'] = '';
+                    }
+
+                    $serialized[$id] = "\x9D".($value['meta'] ?? "\0\0\0\0\0\0\0\0").pack('N', \strlen($v['tags'])).$v['tags'].$v['value'];
+                    $serialized[$id][9] = "\x5F";
+                }
+            } else {
+                // other arbitratry values are serialized using the decorated marshaller below
+                $notSerialized[$id] = $value;
+            }
+        }
+
+        if ($notSerialized) {
+            $serialized += $this->marshaller->marshall($notSerialized, $f);
+            $failed = array_merge($failed, $f);
+        }
+
+        return $serialized;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function unmarshall(string $value)
+    {
+        // detect the compact format used in marshall() using magic numbers in the form 9D-..-..-..-..-00-..-..-..-5F
+        if (13 >= \strlen($value) || "\x9D" !== $value[0] || "\0" !== $value[5] || "\x5F" !== $value[9]) {
+            return $this->marshaller->unmarshall($value);
+        }
+
+        // data consists of value, tags and metadata which we need to unpack
+        $meta = substr($value, 1, 12);
+        $meta[8] = "\0";
+        $tagLen = unpack('Nlen', $meta, 8)['len'];
+        $meta = substr($meta, 0, 8);
+
+        return [
+            'value' => $this->marshaller->unmarshall(substr($value, 13 + $tagLen)),
+            'tags' => $tagLen ? $this->marshaller->unmarshall(substr($value, 13, $tagLen)) : [],
+            'meta' => "\0\0\0\0\0\0\0\0" === $meta ? null : $meta,
+        ];
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Psr16Cache.php b/advancedcontentfilter/vendor/symfony/cache/Psr16Cache.php
new file mode 100644
index 00000000..ac265a57
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache/Psr16Cache.php
@@ -0,0 +1,284 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache;
+
+use Psr\Cache\CacheException as Psr6CacheException;
+use Psr\Cache\CacheItemPoolInterface;
+use Psr\SimpleCache\CacheException as SimpleCacheException;
+use Psr\SimpleCache\CacheInterface;
+use Symfony\Component\Cache\Adapter\AdapterInterface;
+use Symfony\Component\Cache\Exception\InvalidArgumentException;
+use Symfony\Component\Cache\Traits\ProxyTrait;
+
+if (null !== (new \ReflectionMethod(CacheInterface::class, 'get'))->getReturnType()) {
+    throw new \LogicException('psr/simple-cache 3.0+ is not compatible with this version of symfony/cache. Please upgrade symfony/cache to 6.0+ or downgrade psr/simple-cache to 1.x or 2.x.');
+}
+
+/**
+ * Turns a PSR-6 cache into a PSR-16 one.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class Psr16Cache implements CacheInterface, PruneableInterface, ResettableInterface
+{
+    use ProxyTrait;
+
+    private const METADATA_EXPIRY_OFFSET = 1527506807;
+
+    private $createCacheItem;
+    private $cacheItemPrototype;
+
+    public function __construct(CacheItemPoolInterface $pool)
+    {
+        $this->pool = $pool;
+
+        if (!$pool instanceof AdapterInterface) {
+            return;
+        }
+        $cacheItemPrototype = &$this->cacheItemPrototype;
+        $createCacheItem = \Closure::bind(
+            static function ($key, $value, $allowInt = false) use (&$cacheItemPrototype) {
+                $item = clone $cacheItemPrototype;
+                $item->poolHash = $item->innerItem = null;
+                $item->key = $allowInt && \is_int($key) ? (string) $key : CacheItem::validateKey($key);
+                $item->value = $value;
+                $item->isHit = false;
+
+                return $item;
+            },
+            null,
+            CacheItem::class
+        );
+        $this->createCacheItem = function ($key, $value, $allowInt = false) use ($createCacheItem) {
+            if (null === $this->cacheItemPrototype) {
+                $this->get($allowInt && \is_int($key) ? (string) $key : $key);
+            }
+            $this->createCacheItem = $createCacheItem;
+
+            return $createCacheItem($key, null, $allowInt)->set($value);
+        };
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return mixed
+     */
+    public function get($key, $default = null)
+    {
+        try {
+            $item = $this->pool->getItem($key);
+        } catch (SimpleCacheException $e) {
+            throw $e;
+        } catch (Psr6CacheException $e) {
+            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
+        }
+        if (null === $this->cacheItemPrototype) {
+            $this->cacheItemPrototype = clone $item;
+            $this->cacheItemPrototype->set(null);
+        }
+
+        return $item->isHit() ? $item->get() : $default;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return bool
+     */
+    public function set($key, $value, $ttl = null)
+    {
+        try {
+            if (null !== $f = $this->createCacheItem) {
+                $item = $f($key, $value);
+            } else {
+                $item = $this->pool->getItem($key)->set($value);
+            }
+        } catch (SimpleCacheException $e) {
+            throw $e;
+        } catch (Psr6CacheException $e) {
+            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
+        }
+        if (null !== $ttl) {
+            $item->expiresAfter($ttl);
+        }
+
+        return $this->pool->save($item);
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return bool
+     */
+    public function delete($key)
+    {
+        try {
+            return $this->pool->deleteItem($key);
+        } catch (SimpleCacheException $e) {
+            throw $e;
+        } catch (Psr6CacheException $e) {
+            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return bool
+     */
+    public function clear()
+    {
+        return $this->pool->clear();
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return iterable
+     */
+    public function getMultiple($keys, $default = null)
+    {
+        if ($keys instanceof \Traversable) {
+            $keys = iterator_to_array($keys, false);
+        } elseif (!\is_array($keys)) {
+            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys)));
+        }
+
+        try {
+            $items = $this->pool->getItems($keys);
+        } catch (SimpleCacheException $e) {
+            throw $e;
+        } catch (Psr6CacheException $e) {
+            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
+        }
+        $values = [];
+
+        if (!$this->pool instanceof AdapterInterface) {
+            foreach ($items as $key => $item) {
+                $values[$key] = $item->isHit() ? $item->get() : $default;
+            }
+
+            return $values;
+        }
+
+        foreach ($items as $key => $item) {
+            if (!$item->isHit()) {
+                $values[$key] = $default;
+                continue;
+            }
+            $values[$key] = $item->get();
+
+            if (!$metadata = $item->getMetadata()) {
+                continue;
+            }
+            unset($metadata[CacheItem::METADATA_TAGS]);
+
+            if ($metadata) {
+                $values[$key] = ["\x9D".pack('VN', (int) (0.1 + $metadata[CacheItem::METADATA_EXPIRY] - self::METADATA_EXPIRY_OFFSET), $metadata[CacheItem::METADATA_CTIME])."\x5F" => $values[$key]];
+            }
+        }
+
+        return $values;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return bool
+     */
+    public function setMultiple($values, $ttl = null)
+    {
+        $valuesIsArray = \is_array($values);
+        if (!$valuesIsArray && !$values instanceof \Traversable) {
+            throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given.', \is_object($values) ? \get_class($values) : \gettype($values)));
+        }
+        $items = [];
+
+        try {
+            if (null !== $f = $this->createCacheItem) {
+                $valuesIsArray = false;
+                foreach ($values as $key => $value) {
+                    $items[$key] = $f($key, $value, true);
+                }
+            } elseif ($valuesIsArray) {
+                $items = [];
+                foreach ($values as $key => $value) {
+                    $items[] = (string) $key;
+                }
+                $items = $this->pool->getItems($items);
+            } else {
+                foreach ($values as $key => $value) {
+                    if (\is_int($key)) {
+                        $key = (string) $key;
+                    }
+                    $items[$key] = $this->pool->getItem($key)->set($value);
+                }
+            }
+        } catch (SimpleCacheException $e) {
+            throw $e;
+        } catch (Psr6CacheException $e) {
+            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
+        }
+        $ok = true;
+
+        foreach ($items as $key => $item) {
+            if ($valuesIsArray) {
+                $item->set($values[$key]);
+            }
+            if (null !== $ttl) {
+                $item->expiresAfter($ttl);
+            }
+            $ok = $this->pool->saveDeferred($item) && $ok;
+        }
+
+        return $this->pool->commit() && $ok;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return bool
+     */
+    public function deleteMultiple($keys)
+    {
+        if ($keys instanceof \Traversable) {
+            $keys = iterator_to_array($keys, false);
+        } elseif (!\is_array($keys)) {
+            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys)));
+        }
+
+        try {
+            return $this->pool->deleteItems($keys);
+        } catch (SimpleCacheException $e) {
+            throw $e;
+        } catch (Psr6CacheException $e) {
+            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return bool
+     */
+    public function has($key)
+    {
+        try {
+            return $this->pool->hasItem($key);
+        } catch (SimpleCacheException $e) {
+            throw $e;
+        } catch (Psr6CacheException $e) {
+            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/README.md b/advancedcontentfilter/vendor/symfony/cache/README.md
index c4ab7520..c466d578 100644
--- a/advancedcontentfilter/vendor/symfony/cache/README.md
+++ b/advancedcontentfilter/vendor/symfony/cache/README.md
@@ -1,18 +1,19 @@
 Symfony PSR-6 implementation for caching
 ========================================
 
-This component provides an extended [PSR-6](http://www.php-fig.org/psr/psr-6/)
-implementation for adding cache to your applications. It is designed to have a
-low overhead so that caching is fastest. It ships with a few caching adapters
-for the most widespread and suited to caching backends. It also provides a
-`doctrine/cache` proxy adapter to cover more advanced caching needs and a proxy
-adapter for greater interoperability between PSR-6 implementations.
+The Cache component provides extended
+[PSR-6](https://www.php-fig.org/psr/psr-6/) implementations for adding cache to
+your applications. It is designed to have a low overhead so that caching is
+fastest. It ships with adapters for the most widespread caching backends.
+It also provides a [PSR-16](https://www.php-fig.org/psr/psr-16/) adapter,
+and implementations for [symfony/cache-contracts](https://github.com/symfony/cache-contracts)'
+`CacheInterface` and `TagAwareCacheInterface`.
 
 Resources
 ---------
 
-  * [Documentation](https://symfony.com/doc/current/components/cache.html)
-  * [Contributing](https://symfony.com/doc/current/contributing/index.html)
-  * [Report issues](https://github.com/symfony/symfony/issues) and
-    [send Pull Requests](https://github.com/symfony/symfony/pulls)
-    in the [main Symfony repository](https://github.com/symfony/symfony)
+ * [Documentation](https://symfony.com/doc/current/components/cache.html)
+ * [Contributing](https://symfony.com/doc/current/contributing/index.html)
+ * [Report issues](https://github.com/symfony/symfony/issues) and
+   [send Pull Requests](https://github.com/symfony/symfony/pulls)
+   in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/advancedcontentfilter/vendor/symfony/cache/ResettableInterface.php b/advancedcontentfilter/vendor/symfony/cache/ResettableInterface.php
index 6be72861..7b0a853f 100644
--- a/advancedcontentfilter/vendor/symfony/cache/ResettableInterface.php
+++ b/advancedcontentfilter/vendor/symfony/cache/ResettableInterface.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Cache;
 
+use Symfony\Contracts\Service\ResetInterface;
+
 /**
  * Resets a pool's local state.
  */
-interface ResettableInterface
+interface ResettableInterface extends ResetInterface
 {
-    public function reset();
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/AbstractCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/AbstractCache.php
index baedb737..c3d8b38c 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/AbstractCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/AbstractCache.php
@@ -12,37 +12,37 @@
 namespace Symfony\Component\Cache\Simple;
 
 use Psr\Log\LoggerAwareInterface;
-use Psr\SimpleCache\CacheInterface;
+use Psr\SimpleCache\CacheInterface as Psr16CacheInterface;
+use Symfony\Component\Cache\Adapter\AbstractAdapter;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\ResettableInterface;
 use Symfony\Component\Cache\Traits\AbstractTrait;
+use Symfony\Contracts\Cache\CacheInterface;
+
+@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', AbstractCache::class, AbstractAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
 
 /**
- * @author Nicolas Grekas <p@tchwork.com>
+ * @deprecated since Symfony 4.3, use AbstractAdapter and type-hint for CacheInterface instead.
  */
-abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, ResettableInterface
+abstract class AbstractCache implements Psr16CacheInterface, LoggerAwareInterface, ResettableInterface
 {
-    /**
-     * @internal
-     */
-    const NS_SEPARATOR = ':';
-
     use AbstractTrait {
         deleteItems as private;
         AbstractTrait::deleteItem as delete;
         AbstractTrait::hasItem as has;
     }
 
+    /**
+     * @internal
+     */
+    protected const NS_SEPARATOR = ':';
+
     private $defaultLifetime;
 
-    /**
-     * @param string $namespace
-     * @param int    $defaultLifetime
-     */
-    protected function __construct($namespace = '', $defaultLifetime = 0)
+    protected function __construct(string $namespace = '', int $defaultLifetime = 0)
     {
-        $this->defaultLifetime = max(0, (int) $defaultLifetime);
+        $this->defaultLifetime = max(0, $defaultLifetime);
         $this->namespace = '' === $namespace ? '' : CacheItem::validateKey($namespace).':';
         if (null !== $this->maxIdLength && \strlen($namespace) > $this->maxIdLength - 24) {
             throw new InvalidArgumentException(sprintf('Namespace must be %d chars max, %d given ("%s").', $this->maxIdLength - 24, \strlen($namespace), $namespace));
@@ -61,7 +61,7 @@ abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, Re
                 return $value;
             }
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to fetch key "{key}"', ['key' => $key, 'exception' => $e]);
+            CacheItem::log($this->logger, 'Failed to fetch key "{key}": '.$e->getMessage(), ['key' => $key, 'exception' => $e]);
         }
 
         return $default;
@@ -69,6 +69,8 @@ abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, Re
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function set($key, $value, $ttl = null)
     {
@@ -79,6 +81,8 @@ abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, Re
 
     /**
      * {@inheritdoc}
+     *
+     * @return iterable
      */
     public function getMultiple($keys, $default = null)
     {
@@ -95,7 +99,7 @@ abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, Re
         try {
             $values = $this->doFetch($ids);
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to fetch requested values', ['keys' => $keys, 'exception' => $e]);
+            CacheItem::log($this->logger, 'Failed to fetch values: '.$e->getMessage(), ['keys' => $keys, 'exception' => $e]);
             $values = [];
         }
         $ids = array_combine($ids, $keys);
@@ -105,6 +109,8 @@ abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, Re
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function setMultiple($values, $ttl = null)
     {
@@ -134,13 +140,16 @@ abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, Re
         foreach (\is_array($e) ? $e : array_keys($valuesById) as $id) {
             $keys[] = substr($id, \strlen($this->namespace));
         }
-        CacheItem::log($this->logger, 'Failed to save values', ['keys' => $keys, 'exception' => $e instanceof \Exception ? $e : null]);
+        $message = 'Failed to save values'.($e instanceof \Exception ? ': '.$e->getMessage() : '.');
+        CacheItem::log($this->logger, $message, ['keys' => $keys, 'exception' => $e instanceof \Exception ? $e : null]);
 
         return false;
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function deleteMultiple($keys)
     {
@@ -168,19 +177,19 @@ abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, Re
         throw new InvalidArgumentException(sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given.', \is_object($ttl) ? \get_class($ttl) : \gettype($ttl)));
     }
 
-    private function generateValues($values, &$keys, $default)
+    private function generateValues(iterable $values, array &$keys, $default): iterable
     {
         try {
             foreach ($values as $id => $value) {
                 if (!isset($keys[$id])) {
-                    $id = key($keys);
+                    throw new InvalidArgumentException(sprintf('Could not match value id "%s" to keys "%s".', $id, implode('", "', $keys)));
                 }
                 $key = $keys[$id];
                 unset($keys[$id]);
                 yield $key => $value;
             }
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to fetch requested values', ['keys' => array_values($keys), 'exception' => $e]);
+            CacheItem::log($this->logger, 'Failed to fetch values: '.$e->getMessage(), ['keys' => array_values($keys), 'exception' => $e]);
         }
 
         foreach ($keys as $key) {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/ApcuCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/ApcuCache.php
index e583b443..bef89e27 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/ApcuCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/ApcuCache.php
@@ -11,18 +11,20 @@
 
 namespace Symfony\Component\Cache\Simple;
 
+use Symfony\Component\Cache\Adapter\ApcuAdapter;
 use Symfony\Component\Cache\Traits\ApcuTrait;
+use Symfony\Contracts\Cache\CacheInterface;
 
+@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', ApcuCache::class, ApcuAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
+
+/**
+ * @deprecated since Symfony 4.3, use ApcuAdapter and type-hint for CacheInterface instead.
+ */
 class ApcuCache extends AbstractCache
 {
     use ApcuTrait;
 
-    /**
-     * @param string      $namespace
-     * @param int         $defaultLifetime
-     * @param string|null $version
-     */
-    public function __construct($namespace = '', $defaultLifetime = 0, $version = null)
+    public function __construct(string $namespace = '', int $defaultLifetime = 0, string $version = null)
     {
         $this->init($namespace, $defaultLifetime, $version);
     }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/ArrayCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/ArrayCache.php
index 6013f0ad..469edf1c 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/ArrayCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/ArrayCache.php
@@ -12,16 +12,20 @@
 namespace Symfony\Component\Cache\Simple;
 
 use Psr\Log\LoggerAwareInterface;
-use Psr\SimpleCache\CacheInterface;
+use Psr\SimpleCache\CacheInterface as Psr16CacheInterface;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\ResettableInterface;
 use Symfony\Component\Cache\Traits\ArrayTrait;
+use Symfony\Contracts\Cache\CacheInterface;
+
+@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', ArrayCache::class, ArrayAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
 
 /**
- * @author Nicolas Grekas <p@tchwork.com>
+ * @deprecated since Symfony 4.3, use ArrayAdapter and type-hint for CacheInterface instead.
  */
-class ArrayCache implements CacheInterface, LoggerAwareInterface, ResettableInterface
+class ArrayCache implements Psr16CacheInterface, LoggerAwareInterface, ResettableInterface
 {
     use ArrayTrait {
         ArrayTrait::deleteItem as delete;
@@ -31,12 +35,11 @@ class ArrayCache implements CacheInterface, LoggerAwareInterface, ResettableInte
     private $defaultLifetime;
 
     /**
-     * @param int  $defaultLifetime
      * @param bool $storeSerialized Disabling serialization can lead to cache corruptions when storing mutable values but increases performance otherwise
      */
-    public function __construct($defaultLifetime = 0, $storeSerialized = true)
+    public function __construct(int $defaultLifetime = 0, bool $storeSerialized = true)
     {
-        $this->defaultLifetime = (int) $defaultLifetime;
+        $this->defaultLifetime = $defaultLifetime;
         $this->storeSerialized = $storeSerialized;
     }
 
@@ -45,13 +48,26 @@ class ArrayCache implements CacheInterface, LoggerAwareInterface, ResettableInte
      */
     public function get($key, $default = null)
     {
-        foreach ($this->getMultiple([$key], $default) as $v) {
-            return $v;
+        if (!\is_string($key) || !isset($this->expiries[$key])) {
+            CacheItem::validateKey($key);
         }
+        if (!$isHit = isset($this->expiries[$key]) && ($this->expiries[$key] > microtime(true) || !$this->delete($key))) {
+            $this->values[$key] = null;
+
+            return $default;
+        }
+        if (!$this->storeSerialized) {
+            return $this->values[$key];
+        }
+        $value = $this->unfreeze($key, $isHit);
+
+        return $isHit ? $value : $default;
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @return iterable
      */
     public function getMultiple($keys, $default = null)
     {
@@ -61,14 +77,18 @@ class ArrayCache implements CacheInterface, LoggerAwareInterface, ResettableInte
             throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys)));
         }
         foreach ($keys as $key) {
-            CacheItem::validateKey($key);
+            if (!\is_string($key) || !isset($this->expiries[$key])) {
+                CacheItem::validateKey($key);
+            }
         }
 
-        return $this->generateItems($keys, time(), function ($k, $v, $hit) use ($default) { return $hit ? $v : $default; });
+        return $this->generateItems($keys, microtime(true), function ($k, $v, $hit) use ($default) { return $hit ? $v : $default; });
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function deleteMultiple($keys)
     {
@@ -84,16 +104,22 @@ class ArrayCache implements CacheInterface, LoggerAwareInterface, ResettableInte
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function set($key, $value, $ttl = null)
     {
-        CacheItem::validateKey($key);
+        if (!\is_string($key)) {
+            CacheItem::validateKey($key);
+        }
 
         return $this->setMultiple([$key => $value], $ttl);
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function setMultiple($values, $ttl = null)
     {
@@ -103,27 +129,20 @@ class ArrayCache implements CacheInterface, LoggerAwareInterface, ResettableInte
         $valuesArray = [];
 
         foreach ($values as $key => $value) {
-            \is_int($key) || CacheItem::validateKey($key);
+            if (!\is_int($key) && !(\is_string($key) && isset($this->expiries[$key]))) {
+                CacheItem::validateKey($key);
+            }
             $valuesArray[$key] = $value;
         }
         if (false === $ttl = $this->normalizeTtl($ttl)) {
             return $this->deleteMultiple(array_keys($valuesArray));
         }
-        if ($this->storeSerialized) {
-            foreach ($valuesArray as $key => $value) {
-                try {
-                    $valuesArray[$key] = serialize($value);
-                } catch (\Exception $e) {
-                    $type = \is_object($value) ? \get_class($value) : \gettype($value);
-                    CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', ['key' => $key, 'type' => $type, 'exception' => $e]);
-
-                    return false;
-                }
-            }
-        }
-        $expiry = 0 < $ttl ? time() + $ttl : \PHP_INT_MAX;
+        $expiry = 0 < $ttl ? microtime(true) + $ttl : \PHP_INT_MAX;
 
         foreach ($valuesArray as $key => $value) {
+            if ($this->storeSerialized && null === $value = $this->freeze($value, $key)) {
+                return false;
+            }
             $this->values[$key] = $value;
             $this->expiries[$key] = $expiry;
         }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/ChainCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/ChainCache.php
index 2e6c7277..bae95072 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/ChainCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/ChainCache.php
@@ -11,10 +11,15 @@
 
 namespace Symfony\Component\Cache\Simple;
 
-use Psr\SimpleCache\CacheInterface;
+use Psr\SimpleCache\CacheInterface as Psr16CacheInterface;
+use Symfony\Component\Cache\Adapter\ChainAdapter;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\ResettableInterface;
+use Symfony\Contracts\Cache\CacheInterface;
+use Symfony\Contracts\Service\ResetInterface;
+
+@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', ChainCache::class, ChainAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
 
 /**
  * Chains several caches together.
@@ -22,9 +27,9 @@ use Symfony\Component\Cache\ResettableInterface;
  * Cached items are fetched from the first cache having them in its data store.
  * They are saved and deleted in all caches at once.
  *
- * @author Nicolas Grekas <p@tchwork.com>
+ * @deprecated since Symfony 4.3, use ChainAdapter and type-hint for CacheInterface instead.
  */
-class ChainCache implements CacheInterface, PruneableInterface, ResettableInterface
+class ChainCache implements Psr16CacheInterface, PruneableInterface, ResettableInterface
 {
     private $miss;
     private $caches = [];
@@ -32,25 +37,25 @@ class ChainCache implements CacheInterface, PruneableInterface, ResettableInterf
     private $cacheCount;
 
     /**
-     * @param CacheInterface[] $caches          The ordered list of caches used to fetch cached items
-     * @param int              $defaultLifetime The lifetime of items propagated from lower caches to upper ones
+     * @param Psr16CacheInterface[] $caches          The ordered list of caches used to fetch cached items
+     * @param int                   $defaultLifetime The lifetime of items propagated from lower caches to upper ones
      */
-    public function __construct(array $caches, $defaultLifetime = 0)
+    public function __construct(array $caches, int $defaultLifetime = 0)
     {
         if (!$caches) {
             throw new InvalidArgumentException('At least one cache must be specified.');
         }
 
         foreach ($caches as $cache) {
-            if (!$cache instanceof CacheInterface) {
-                throw new InvalidArgumentException(sprintf('The class "%s" does not implement the "%s" interface.', \get_class($cache), CacheInterface::class));
+            if (!$cache instanceof Psr16CacheInterface) {
+                throw new InvalidArgumentException(sprintf('The class "%s" does not implement the "%s" interface.', \get_class($cache), Psr16CacheInterface::class));
             }
         }
 
         $this->miss = new \stdClass();
         $this->caches = array_values($caches);
         $this->cacheCount = \count($this->caches);
-        $this->defaultLifetime = 0 < $defaultLifetime ? (int) $defaultLifetime : null;
+        $this->defaultLifetime = 0 < $defaultLifetime ? $defaultLifetime : null;
     }
 
     /**
@@ -77,6 +82,8 @@ class ChainCache implements CacheInterface, PruneableInterface, ResettableInterf
 
     /**
      * {@inheritdoc}
+     *
+     * @return iterable
      */
     public function getMultiple($keys, $default = null)
     {
@@ -85,11 +92,11 @@ class ChainCache implements CacheInterface, PruneableInterface, ResettableInterf
         return $this->generateItems($this->caches[0]->getMultiple($keys, $miss), 0, $miss, $default);
     }
 
-    private function generateItems($values, $cacheIndex, $miss, $default)
+    private function generateItems(iterable $values, int $cacheIndex, $miss, $default): iterable
     {
         $missing = [];
         $nextCacheIndex = $cacheIndex + 1;
-        $nextCache = isset($this->caches[$nextCacheIndex]) ? $this->caches[$nextCacheIndex] : null;
+        $nextCache = $this->caches[$nextCacheIndex] ?? null;
 
         foreach ($values as $k => $value) {
             if ($miss !== $value) {
@@ -118,6 +125,8 @@ class ChainCache implements CacheInterface, PruneableInterface, ResettableInterf
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function has($key)
     {
@@ -132,6 +141,8 @@ class ChainCache implements CacheInterface, PruneableInterface, ResettableInterf
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function clear()
     {
@@ -147,6 +158,8 @@ class ChainCache implements CacheInterface, PruneableInterface, ResettableInterf
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function delete($key)
     {
@@ -162,6 +175,8 @@ class ChainCache implements CacheInterface, PruneableInterface, ResettableInterf
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function deleteMultiple($keys)
     {
@@ -180,6 +195,8 @@ class ChainCache implements CacheInterface, PruneableInterface, ResettableInterf
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function set($key, $value, $ttl = null)
     {
@@ -195,6 +212,8 @@ class ChainCache implements CacheInterface, PruneableInterface, ResettableInterf
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function setMultiple($values, $ttl = null)
     {
@@ -244,7 +263,7 @@ class ChainCache implements CacheInterface, PruneableInterface, ResettableInterf
     public function reset()
     {
         foreach ($this->caches as $cache) {
-            if ($cache instanceof ResettableInterface) {
+            if ($cache instanceof ResetInterface) {
                 $cache->reset();
             }
         }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/DoctrineCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/DoctrineCache.php
index ea1a4eda..d7feb4d3 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/DoctrineCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/DoctrineCache.php
@@ -12,17 +12,20 @@
 namespace Symfony\Component\Cache\Simple;
 
 use Doctrine\Common\Cache\CacheProvider;
+use Symfony\Component\Cache\Adapter\DoctrineAdapter;
 use Symfony\Component\Cache\Traits\DoctrineTrait;
+use Symfony\Contracts\Cache\CacheInterface;
 
+@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', DoctrineCache::class, DoctrineAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
+
+/**
+ * @deprecated since Symfony 4.3, use DoctrineAdapter and type-hint for CacheInterface instead.
+ */
 class DoctrineCache extends AbstractCache
 {
     use DoctrineTrait;
 
-    /**
-     * @param string $namespace
-     * @param int    $defaultLifetime
-     */
-    public function __construct(CacheProvider $provider, $namespace = '', $defaultLifetime = 0)
+    public function __construct(CacheProvider $provider, string $namespace = '', int $defaultLifetime = 0)
     {
         parent::__construct('', $defaultLifetime);
         $this->provider = $provider;
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/FilesystemCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/FilesystemCache.php
index ccd57953..fcc8a170 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/FilesystemCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/FilesystemCache.php
@@ -11,20 +11,25 @@
 
 namespace Symfony\Component\Cache\Simple;
 
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use Symfony\Component\Cache\Marshaller\DefaultMarshaller;
+use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\Traits\FilesystemTrait;
+use Symfony\Contracts\Cache\CacheInterface;
 
+@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', FilesystemCache::class, FilesystemAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
+
+/**
+ * @deprecated since Symfony 4.3, use FilesystemAdapter and type-hint for CacheInterface instead.
+ */
 class FilesystemCache extends AbstractCache implements PruneableInterface
 {
     use FilesystemTrait;
 
-    /**
-     * @param string      $namespace
-     * @param int         $defaultLifetime
-     * @param string|null $directory
-     */
-    public function __construct($namespace = '', $defaultLifetime = 0, $directory = null)
+    public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, MarshallerInterface $marshaller = null)
     {
+        $this->marshaller = $marshaller ?? new DefaultMarshaller();
         parent::__construct('', $defaultLifetime);
         $this->init($namespace, $directory);
     }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/MemcachedCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/MemcachedCache.php
index 94a9f297..1f636486 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/MemcachedCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/MemcachedCache.php
@@ -11,20 +11,24 @@
 
 namespace Symfony\Component\Cache\Simple;
 
+use Symfony\Component\Cache\Adapter\MemcachedAdapter;
+use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 use Symfony\Component\Cache\Traits\MemcachedTrait;
+use Symfony\Contracts\Cache\CacheInterface;
 
+@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', MemcachedCache::class, MemcachedAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
+
+/**
+ * @deprecated since Symfony 4.3, use MemcachedAdapter and type-hint for CacheInterface instead.
+ */
 class MemcachedCache extends AbstractCache
 {
     use MemcachedTrait;
 
     protected $maxIdLength = 250;
 
-    /**
-     * @param string $namespace
-     * @param int    $defaultLifetime
-     */
-    public function __construct(\Memcached $client, $namespace = '', $defaultLifetime = 0)
+    public function __construct(\Memcached $client, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
     {
-        $this->init($client, $namespace, $defaultLifetime);
+        $this->init($client, $namespace, $defaultLifetime, $marshaller);
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/NullCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/NullCache.php
index fa986aeb..fcbd39d5 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/NullCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/NullCache.php
@@ -11,12 +11,16 @@
 
 namespace Symfony\Component\Cache\Simple;
 
-use Psr\SimpleCache\CacheInterface;
+use Psr\SimpleCache\CacheInterface as Psr16CacheInterface;
+use Symfony\Component\Cache\Adapter\NullAdapter;
+use Symfony\Contracts\Cache\CacheInterface;
+
+@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', NullCache::class, NullAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
 
 /**
- * @author Nicolas Grekas <p@tchwork.com>
+ * @deprecated since Symfony 4.3, use NullAdapter and type-hint for CacheInterface instead.
  */
-class NullCache implements CacheInterface
+class NullCache implements Psr16CacheInterface
 {
     /**
      * {@inheritdoc}
@@ -28,6 +32,8 @@ class NullCache implements CacheInterface
 
     /**
      * {@inheritdoc}
+     *
+     * @return iterable
      */
     public function getMultiple($keys, $default = null)
     {
@@ -38,6 +44,8 @@ class NullCache implements CacheInterface
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function has($key)
     {
@@ -46,6 +54,8 @@ class NullCache implements CacheInterface
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function clear()
     {
@@ -54,6 +64,8 @@ class NullCache implements CacheInterface
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function delete($key)
     {
@@ -62,6 +74,8 @@ class NullCache implements CacheInterface
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function deleteMultiple($keys)
     {
@@ -70,6 +84,8 @@ class NullCache implements CacheInterface
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function set($key, $value, $ttl = null)
     {
@@ -78,6 +94,8 @@ class NullCache implements CacheInterface
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function setMultiple($values, $ttl = null)
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/PdoCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/PdoCache.php
index c92e049a..7011ea07 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/PdoCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/PdoCache.php
@@ -11,9 +11,17 @@
 
 namespace Symfony\Component\Cache\Simple;
 
+use Symfony\Component\Cache\Adapter\PdoAdapter;
+use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\Traits\PdoTrait;
+use Symfony\Contracts\Cache\CacheInterface;
 
+@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', PdoCache::class, PdoAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
+
+/**
+ * @deprecated since Symfony 4.3, use PdoAdapter and type-hint for CacheInterface instead.
+ */
 class PdoCache extends AbstractCache implements PruneableInterface
 {
     use PdoTrait;
@@ -25,6 +33,9 @@ class PdoCache extends AbstractCache implements PruneableInterface
      * a Doctrine DBAL Connection or a DSN string that will be used to
      * lazy-connect to the database when the cache is actually used.
      *
+     * When a Doctrine DBAL Connection is passed, the cache table is created
+     * automatically when possible. Otherwise, use the createTable() method.
+     *
      * List of available options:
      *  * db_table: The name of the table [default: cache_items]
      *  * db_id_col: The column where to store the cache id [default: item_id]
@@ -35,17 +46,14 @@ class PdoCache extends AbstractCache implements PruneableInterface
      *  * db_password: The password when lazy-connect [default: '']
      *  * db_connection_options: An array of driver-specific connection options [default: []]
      *
-     * @param \PDO|Connection|string $connOrDsn       A \PDO or Connection instance or DSN string or null
-     * @param string                 $namespace
-     * @param int                    $defaultLifetime
-     * @param array                  $options         An associative array of options
+     * @param \PDO|Connection|string $connOrDsn a \PDO or Connection instance or DSN string or null
      *
      * @throws InvalidArgumentException When first argument is not PDO nor Connection nor string
      * @throws InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION
      * @throws InvalidArgumentException When namespace contains invalid characters
      */
-    public function __construct($connOrDsn, $namespace = '', $defaultLifetime = 0, array $options = [])
+    public function __construct($connOrDsn, string $namespace = '', int $defaultLifetime = 0, array $options = [], MarshallerInterface $marshaller = null)
     {
-        $this->init($connOrDsn, $namespace, $defaultLifetime, $options);
+        $this->init($connOrDsn, $namespace, $defaultLifetime, $options, $marshaller);
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/PhpArrayCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/PhpArrayCache.php
index 7bb25ff8..10c7340a 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/PhpArrayCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/PhpArrayCache.php
@@ -11,51 +11,44 @@
 
 namespace Symfony\Component\Cache\Simple;
 
-use Psr\SimpleCache\CacheInterface;
+use Psr\SimpleCache\CacheInterface as Psr16CacheInterface;
+use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\ResettableInterface;
 use Symfony\Component\Cache\Traits\PhpArrayTrait;
+use Symfony\Contracts\Cache\CacheInterface;
+
+@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', PhpArrayCache::class, PhpArrayAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
 
 /**
- * Caches items at warm up time using a PHP array that is stored in shared memory by OPCache since PHP 7.0.
- * Warmed up items are read-only and run-time discovered items are cached using a fallback adapter.
- *
- * @author Titouan Galopin <galopintitouan@gmail.com>
- * @author Nicolas Grekas <p@tchwork.com>
+ * @deprecated since Symfony 4.3, use PhpArrayAdapter and type-hint for CacheInterface instead.
  */
-class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInterface
+class PhpArrayCache implements Psr16CacheInterface, PruneableInterface, ResettableInterface
 {
     use PhpArrayTrait;
 
     /**
-     * @param string         $file         The PHP file were values are cached
-     * @param CacheInterface $fallbackPool A pool to fallback on when an item is not hit
+     * @param string              $file         The PHP file were values are cached
+     * @param Psr16CacheInterface $fallbackPool A pool to fallback on when an item is not hit
      */
-    public function __construct($file, CacheInterface $fallbackPool)
+    public function __construct(string $file, Psr16CacheInterface $fallbackPool)
     {
         $this->file = $file;
         $this->pool = $fallbackPool;
-        $this->zendDetectUnicode = filter_var(ini_get('zend.detect_unicode'), \FILTER_VALIDATE_BOOLEAN);
     }
 
     /**
-     * This adapter should only be used on PHP 7.0+ to take advantage of how PHP
-     * stores arrays in its latest versions. This factory method decorates the given
-     * fallback pool with this adapter only if the current PHP version is supported.
+     * This adapter takes advantage of how PHP stores arrays in its latest versions.
      *
      * @param string         $file         The PHP file were values are cached
      * @param CacheInterface $fallbackPool A pool to fallback on when an item is not hit
      *
-     * @return CacheInterface
+     * @return Psr16CacheInterface
      */
-    public static function create($file, CacheInterface $fallbackPool)
+    public static function create($file, Psr16CacheInterface $fallbackPool)
     {
-        if (\PHP_VERSION_ID >= 70000) {
-            return new static($file, $fallbackPool);
-        }
-
-        return $fallbackPool;
+        return new static($file, $fallbackPool);
     }
 
     /**
@@ -69,22 +62,18 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
         if (null === $this->values) {
             $this->initialize();
         }
-        if (!isset($this->values[$key])) {
+        if (!isset($this->keys[$key])) {
             return $this->pool->get($key, $default);
         }
-
-        $value = $this->values[$key];
+        $value = $this->values[$this->keys[$key]];
 
         if ('N;' === $value) {
-            $value = null;
-        } elseif (\is_string($value) && isset($value[2]) && ':' === $value[1]) {
+            return null;
+        }
+        if ($value instanceof \Closure) {
             try {
-                $e = null;
-                $value = unserialize($value);
-            } catch (\Error $e) {
-            } catch (\Exception $e) {
-            }
-            if (null !== $e) {
+                return $value();
+            } catch (\Throwable $e) {
                 return $default;
             }
         }
@@ -94,6 +83,8 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
 
     /**
      * {@inheritdoc}
+     *
+     * @return iterable
      */
     public function getMultiple($keys, $default = null)
     {
@@ -116,6 +107,8 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function has($key)
     {
@@ -126,11 +119,13 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
             $this->initialize();
         }
 
-        return isset($this->values[$key]) || $this->pool->has($key);
+        return isset($this->keys[$key]) || $this->pool->has($key);
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function delete($key)
     {
@@ -141,11 +136,13 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
             $this->initialize();
         }
 
-        return !isset($this->values[$key]) && $this->pool->delete($key);
+        return !isset($this->keys[$key]) && $this->pool->delete($key);
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function deleteMultiple($keys)
     {
@@ -161,7 +158,7 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
                 throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
             }
 
-            if (isset($this->values[$key])) {
+            if (isset($this->keys[$key])) {
                 $deleted = false;
             } else {
                 $fallbackKeys[] = $key;
@@ -180,6 +177,8 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function set($key, $value, $ttl = null)
     {
@@ -190,11 +189,13 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
             $this->initialize();
         }
 
-        return !isset($this->values[$key]) && $this->pool->set($key, $value, $ttl);
+        return !isset($this->keys[$key]) && $this->pool->set($key, $value, $ttl);
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function setMultiple($values, $ttl = null)
     {
@@ -210,7 +211,7 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
                 throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
             }
 
-            if (isset($this->values[$key])) {
+            if (isset($this->keys[$key])) {
                 $saved = false;
             } else {
                 $fallbackValues[$key] = $value;
@@ -224,22 +225,20 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
         return $saved;
     }
 
-    private function generateItems(array $keys, $default)
+    private function generateItems(array $keys, $default): iterable
     {
         $fallbackKeys = [];
 
         foreach ($keys as $key) {
-            if (isset($this->values[$key])) {
-                $value = $this->values[$key];
+            if (isset($this->keys[$key])) {
+                $value = $this->values[$this->keys[$key]];
 
                 if ('N;' === $value) {
                     yield $key => null;
-                } elseif (\is_string($value) && isset($value[2]) && ':' === $value[1]) {
+                } elseif ($value instanceof \Closure) {
                     try {
-                        yield $key => unserialize($value);
-                    } catch (\Error $e) {
-                        yield $key => $default;
-                    } catch (\Exception $e) {
+                        yield $key => $value();
+                    } catch (\Throwable $e) {
                         yield $key => $default;
                     }
                 } else {
@@ -251,9 +250,7 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
         }
 
         if ($fallbackKeys) {
-            foreach ($this->pool->getMultiple($fallbackKeys, $default) as $key => $item) {
-                yield $key => $item;
-            }
+            yield from $this->pool->getMultiple($fallbackKeys, $default);
         }
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/PhpFilesCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/PhpFilesCache.php
index 50c19034..9c79ae9a 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/PhpFilesCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/PhpFilesCache.php
@@ -11,31 +11,35 @@
 
 namespace Symfony\Component\Cache\Simple;
 
+use Symfony\Component\Cache\Adapter\PhpFilesAdapter;
 use Symfony\Component\Cache\Exception\CacheException;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\Traits\PhpFilesTrait;
+use Symfony\Contracts\Cache\CacheInterface;
 
+@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', PhpFilesCache::class, PhpFilesAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
+
+/**
+ * @deprecated since Symfony 4.3, use PhpFilesAdapter and type-hint for CacheInterface instead.
+ */
 class PhpFilesCache extends AbstractCache implements PruneableInterface
 {
     use PhpFilesTrait;
 
     /**
-     * @param string      $namespace
-     * @param int         $defaultLifetime
-     * @param string|null $directory
+     * @param $appendOnly Set to `true` to gain extra performance when the items stored in this pool never expire.
+     *                    Doing so is encouraged because it fits perfectly OPcache's memory model.
      *
      * @throws CacheException if OPcache is not enabled
      */
-    public function __construct($namespace = '', $defaultLifetime = 0, $directory = null)
+    public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, bool $appendOnly = false)
     {
-        if (!static::isSupported()) {
-            throw new CacheException('OPcache is not enabled.');
-        }
+        $this->appendOnly = $appendOnly;
+        self::$startTime = self::$startTime ?? $_SERVER['REQUEST_TIME'] ?? time();
         parent::__construct('', $defaultLifetime);
         $this->init($namespace, $directory);
-
-        $e = new \Exception();
-        $this->includeHandler = function () use ($e) { throw $e; };
-        $this->zendDetectUnicode = filter_var(ini_get('zend.detect_unicode'), \FILTER_VALIDATE_BOOLEAN);
+        $this->includeHandler = static function ($type, $msg, $file, $line) {
+            throw new \ErrorException($msg, 0, $type, $file, $line);
+        };
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/Psr6Cache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/Psr6Cache.php
index 6b3de205..366284b2 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/Psr6Cache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/Psr6Cache.php
@@ -11,231 +11,13 @@
 
 namespace Symfony\Component\Cache\Simple;
 
-use Psr\Cache\CacheException as Psr6CacheException;
-use Psr\Cache\CacheItemPoolInterface;
-use Psr\SimpleCache\CacheException as SimpleCacheException;
-use Psr\SimpleCache\CacheInterface;
-use Symfony\Component\Cache\Adapter\AdapterInterface;
-use Symfony\Component\Cache\CacheItem;
-use Symfony\Component\Cache\Exception\InvalidArgumentException;
-use Symfony\Component\Cache\PruneableInterface;
-use Symfony\Component\Cache\ResettableInterface;
-use Symfony\Component\Cache\Traits\ProxyTrait;
+use Symfony\Component\Cache\Psr16Cache;
+
+@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" instead.', Psr6Cache::class, Psr16Cache::class), \E_USER_DEPRECATED);
 
 /**
- * @author Nicolas Grekas <p@tchwork.com>
+ * @deprecated since Symfony 4.3, use Psr16Cache instead.
  */
-class Psr6Cache implements CacheInterface, PruneableInterface, ResettableInterface
+class Psr6Cache extends Psr16Cache
 {
-    use ProxyTrait;
-
-    private $createCacheItem;
-    private $cacheItemPrototype;
-
-    public function __construct(CacheItemPoolInterface $pool)
-    {
-        $this->pool = $pool;
-
-        if (!$pool instanceof AdapterInterface) {
-            return;
-        }
-        $cacheItemPrototype = &$this->cacheItemPrototype;
-        $createCacheItem = \Closure::bind(
-            static function ($key, $value, $allowInt = false) use (&$cacheItemPrototype) {
-                $item = clone $cacheItemPrototype;
-                $item->key = $allowInt && \is_int($key) ? (string) $key : CacheItem::validateKey($key);
-                $item->value = $value;
-                $item->isHit = false;
-
-                return $item;
-            },
-            null,
-            CacheItem::class
-        );
-        $this->createCacheItem = function ($key, $value, $allowInt = false) use ($createCacheItem) {
-            if (null === $this->cacheItemPrototype) {
-                $this->get($allowInt && \is_int($key) ? (string) $key : $key);
-            }
-            $this->createCacheItem = $createCacheItem;
-
-            return $createCacheItem($key, $value, $allowInt);
-        };
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function get($key, $default = null)
-    {
-        try {
-            $item = $this->pool->getItem($key);
-        } catch (SimpleCacheException $e) {
-            throw $e;
-        } catch (Psr6CacheException $e) {
-            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
-        }
-        if (null === $this->cacheItemPrototype) {
-            $this->cacheItemPrototype = clone $item;
-            $this->cacheItemPrototype->set(null);
-        }
-
-        return $item->isHit() ? $item->get() : $default;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function set($key, $value, $ttl = null)
-    {
-        try {
-            if (null !== $f = $this->createCacheItem) {
-                $item = $f($key, $value);
-            } else {
-                $item = $this->pool->getItem($key)->set($value);
-            }
-        } catch (SimpleCacheException $e) {
-            throw $e;
-        } catch (Psr6CacheException $e) {
-            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
-        }
-        if (null !== $ttl) {
-            $item->expiresAfter($ttl);
-        }
-
-        return $this->pool->save($item);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function delete($key)
-    {
-        try {
-            return $this->pool->deleteItem($key);
-        } catch (SimpleCacheException $e) {
-            throw $e;
-        } catch (Psr6CacheException $e) {
-            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function clear()
-    {
-        return $this->pool->clear();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMultiple($keys, $default = null)
-    {
-        if ($keys instanceof \Traversable) {
-            $keys = iterator_to_array($keys, false);
-        } elseif (!\is_array($keys)) {
-            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys)));
-        }
-
-        try {
-            $items = $this->pool->getItems($keys);
-        } catch (SimpleCacheException $e) {
-            throw $e;
-        } catch (Psr6CacheException $e) {
-            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
-        }
-        $values = [];
-
-        foreach ($items as $key => $item) {
-            $values[$key] = $item->isHit() ? $item->get() : $default;
-        }
-
-        return $values;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setMultiple($values, $ttl = null)
-    {
-        $valuesIsArray = \is_array($values);
-        if (!$valuesIsArray && !$values instanceof \Traversable) {
-            throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given.', \is_object($values) ? \get_class($values) : \gettype($values)));
-        }
-        $items = [];
-
-        try {
-            if (null !== $f = $this->createCacheItem) {
-                $valuesIsArray = false;
-                foreach ($values as $key => $value) {
-                    $items[$key] = $f($key, $value, true);
-                }
-            } elseif ($valuesIsArray) {
-                $items = [];
-                foreach ($values as $key => $value) {
-                    $items[] = (string) $key;
-                }
-                $items = $this->pool->getItems($items);
-            } else {
-                foreach ($values as $key => $value) {
-                    if (\is_int($key)) {
-                        $key = (string) $key;
-                    }
-                    $items[$key] = $this->pool->getItem($key)->set($value);
-                }
-            }
-        } catch (SimpleCacheException $e) {
-            throw $e;
-        } catch (Psr6CacheException $e) {
-            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
-        }
-        $ok = true;
-
-        foreach ($items as $key => $item) {
-            if ($valuesIsArray) {
-                $item->set($values[$key]);
-            }
-            if (null !== $ttl) {
-                $item->expiresAfter($ttl);
-            }
-            $ok = $this->pool->saveDeferred($item) && $ok;
-        }
-
-        return $this->pool->commit() && $ok;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function deleteMultiple($keys)
-    {
-        if ($keys instanceof \Traversable) {
-            $keys = iterator_to_array($keys, false);
-        } elseif (!\is_array($keys)) {
-            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys)));
-        }
-
-        try {
-            return $this->pool->deleteItems($keys);
-        } catch (SimpleCacheException $e) {
-            throw $e;
-        } catch (Psr6CacheException $e) {
-            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function has($key)
-    {
-        try {
-            return $this->pool->hasItem($key);
-        } catch (SimpleCacheException $e) {
-            throw $e;
-        } catch (Psr6CacheException $e) {
-            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
-        }
-    }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/RedisCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/RedisCache.php
index e82c0627..e0a76fd6 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/RedisCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/RedisCache.php
@@ -11,19 +11,27 @@
 
 namespace Symfony\Component\Cache\Simple;
 
+use Symfony\Component\Cache\Adapter\RedisAdapter;
+use Symfony\Component\Cache\Marshaller\MarshallerInterface;
+use Symfony\Component\Cache\Traits\RedisClusterProxy;
+use Symfony\Component\Cache\Traits\RedisProxy;
 use Symfony\Component\Cache\Traits\RedisTrait;
+use Symfony\Contracts\Cache\CacheInterface;
 
+@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', RedisCache::class, RedisAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
+
+/**
+ * @deprecated since Symfony 4.3, use RedisAdapter and type-hint for CacheInterface instead.
+ */
 class RedisCache extends AbstractCache
 {
     use RedisTrait;
 
     /**
-     * @param \Redis|\RedisArray|\RedisCluster|\Predis\Client $redisClient
-     * @param string                                          $namespace
-     * @param int                                             $defaultLifetime
+     * @param \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy|RedisClusterProxy $redis
      */
-    public function __construct($redisClient, $namespace = '', $defaultLifetime = 0)
+    public function __construct($redis, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
     {
-        $this->init($redisClient, $namespace, $defaultLifetime);
+        $this->init($redis, $namespace, $defaultLifetime, $marshaller);
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/TraceableCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/TraceableCache.php
index 61b22963..0dae813e 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/TraceableCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/TraceableCache.php
@@ -11,22 +11,25 @@
 
 namespace Symfony\Component\Cache\Simple;
 
-use Psr\SimpleCache\CacheInterface;
+use Psr\SimpleCache\CacheInterface as Psr16CacheInterface;
+use Symfony\Component\Cache\Adapter\TraceableAdapter;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\ResettableInterface;
+use Symfony\Contracts\Cache\CacheInterface;
+use Symfony\Contracts\Service\ResetInterface;
+
+@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', TraceableCache::class, TraceableAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
 
 /**
- * An adapter that collects data about all cache calls.
- *
- * @author Nicolas Grekas <p@tchwork.com>
+ * @deprecated since Symfony 4.3, use TraceableAdapter and type-hint for CacheInterface instead.
  */
-class TraceableCache implements CacheInterface, PruneableInterface, ResettableInterface
+class TraceableCache implements Psr16CacheInterface, PruneableInterface, ResettableInterface
 {
     private $pool;
     private $miss;
     private $calls = [];
 
-    public function __construct(CacheInterface $pool)
+    public function __construct(Psr16CacheInterface $pool)
     {
         $this->pool = $pool;
         $this->miss = new \stdClass();
@@ -56,6 +59,8 @@ class TraceableCache implements CacheInterface, PruneableInterface, ResettableIn
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function has($key)
     {
@@ -69,6 +74,8 @@ class TraceableCache implements CacheInterface, PruneableInterface, ResettableIn
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function delete($key)
     {
@@ -82,6 +89,8 @@ class TraceableCache implements CacheInterface, PruneableInterface, ResettableIn
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function set($key, $value, $ttl = null)
     {
@@ -95,6 +104,8 @@ class TraceableCache implements CacheInterface, PruneableInterface, ResettableIn
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function setMultiple($values, $ttl = null)
     {
@@ -122,6 +133,8 @@ class TraceableCache implements CacheInterface, PruneableInterface, ResettableIn
 
     /**
      * {@inheritdoc}
+     *
+     * @return iterable
      */
     public function getMultiple($keys, $default = null)
     {
@@ -150,6 +163,8 @@ class TraceableCache implements CacheInterface, PruneableInterface, ResettableIn
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function clear()
     {
@@ -163,6 +178,8 @@ class TraceableCache implements CacheInterface, PruneableInterface, ResettableIn
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function deleteMultiple($keys)
     {
@@ -200,7 +217,7 @@ class TraceableCache implements CacheInterface, PruneableInterface, ResettableIn
      */
     public function reset()
     {
-        if (!$this->pool instanceof ResettableInterface) {
+        if (!$this->pool instanceof ResetInterface) {
             return;
         }
         $event = $this->start(__FUNCTION__);
@@ -220,7 +237,7 @@ class TraceableCache implements CacheInterface, PruneableInterface, ResettableIn
         }
     }
 
-    private function start($name)
+    private function start(string $name): TraceableCacheEvent
     {
         $this->calls[] = $event = new TraceableCacheEvent();
         $event->name = $name;
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/AbstractAdapterTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/AbstractAdapterTrait.php
new file mode 100644
index 00000000..388c1df3
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/AbstractAdapterTrait.php
@@ -0,0 +1,164 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Traits;
+
+use Psr\Cache\CacheItemInterface;
+use Symfony\Component\Cache\CacheItem;
+use Symfony\Component\Cache\Exception\InvalidArgumentException;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @internal
+ */
+trait AbstractAdapterTrait
+{
+    use AbstractTrait;
+
+    /**
+     * @var \Closure needs to be set by class, signature is function(string <key>, mixed <value>, bool <isHit>)
+     */
+    private $createCacheItem;
+
+    /**
+     * @var \Closure needs to be set by class, signature is function(array <deferred>, string <namespace>, array <&expiredIds>)
+     */
+    private $mergeByLifetime;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getItem($key)
+    {
+        $id = $this->getId($key);
+
+        if (isset($this->deferred[$key])) {
+            $this->commit();
+        }
+
+        $f = $this->createCacheItem;
+        $isHit = false;
+        $value = null;
+
+        try {
+            foreach ($this->doFetch([$id]) as $value) {
+                $isHit = true;
+            }
+
+            return $f($key, $value, $isHit);
+        } catch (\Exception $e) {
+            CacheItem::log($this->logger, 'Failed to fetch key "{key}": '.$e->getMessage(), ['key' => $key, 'exception' => $e]);
+        }
+
+        return $f($key, null, false);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getItems(array $keys = [])
+    {
+        $ids = [];
+        $commit = false;
+
+        foreach ($keys as $key) {
+            $ids[] = $this->getId($key);
+            $commit = $commit || isset($this->deferred[$key]);
+        }
+
+        if ($commit) {
+            $this->commit();
+        }
+
+        try {
+            $items = $this->doFetch($ids);
+        } catch (\Exception $e) {
+            CacheItem::log($this->logger, 'Failed to fetch items: '.$e->getMessage(), ['keys' => $keys, 'exception' => $e]);
+            $items = [];
+        }
+        $ids = array_combine($ids, $keys);
+
+        return $this->generateItems($items, $ids);
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return bool
+     */
+    public function save(CacheItemInterface $item)
+    {
+        if (!$item instanceof CacheItem) {
+            return false;
+        }
+        $this->deferred[$item->getKey()] = $item;
+
+        return $this->commit();
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return bool
+     */
+    public function saveDeferred(CacheItemInterface $item)
+    {
+        if (!$item instanceof CacheItem) {
+            return false;
+        }
+        $this->deferred[$item->getKey()] = $item;
+
+        return true;
+    }
+
+    /**
+     * @return array
+     */
+    public function __sleep()
+    {
+        throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
+    }
+
+    public function __wakeup()
+    {
+        throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
+    }
+
+    public function __destruct()
+    {
+        if ($this->deferred) {
+            $this->commit();
+        }
+    }
+
+    private function generateItems(iterable $items, array &$keys): iterable
+    {
+        $f = $this->createCacheItem;
+
+        try {
+            foreach ($items as $id => $value) {
+                if (!isset($keys[$id])) {
+                    throw new InvalidArgumentException(sprintf('Could not match value id "%s" to keys "%s".', $id, implode('", "', $keys)));
+                }
+                $key = $keys[$id];
+                unset($keys[$id]);
+                yield $key => $f($key, $value, true);
+            }
+        } catch (\Exception $e) {
+            CacheItem::log($this->logger, 'Failed to fetch items: '.$e->getMessage(), ['keys' => array_values($keys), 'exception' => $e]);
+        }
+
+        foreach ($keys as $key) {
+            yield $key => $f($key, null, false);
+        }
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/AbstractTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/AbstractTrait.php
index dc291e10..b0478806 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/AbstractTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/AbstractTrait.php
@@ -27,6 +27,7 @@ trait AbstractTrait
     private $namespaceVersion = '';
     private $versioningIsEnabled = false;
     private $deferred = [];
+    private $ids = [];
 
     /**
      * @var int|null The maximum length to enforce for identifiers or null when no limit applies
@@ -77,10 +78,12 @@ trait AbstractTrait
      *
      * @return array|bool The identifiers that failed to be cached or a boolean stating if caching succeeded or not
      */
-    abstract protected function doSave(array $values, $lifetime);
+    abstract protected function doSave(array $values, int $lifetime);
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function hasItem($key)
     {
@@ -93,7 +96,7 @@ trait AbstractTrait
         try {
             return $this->doHave($id);
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to check if key "{key}" is cached', ['key' => $key, 'exception' => $e]);
+            CacheItem::log($this->logger, 'Failed to check if key "{key}" is cached: '.$e->getMessage(), ['key' => $key, 'exception' => $e]);
 
             return false;
         }
@@ -101,26 +104,43 @@ trait AbstractTrait
 
     /**
      * {@inheritdoc}
+     *
+     * @param string $prefix
+     *
+     * @return bool
      */
-    public function clear()
+    public function clear(/* string $prefix = '' */)
     {
         $this->deferred = [];
         if ($cleared = $this->versioningIsEnabled) {
-            $namespaceVersion = substr_replace(base64_encode(pack('V', mt_rand())), static::NS_SEPARATOR, 5);
+            if ('' === $namespaceVersionToClear = $this->namespaceVersion) {
+                foreach ($this->doFetch([static::NS_SEPARATOR.$this->namespace]) as $v) {
+                    $namespaceVersionToClear = $v;
+                }
+            }
+            $namespaceToClear = $this->namespace.$namespaceVersionToClear;
+            $namespaceVersion = self::formatNamespaceVersion(mt_rand());
             try {
-                $cleared = $this->doSave([static::NS_SEPARATOR.$this->namespace => $namespaceVersion], 0);
+                $e = $this->doSave([static::NS_SEPARATOR.$this->namespace => $namespaceVersion], 0);
             } catch (\Exception $e) {
+            }
+            if (true !== $e && [] !== $e) {
                 $cleared = false;
-            }
-            if ($cleared = true === $cleared || [] === $cleared) {
+                $message = 'Failed to save the new namespace'.($e instanceof \Exception ? ': '.$e->getMessage() : '.');
+                CacheItem::log($this->logger, $message, ['exception' => $e instanceof \Exception ? $e : null]);
+            } else {
                 $this->namespaceVersion = $namespaceVersion;
+                $this->ids = [];
             }
+        } else {
+            $prefix = 0 < \func_num_args() ? (string) func_get_arg(0) : '';
+            $namespaceToClear = $this->namespace.$prefix;
         }
 
         try {
-            return $this->doClear($this->namespace) || $cleared;
+            return $this->doClear($namespaceToClear) || $cleared;
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to clear the cache', ['exception' => $e]);
+            CacheItem::log($this->logger, 'Failed to clear the cache: '.$e->getMessage(), ['exception' => $e]);
 
             return false;
         }
@@ -128,6 +148,8 @@ trait AbstractTrait
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function deleteItem($key)
     {
@@ -136,6 +158,8 @@ trait AbstractTrait
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function deleteItems(array $keys)
     {
@@ -164,7 +188,8 @@ trait AbstractTrait
                 }
             } catch (\Exception $e) {
             }
-            CacheItem::log($this->logger, 'Failed to delete key "{key}"', ['key' => $key, 'exception' => $e]);
+            $message = 'Failed to delete key "{key}"'.($e instanceof \Exception ? ': '.$e->getMessage() : '.');
+            CacheItem::log($this->logger, $message, ['key' => $key, 'exception' => $e]);
             $ok = false;
         }
 
@@ -188,6 +213,7 @@ trait AbstractTrait
         $wasEnabled = $this->versioningIsEnabled;
         $this->versioningIsEnabled = (bool) $enable;
         $this->namespaceVersion = '';
+        $this->ids = [];
 
         return $wasEnabled;
     }
@@ -201,6 +227,7 @@ trait AbstractTrait
             $this->commit();
         }
         $this->namespaceVersion = '';
+        $this->ids = [];
     }
 
     /**
@@ -211,9 +238,13 @@ trait AbstractTrait
      * @return mixed
      *
      * @throws \Exception
+     *
+     * @deprecated since Symfony 4.2, use DefaultMarshaller instead.
      */
     protected static function unserialize($value)
     {
+        @trigger_error(sprintf('The "%s::unserialize()" method is deprecated since Symfony 4.2, use DefaultMarshaller instead.', __CLASS__), \E_USER_DEPRECATED);
+
         if ('b:0;' === $value) {
             return false;
         }
@@ -230,29 +261,45 @@ trait AbstractTrait
         }
     }
 
-    private function getId($key)
+    private function getId($key): string
     {
-        CacheItem::validateKey($key);
-
         if ($this->versioningIsEnabled && '' === $this->namespaceVersion) {
+            $this->ids = [];
             $this->namespaceVersion = '1'.static::NS_SEPARATOR;
             try {
                 foreach ($this->doFetch([static::NS_SEPARATOR.$this->namespace]) as $v) {
                     $this->namespaceVersion = $v;
                 }
+                $e = true;
                 if ('1'.static::NS_SEPARATOR === $this->namespaceVersion) {
-                    $this->namespaceVersion = substr_replace(base64_encode(pack('V', time())), static::NS_SEPARATOR, 5);
-                    $this->doSave([static::NS_SEPARATOR.$this->namespace => $this->namespaceVersion], 0);
+                    $this->namespaceVersion = self::formatNamespaceVersion(time());
+                    $e = $this->doSave([static::NS_SEPARATOR.$this->namespace => $this->namespaceVersion], 0);
                 }
             } catch (\Exception $e) {
             }
+            if (true !== $e && [] !== $e) {
+                $message = 'Failed to save the new namespace'.($e instanceof \Exception ? ': '.$e->getMessage() : '.');
+                CacheItem::log($this->logger, $message, ['exception' => $e instanceof \Exception ? $e : null]);
+            }
+        }
+
+        if (\is_string($key) && isset($this->ids[$key])) {
+            return $this->namespace.$this->namespaceVersion.$this->ids[$key];
+        }
+        CacheItem::validateKey($key);
+        $this->ids[$key] = $key;
+
+        if (\count($this->ids) > 1000) {
+            $this->ids = \array_slice($this->ids, 500, null, true); // stop memory leak if there are many keys
         }
 
         if (null === $this->maxIdLength) {
             return $this->namespace.$this->namespaceVersion.$key;
         }
         if (\strlen($id = $this->namespace.$this->namespaceVersion.$key) > $this->maxIdLength) {
-            $id = $this->namespace.$this->namespaceVersion.substr_replace(base64_encode(hash('sha256', $key, true)), static::NS_SEPARATOR, -(\strlen($this->namespaceVersion) + 22));
+            // Use MD5 to favor speed over security, which is not an issue here
+            $this->ids[$key] = $id = substr_replace(base64_encode(hash('md5', $key, true)), static::NS_SEPARATOR, -(\strlen($this->namespaceVersion) + 2));
+            $id = $this->namespace.$this->namespaceVersion.$id;
         }
 
         return $id;
@@ -265,4 +312,9 @@ trait AbstractTrait
     {
         throw new \DomainException('Class not found: '.$class);
     }
+
+    private static function formatNamespaceVersion(int $value): string
+    {
+        return strtr(substr_replace(base64_encode(pack('V', $value)), static::NS_SEPARATOR, 5), '/', '_');
+    }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/ApcuTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/ApcuTrait.php
index 2f47f8e6..46bd20fe 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/ApcuTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/ApcuTrait.php
@@ -23,10 +23,10 @@ trait ApcuTrait
 {
     public static function isSupported()
     {
-        return \function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN);
+        return \function_exists('apcu_fetch') && filter_var(\ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN);
     }
 
-    private function init($namespace, $defaultLifetime, $version)
+    private function init(string $namespace, int $defaultLifetime, ?string $version)
     {
         if (!static::isSupported()) {
             throw new CacheException('APCu is not enabled.');
@@ -51,14 +51,27 @@ trait ApcuTrait
      */
     protected function doFetch(array $ids)
     {
+        $unserializeCallbackHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');
         try {
-            foreach (apcu_fetch($ids, $ok) ?: [] as $k => $v) {
+            $values = [];
+            $ids = array_flip($ids);
+            foreach (apcu_fetch(array_keys($ids), $ok) ?: [] as $k => $v) {
+                if (!isset($ids[$k])) {
+                    // work around https://github.com/krakjoe/apcu/issues/247
+                    $k = key($ids);
+                }
+                unset($ids[$k]);
+
                 if (null !== $v || $ok) {
-                    yield $k => $v;
+                    $values[$k] = $v;
                 }
             }
+
+            return $values;
         } catch (\Error $e) {
             throw new \ErrorException($e->getMessage(), $e->getCode(), \E_ERROR, $e->getFile(), $e->getLine());
+        } finally {
+            ini_set('unserialize_callback_func', $unserializeCallbackHandler);
         }
     }
 
@@ -75,8 +88,8 @@ trait ApcuTrait
      */
     protected function doClear($namespace)
     {
-        return isset($namespace[0]) && class_exists('APCuIterator', false) && ('cli' !== \PHP_SAPI || filter_var(ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN))
-            ? apcu_delete(new \APCuIterator(sprintf('/^%s/', preg_quote($namespace, '/')), \APC_ITER_KEY))
+        return isset($namespace[0]) && class_exists(\APCUIterator::class, false) && ('cli' !== \PHP_SAPI || filter_var(\ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN))
+            ? apcu_delete(new \APCUIterator(sprintf('/^%s/', preg_quote($namespace, '/')), \APC_ITER_KEY))
             : apcu_clear_cache();
     }
 
@@ -95,7 +108,7 @@ trait ApcuTrait
     /**
      * {@inheritdoc}
      */
-    protected function doSave(array $values, $lifetime)
+    protected function doSave(array $values, int $lifetime)
     {
         try {
             if (false === $failures = apcu_store($values, null, $lifetime)) {
@@ -103,15 +116,13 @@ trait ApcuTrait
             }
 
             return array_keys($failures);
-        } catch (\Error $e) {
-        } catch (\Exception $e) {
-        }
+        } catch (\Throwable $e) {
+            if (1 === \count($values)) {
+                // Workaround https://github.com/krakjoe/apcu/issues/170
+                apcu_delete(array_key_first($values));
+            }
 
-        if (1 === \count($values)) {
-            // Workaround https://github.com/krakjoe/apcu/issues/170
-            apcu_delete(key($values));
+            throw $e;
         }
-
-        throw $e;
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/ArrayTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/ArrayTrait.php
index 0a60968e..e41daebc 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/ArrayTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/ArrayTrait.php
@@ -34,36 +34,72 @@ trait ArrayTrait
      */
     public function getValues()
     {
-        return $this->values;
+        if (!$this->storeSerialized) {
+            return $this->values;
+        }
+
+        $values = $this->values;
+        foreach ($values as $k => $v) {
+            if (null === $v || 'N;' === $v) {
+                continue;
+            }
+            if (!\is_string($v) || !isset($v[2]) || ':' !== $v[1]) {
+                $values[$k] = serialize($v);
+            }
+        }
+
+        return $values;
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function hasItem($key)
     {
+        if (\is_string($key) && isset($this->expiries[$key]) && $this->expiries[$key] > microtime(true)) {
+            return true;
+        }
         CacheItem::validateKey($key);
 
-        return isset($this->expiries[$key]) && ($this->expiries[$key] > time() || !$this->deleteItem($key));
+        return isset($this->expiries[$key]) && !$this->deleteItem($key);
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @param string $prefix
+     *
+     * @return bool
      */
-    public function clear()
+    public function clear(/* string $prefix = '' */)
     {
-        $this->values = $this->expiries = [];
+        $prefix = 0 < \func_num_args() ? (string) func_get_arg(0) : '';
+
+        if ('' !== $prefix) {
+            foreach ($this->values as $key => $value) {
+                if (str_starts_with($key, $prefix)) {
+                    unset($this->values[$key], $this->expiries[$key]);
+                }
+            }
+        } else {
+            $this->values = $this->expiries = [];
+        }
 
         return true;
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @return bool
      */
     public function deleteItem($key)
     {
-        CacheItem::validateKey($key);
-
+        if (!\is_string($key) || !isset($this->expiries[$key])) {
+            CacheItem::validateKey($key);
+        }
         unset($this->values[$key], $this->expiries[$key]);
 
         return true;
@@ -77,24 +113,13 @@ trait ArrayTrait
         $this->clear();
     }
 
-    private function generateItems(array $keys, $now, $f)
+    private function generateItems(array $keys, float $now, callable $f): iterable
     {
         foreach ($keys as $i => $key) {
-            try {
-                if (!$isHit = isset($this->expiries[$key]) && ($this->expiries[$key] > $now || !$this->deleteItem($key))) {
-                    $this->values[$key] = $value = null;
-                } elseif (!$this->storeSerialized) {
-                    $value = $this->values[$key];
-                } elseif ('b:0;' === $value = $this->values[$key]) {
-                    $value = false;
-                } elseif (false === $value = unserialize($value)) {
-                    $this->values[$key] = $value = null;
-                    $isHit = false;
-                }
-            } catch (\Exception $e) {
-                CacheItem::log($this->logger, 'Failed to unserialize key "{key}"', ['key' => $key, 'exception' => $e]);
+            if (!$isHit = isset($this->expiries[$key]) && ($this->expiries[$key] > $now || !$this->deleteItem($key))) {
                 $this->values[$key] = $value = null;
-                $isHit = false;
+            } else {
+                $value = $this->storeSerialized ? $this->unfreeze($key, $isHit) : $this->values[$key];
             }
             unset($keys[$i]);
 
@@ -105,4 +130,55 @@ trait ArrayTrait
             yield $key => $f($key, null, false);
         }
     }
+
+    private function freeze($value, $key)
+    {
+        if (null === $value) {
+            return 'N;';
+        }
+        if (\is_string($value)) {
+            // Serialize strings if they could be confused with serialized objects or arrays
+            if ('N;' === $value || (isset($value[2]) && ':' === $value[1])) {
+                return serialize($value);
+            }
+        } elseif (!\is_scalar($value)) {
+            try {
+                $serialized = serialize($value);
+            } catch (\Exception $e) {
+                unset($this->values[$key]);
+                $type = \is_object($value) ? \get_class($value) : \gettype($value);
+                $message = sprintf('Failed to save key "{key}" of type %s: ', $type).$e->getMessage();
+                CacheItem::log($this->logger, $message, ['key' => $key, 'exception' => $e]);
+
+                return null;
+            }
+            // Keep value serialized if it contains any objects or any internal references
+            if ('C' === $serialized[0] || 'O' === $serialized[0] || preg_match('/;[OCRr]:[1-9]/', $serialized)) {
+                return $serialized;
+            }
+        }
+
+        return $value;
+    }
+
+    private function unfreeze(string $key, bool &$isHit)
+    {
+        if ('N;' === $value = $this->values[$key]) {
+            return null;
+        }
+        if (\is_string($value) && isset($value[2]) && ':' === $value[1]) {
+            try {
+                $value = unserialize($value);
+            } catch (\Exception $e) {
+                CacheItem::log($this->logger, 'Failed to unserialize key "{key}": '.$e->getMessage(), ['key' => $key, 'exception' => $e]);
+                $value = false;
+            }
+            if (false === $value) {
+                $this->values[$key] = $value = null;
+                $isHit = false;
+            }
+        }
+
+        return $value;
+    }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/ContractsTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/ContractsTrait.php
new file mode 100644
index 00000000..49a96eed
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/ContractsTrait.php
@@ -0,0 +1,109 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Traits;
+
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Cache\Adapter\AdapterInterface;
+use Symfony\Component\Cache\CacheItem;
+use Symfony\Component\Cache\Exception\InvalidArgumentException;
+use Symfony\Component\Cache\LockRegistry;
+use Symfony\Contracts\Cache\CacheInterface;
+use Symfony\Contracts\Cache\CacheTrait;
+use Symfony\Contracts\Cache\ItemInterface;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @internal
+ */
+trait ContractsTrait
+{
+    use CacheTrait {
+        doGet as private contractsGet;
+    }
+
+    private $callbackWrapper;
+    private $computing = [];
+
+    /**
+     * Wraps the callback passed to ->get() in a callable.
+     *
+     * @return callable the previous callback wrapper
+     */
+    public function setCallbackWrapper(?callable $callbackWrapper): callable
+    {
+        if (!isset($this->callbackWrapper)) {
+            $this->callbackWrapper = \Closure::fromCallable([LockRegistry::class, 'compute']);
+
+            if (\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) {
+                $this->setCallbackWrapper(null);
+            }
+        }
+
+        $previousWrapper = $this->callbackWrapper;
+        $this->callbackWrapper = $callbackWrapper ?? static function (callable $callback, ItemInterface $item, bool &$save, CacheInterface $pool, \Closure $setMetadata, ?LoggerInterface $logger) {
+            return $callback($item, $save);
+        };
+
+        return $previousWrapper;
+    }
+
+    private function doGet(AdapterInterface $pool, string $key, callable $callback, ?float $beta, array &$metadata = null)
+    {
+        if (0 > $beta = $beta ?? 1.0) {
+            throw new InvalidArgumentException(sprintf('Argument "$beta" provided to "%s::get()" must be a positive number, %f given.', static::class, $beta));
+        }
+
+        static $setMetadata;
+
+        $setMetadata = $setMetadata ?? \Closure::bind(
+            static function (CacheItem $item, float $startTime, ?array &$metadata) {
+                if ($item->expiry > $endTime = microtime(true)) {
+                    $item->newMetadata[CacheItem::METADATA_EXPIRY] = $metadata[CacheItem::METADATA_EXPIRY] = $item->expiry;
+                    $item->newMetadata[CacheItem::METADATA_CTIME] = $metadata[CacheItem::METADATA_CTIME] = (int) ceil(1000 * ($endTime - $startTime));
+                } else {
+                    unset($metadata[CacheItem::METADATA_EXPIRY], $metadata[CacheItem::METADATA_CTIME]);
+                }
+            },
+            null,
+            CacheItem::class
+        );
+
+        return $this->contractsGet($pool, $key, function (CacheItem $item, bool &$save) use ($pool, $callback, $setMetadata, &$metadata, $key) {
+            // don't wrap nor save recursive calls
+            if (isset($this->computing[$key])) {
+                $value = $callback($item, $save);
+                $save = false;
+
+                return $value;
+            }
+
+            $this->computing[$key] = $key;
+            $startTime = microtime(true);
+
+            if (!isset($this->callbackWrapper)) {
+                $this->setCallbackWrapper($this->setCallbackWrapper(null));
+            }
+
+            try {
+                $value = ($this->callbackWrapper)($callback, $item, $save, $pool, function (CacheItem $item) use ($setMetadata, $startTime, &$metadata) {
+                    $setMetadata($item, $startTime, $metadata);
+                }, $this->logger ?? null);
+                $setMetadata($item, $startTime, $metadata);
+
+                return $value;
+            } finally {
+                unset($this->computing[$key]);
+            }
+        }, $beta, $metadata, $this->logger ?? null);
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/DoctrineTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/DoctrineTrait.php
index 48623e67..ae14db01 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/DoctrineTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/DoctrineTrait.php
@@ -91,7 +91,7 @@ trait DoctrineTrait
     /**
      * {@inheritdoc}
      */
-    protected function doSave(array $values, $lifetime)
+    protected function doSave(array $values, int $lifetime)
     {
         return $this->provider->saveMultiple($values, $lifetime);
     }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/FilesystemCommonTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/FilesystemCommonTrait.php
index 8071a382..4e06495d 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/FilesystemCommonTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/FilesystemCommonTrait.php
@@ -23,10 +23,10 @@ trait FilesystemCommonTrait
     private $directory;
     private $tmp;
 
-    private function init($namespace, $directory)
+    private function init(string $namespace, ?string $directory)
     {
         if (!isset($directory[0])) {
-            $directory = sys_get_temp_dir().'/symfony-cache';
+            $directory = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'symfony-cache';
         } else {
             $directory = realpath($directory) ?: $directory;
         }
@@ -35,6 +35,8 @@ trait FilesystemCommonTrait
                 throw new InvalidArgumentException(sprintf('Namespace contains "%s" but only characters in [-+_.A-Za-z0-9] are allowed.', $match[0]));
             }
             $directory .= \DIRECTORY_SEPARATOR.$namespace;
+        } else {
+            $directory .= \DIRECTORY_SEPARATOR.'@';
         }
         if (!file_exists($directory)) {
             @mkdir($directory, 0777, true);
@@ -55,8 +57,12 @@ trait FilesystemCommonTrait
     {
         $ok = true;
 
-        foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->directory, \FilesystemIterator::SKIP_DOTS)) as $file) {
-            $ok = ($file->isDir() || @unlink($file) || !file_exists($file)) && $ok;
+        foreach ($this->scanHashDir($this->directory) as $file) {
+            if ('' !== $namespace && !str_starts_with($this->getFileKey($file), $namespace)) {
+                continue;
+            }
+
+            $ok = ($this->doUnlink($file) || !file_exists($file)) && $ok;
         }
 
         return $ok;
@@ -71,23 +77,39 @@ trait FilesystemCommonTrait
 
         foreach ($ids as $id) {
             $file = $this->getFile($id);
-            $ok = (!file_exists($file) || @unlink($file) || !file_exists($file)) && $ok;
+            $ok = (!file_exists($file) || $this->doUnlink($file) || !file_exists($file)) && $ok;
         }
 
         return $ok;
     }
 
-    private function write($file, $data, $expiresAt = null)
+    protected function doUnlink($file)
+    {
+        return @unlink($file);
+    }
+
+    private function write(string $file, string $data, int $expiresAt = null)
     {
         set_error_handler(__CLASS__.'::throwError');
         try {
             if (null === $this->tmp) {
-                $this->tmp = $this->directory.uniqid('', true);
+                $this->tmp = $this->directory.bin2hex(random_bytes(6));
             }
-            file_put_contents($this->tmp, $data);
+            try {
+                $h = fopen($this->tmp, 'x');
+            } catch (\ErrorException $e) {
+                if (!str_contains($e->getMessage(), 'File exists')) {
+                    throw $e;
+                }
+
+                $this->tmp = $this->directory.bin2hex(random_bytes(6));
+                $h = fopen($this->tmp, 'x');
+            }
+            fwrite($h, $data);
+            fclose($h);
 
             if (null !== $expiresAt) {
-                touch($this->tmp, $expiresAt);
+                touch($this->tmp, $expiresAt ?: time() + 31556952); // 1 year in seconds
             }
 
             return rename($this->tmp, $file);
@@ -96,10 +118,11 @@ trait FilesystemCommonTrait
         }
     }
 
-    private function getFile($id, $mkdir = false)
+    private function getFile(string $id, bool $mkdir = false, string $directory = null)
     {
-        $hash = str_replace('/', '-', base64_encode(hash('sha256', static::class.$id, true)));
-        $dir = $this->directory.strtoupper($hash[0].\DIRECTORY_SEPARATOR.$hash[1].\DIRECTORY_SEPARATOR);
+        // Use MD5 to favor speed over security, which is not an issue here
+        $hash = str_replace('/', '-', base64_encode(hash('md5', static::class.$id, true)));
+        $dir = ($directory ?? $this->directory).strtoupper($hash[0].\DIRECTORY_SEPARATOR.$hash[1].\DIRECTORY_SEPARATOR);
 
         if ($mkdir && !file_exists($dir)) {
             @mkdir($dir, 0777, true);
@@ -108,6 +131,38 @@ trait FilesystemCommonTrait
         return $dir.substr($hash, 2, 20);
     }
 
+    private function getFileKey(string $file): string
+    {
+        return '';
+    }
+
+    private function scanHashDir(string $directory): \Generator
+    {
+        if (!file_exists($directory)) {
+            return;
+        }
+
+        $chars = '+-ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+
+        for ($i = 0; $i < 38; ++$i) {
+            if (!file_exists($directory.$chars[$i])) {
+                continue;
+            }
+
+            for ($j = 0; $j < 38; ++$j) {
+                if (!file_exists($dir = $directory.$chars[$i].\DIRECTORY_SEPARATOR.$chars[$j])) {
+                    continue;
+                }
+
+                foreach (@scandir($dir, \SCANDIR_SORT_NONE) ?: [] as $file) {
+                    if ('.' !== $file && '..' !== $file) {
+                        yield $dir.\DIRECTORY_SEPARATOR.$file;
+                    }
+                }
+            }
+        }
+    }
+
     /**
      * @internal
      */
@@ -116,6 +171,9 @@ trait FilesystemCommonTrait
         throw new \ErrorException($message, 0, $type, $file, $line);
     }
 
+    /**
+     * @return array
+     */
     public function __sleep()
     {
         throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/FilesystemTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/FilesystemTrait.php
index 9d7f5578..72118eaa 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/FilesystemTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/FilesystemTrait.php
@@ -23,6 +23,8 @@ trait FilesystemTrait
 {
     use FilesystemCommonTrait;
 
+    private $marshaller;
+
     /**
      * @return bool
      */
@@ -31,8 +33,8 @@ trait FilesystemTrait
         $time = time();
         $pruned = true;
 
-        foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->directory, \FilesystemIterator::SKIP_DOTS), \RecursiveIteratorIterator::LEAVES_ONLY) as $file) {
-            if (!$h = @fopen($file, 'rb')) {
+        foreach ($this->scanHashDir($this->directory) as $file) {
+            if (!$h = @fopen($file, 'r')) {
                 continue;
             }
 
@@ -57,7 +59,7 @@ trait FilesystemTrait
 
         foreach ($ids as $id) {
             $file = $this->getFile($id);
-            if (!file_exists($file) || !$h = @fopen($file, 'rb')) {
+            if (!file_exists($file) || !$h = @fopen($file, 'r')) {
                 continue;
             }
             if (($expiresAt = (int) fgets($h)) && $now >= $expiresAt) {
@@ -68,7 +70,7 @@ trait FilesystemTrait
                 $value = stream_get_contents($h);
                 fclose($h);
                 if ($i === $id) {
-                    $values[$id] = parent::unserialize($value);
+                    $values[$id] = $this->marshaller->unmarshall($value);
                 }
             }
         }
@@ -89,19 +91,34 @@ trait FilesystemTrait
     /**
      * {@inheritdoc}
      */
-    protected function doSave(array $values, $lifetime)
+    protected function doSave(array $values, int $lifetime)
     {
-        $ok = true;
         $expiresAt = $lifetime ? (time() + $lifetime) : 0;
+        $values = $this->marshaller->marshall($values, $failed);
 
         foreach ($values as $id => $value) {
-            $ok = $this->write($this->getFile($id, true), $expiresAt."\n".rawurlencode($id)."\n".serialize($value), $expiresAt) && $ok;
+            if (!$this->write($this->getFile($id, true), $expiresAt."\n".rawurlencode($id)."\n".$value, $expiresAt)) {
+                $failed[] = $id;
+            }
         }
 
-        if (!$ok && !is_writable($this->directory)) {
+        if ($failed && !is_writable($this->directory)) {
             throw new CacheException(sprintf('Cache directory is not writable (%s).', $this->directory));
         }
 
-        return $ok;
+        return $failed;
+    }
+
+    private function getFileKey(string $file): string
+    {
+        if (!$h = @fopen($file, 'r')) {
+            return '';
+        }
+
+        fgets($h); // expiry
+        $encodedKey = fgets($h);
+        fclose($h);
+
+        return rawurldecode(rtrim($encodedKey));
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/MemcachedTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/MemcachedTrait.php
index 34d0208e..ebcb160c 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/MemcachedTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/MemcachedTrait.php
@@ -13,6 +13,8 @@ namespace Symfony\Component\Cache\Traits;
 
 use Symfony\Component\Cache\Exception\CacheException;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
+use Symfony\Component\Cache\Marshaller\DefaultMarshaller;
+use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 
 /**
  * @author Rob Frawley 2nd <rmf@src.run>
@@ -29,18 +31,27 @@ trait MemcachedTrait
         \Memcached::OPT_SERIALIZER => \Memcached::SERIALIZER_PHP,
     ];
 
+    /**
+     * We are replacing characters that are illegal in Memcached keys with reserved characters from
+     * {@see \Symfony\Contracts\Cache\ItemInterface::RESERVED_CHARACTERS} that are legal in Memcached.
+     * Note: don’t use {@see \Symfony\Component\Cache\Adapter\AbstractAdapter::NS_SEPARATOR}.
+     */
+    private static $RESERVED_MEMCACHED = " \n\r\t\v\f\0";
+    private static $RESERVED_PSR6 = '@()\{}/';
+
+    private $marshaller;
     private $client;
     private $lazyClient;
 
     public static function isSupported()
     {
-        return \extension_loaded('memcached') && version_compare(phpversion('memcached'), '2.2.0', '>=');
+        return \extension_loaded('memcached') && version_compare(phpversion('memcached'), \PHP_VERSION_ID >= 80100 ? '3.1.6' : '2.2.0', '>=');
     }
 
-    private function init(\Memcached $client, $namespace, $defaultLifetime)
+    private function init(\Memcached $client, string $namespace, int $defaultLifetime, ?MarshallerInterface $marshaller)
     {
         if (!static::isSupported()) {
-            throw new CacheException('Memcached >= 2.2.0 is required.');
+            throw new CacheException('Memcached '.(\PHP_VERSION_ID >= 80100 ? '> 3.1.5' : '>= 2.2.0').' is required.');
         }
         if ('Memcached' === \get_class($client)) {
             $opt = $client->getOption(\Memcached::OPT_SERIALIZER);
@@ -55,6 +66,7 @@ trait MemcachedTrait
 
         parent::__construct($namespace, $defaultLifetime);
         $this->enableVersioning();
+        $this->marshaller = $marshaller ?? new DefaultMarshaller();
     }
 
     /**
@@ -67,7 +79,6 @@ trait MemcachedTrait
      * - [['localhost', 11211, 33]]
      *
      * @param array[]|string|string[] $servers An array of servers, a DSN, or an array of DSNs
-     * @param array                   $options An array of options
      *
      * @return \Memcached
      *
@@ -81,7 +92,7 @@ trait MemcachedTrait
             throw new InvalidArgumentException(sprintf('MemcachedAdapter::createClient() expects array or string as first argument, "%s" given.', \gettype($servers)));
         }
         if (!static::isSupported()) {
-            throw new CacheException('Memcached >= 2.2.0 is required.');
+            throw new CacheException('Memcached '.(\PHP_VERSION_ID >= 80100 ? '> 3.1.5' : '>= 2.2.0').' is required.');
         }
         set_error_handler(function ($type, $msg, $file, $line) { throw new \ErrorException($msg, 0, $type, $file, $line); });
         try {
@@ -95,19 +106,43 @@ trait MemcachedTrait
                 if (\is_array($dsn)) {
                     continue;
                 }
-                if (0 !== strpos($dsn, 'memcached://')) {
-                    throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: "%s" does not start with "memcached://".', $dsn));
+                if (!str_starts_with($dsn, 'memcached:')) {
+                    throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: "%s" does not start with "memcached:".', $dsn));
                 }
-                $params = preg_replace_callback('#^memcached://(?:([^@]*+)@)?#', function ($m) use (&$username, &$password) {
-                    if (!empty($m[1])) {
-                        list($username, $password) = explode(':', $m[1], 2) + [1 => null];
+                $params = preg_replace_callback('#^memcached:(//)?(?:([^@]*+)@)?#', function ($m) use (&$username, &$password) {
+                    if (!empty($m[2])) {
+                        [$username, $password] = explode(':', $m[2], 2) + [1 => null];
                     }
 
-                    return 'file://';
+                    return 'file:'.($m[1] ?? '');
                 }, $dsn);
                 if (false === $params = parse_url($params)) {
                     throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: "%s".', $dsn));
                 }
+                $query = $hosts = [];
+                if (isset($params['query'])) {
+                    parse_str($params['query'], $query);
+
+                    if (isset($query['host'])) {
+                        if (!\is_array($hosts = $query['host'])) {
+                            throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: "%s".', $dsn));
+                        }
+                        foreach ($hosts as $host => $weight) {
+                            if (false === $port = strrpos($host, ':')) {
+                                $hosts[$host] = [$host, 11211, (int) $weight];
+                            } else {
+                                $hosts[$host] = [substr($host, 0, $port), (int) substr($host, 1 + $port), (int) $weight];
+                            }
+                        }
+                        $hosts = array_values($hosts);
+                        unset($query['host']);
+                    }
+                    if ($hosts && !isset($params['host']) && !isset($params['path'])) {
+                        unset($servers[$i]);
+                        $servers = array_merge($servers, $hosts);
+                        continue;
+                    }
+                }
                 if (!isset($params['host']) && !isset($params['path'])) {
                     throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: "%s".', $dsn));
                 }
@@ -116,17 +151,20 @@ trait MemcachedTrait
                     $params['path'] = substr($params['path'], 0, -\strlen($m[0]));
                 }
                 $params += [
-                    'host' => isset($params['host']) ? $params['host'] : $params['path'],
+                    'host' => $params['host'] ?? $params['path'],
                     'port' => isset($params['host']) ? 11211 : null,
                     'weight' => 0,
                 ];
-                if (isset($params['query'])) {
-                    parse_str($params['query'], $query);
+                if ($query) {
                     $params += $query;
                     $options = $query + $options;
                 }
 
                 $servers[$i] = [$params['host'], $params['port'], $params['weight']];
+
+                if ($hosts) {
+                    $servers = array_merge($servers, $hosts);
+                }
             }
 
             // set client's options
@@ -193,18 +231,22 @@ trait MemcachedTrait
     /**
      * {@inheritdoc}
      */
-    protected function doSave(array $values, $lifetime)
+    protected function doSave(array $values, int $lifetime)
     {
+        if (!$values = $this->marshaller->marshall($values, $failed)) {
+            return $failed;
+        }
+
         if ($lifetime && $lifetime > 30 * 86400) {
             $lifetime += time();
         }
 
         $encodedValues = [];
         foreach ($values as $key => $value) {
-            $encodedValues[rawurlencode($key)] = $value;
+            $encodedValues[self::encodeKey($key)] = $value;
         }
 
-        return $this->checkResultCode($this->getClient()->setMulti($encodedValues, $lifetime));
+        return $this->checkResultCode($this->getClient()->setMulti($encodedValues, $lifetime)) ? $failed : false;
     }
 
     /**
@@ -212,22 +254,19 @@ trait MemcachedTrait
      */
     protected function doFetch(array $ids)
     {
-        $unserializeCallbackHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');
         try {
-            $encodedIds = array_map('rawurlencode', $ids);
+            $encodedIds = array_map([__CLASS__, 'encodeKey'], $ids);
 
             $encodedResult = $this->checkResultCode($this->getClient()->getMulti($encodedIds));
 
             $result = [];
             foreach ($encodedResult as $key => $value) {
-                $result[rawurldecode($key)] = $value;
+                $result[self::decodeKey($key)] = $this->marshaller->unmarshall($value);
             }
 
             return $result;
         } catch (\Error $e) {
             throw new \ErrorException($e->getMessage(), $e->getCode(), \E_ERROR, $e->getFile(), $e->getLine());
-        } finally {
-            ini_set('unserialize_callback_func', $unserializeCallbackHandler);
         }
     }
 
@@ -236,7 +275,7 @@ trait MemcachedTrait
      */
     protected function doHave($id)
     {
-        return false !== $this->getClient()->get(rawurlencode($id)) || $this->checkResultCode(\Memcached::RES_SUCCESS === $this->client->getResultCode());
+        return false !== $this->getClient()->get(self::encodeKey($id)) || $this->checkResultCode(\Memcached::RES_SUCCESS === $this->client->getResultCode());
     }
 
     /**
@@ -245,7 +284,7 @@ trait MemcachedTrait
     protected function doDelete(array $ids)
     {
         $ok = true;
-        $encodedIds = array_map('rawurlencode', $ids);
+        $encodedIds = array_map([__CLASS__, 'encodeKey'], $ids);
         foreach ($this->checkResultCode($this->getClient()->deleteMulti($encodedIds)) as $result) {
             if (\Memcached::RES_SUCCESS !== $result && \Memcached::RES_NOTFOUND !== $result) {
                 $ok = false;
@@ -275,10 +314,7 @@ trait MemcachedTrait
         throw new CacheException('MemcachedAdapter client error: '.strtolower($this->client->getResultMessage()));
     }
 
-    /**
-     * @return \Memcached
-     */
-    private function getClient()
+    private function getClient(): \Memcached
     {
         if ($this->client) {
             return $this->client;
@@ -294,4 +330,14 @@ trait MemcachedTrait
 
         return $this->client = $this->lazyClient;
     }
+
+    private static function encodeKey(string $key): string
+    {
+        return strtr($key, self::$RESERVED_MEMCACHED, self::$RESERVED_PSR6);
+    }
+
+    private static function decodeKey(string $key): string
+    {
+        return strtr($key, self::$RESERVED_PSR6, self::$RESERVED_MEMCACHED);
+    }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/PdoTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/PdoTrait.php
index 917e8dd1..4d5e1230 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/PdoTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/PdoTrait.php
@@ -14,14 +14,22 @@ namespace Symfony\Component\Cache\Traits;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Driver\ServerInfoAwareConnection;
+use Doctrine\DBAL\DriverManager;
+use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\Exception\TableNotFoundException;
+use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Statement;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
+use Symfony\Component\Cache\Marshaller\DefaultMarshaller;
+use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 
 /**
  * @internal
  */
 trait PdoTrait
 {
+    private $marshaller;
     private $conn;
     private $dsn;
     private $driver;
@@ -36,7 +44,7 @@ trait PdoTrait
     private $connectionOptions = [];
     private $namespace;
 
-    private function init($connOrDsn, $namespace, $defaultLifetime, array $options)
+    private function init($connOrDsn, string $namespace, int $defaultLifetime, array $options, ?MarshallerInterface $marshaller)
     {
         if (isset($namespace[0]) && preg_match('#[^-+.A-Za-z0-9]#', $namespace, $match)) {
             throw new InvalidArgumentException(sprintf('Namespace contains "%s" but only characters in [-+.A-Za-z0-9] are allowed.', $match[0]));
@@ -56,15 +64,16 @@ trait PdoTrait
             throw new InvalidArgumentException(sprintf('"%s" requires PDO or Doctrine\DBAL\Connection instance or DSN string as first argument, "%s" given.', __CLASS__, \is_object($connOrDsn) ? \get_class($connOrDsn) : \gettype($connOrDsn)));
         }
 
-        $this->table = isset($options['db_table']) ? $options['db_table'] : $this->table;
-        $this->idCol = isset($options['db_id_col']) ? $options['db_id_col'] : $this->idCol;
-        $this->dataCol = isset($options['db_data_col']) ? $options['db_data_col'] : $this->dataCol;
-        $this->lifetimeCol = isset($options['db_lifetime_col']) ? $options['db_lifetime_col'] : $this->lifetimeCol;
-        $this->timeCol = isset($options['db_time_col']) ? $options['db_time_col'] : $this->timeCol;
-        $this->username = isset($options['db_username']) ? $options['db_username'] : $this->username;
-        $this->password = isset($options['db_password']) ? $options['db_password'] : $this->password;
-        $this->connectionOptions = isset($options['db_connection_options']) ? $options['db_connection_options'] : $this->connectionOptions;
+        $this->table = $options['db_table'] ?? $this->table;
+        $this->idCol = $options['db_id_col'] ?? $this->idCol;
+        $this->dataCol = $options['db_data_col'] ?? $this->dataCol;
+        $this->lifetimeCol = $options['db_lifetime_col'] ?? $this->lifetimeCol;
+        $this->timeCol = $options['db_time_col'] ?? $this->timeCol;
+        $this->username = $options['db_username'] ?? $this->username;
+        $this->password = $options['db_password'] ?? $this->password;
+        $this->connectionOptions = $options['db_connection_options'] ?? $this->connectionOptions;
         $this->namespace = $namespace;
+        $this->marshaller = $marshaller ?? new DefaultMarshaller();
 
         parent::__construct($namespace, $defaultLifetime);
     }
@@ -77,6 +86,7 @@ trait PdoTrait
      *
      * @throws \PDOException    When the table already exists
      * @throws DBALException    When the table already exists
+     * @throws Exception        When the table already exists
      * @throws \DomainException When an unsupported PDO driver is used
      */
     public function createTable()
@@ -140,7 +150,7 @@ trait PdoTrait
                 throw new \DomainException(sprintf('Creating the cache table is currently not implemented for PDO driver "%s".', $this->driver));
         }
 
-        if (method_exists($conn, 'executeStatement')) {
+        if ($conn instanceof Connection && method_exists($conn, 'executeStatement')) {
             $conn->executeStatement($sql);
         } else {
             $conn->exec($sql);
@@ -158,14 +168,35 @@ trait PdoTrait
             $deleteSql .= " AND $this->idCol LIKE :namespace";
         }
 
-        $delete = $this->getConnection()->prepare($deleteSql);
-        $delete->bindValue(':time', time(), \PDO::PARAM_INT);
+        $connection = $this->getConnection();
+        $useDbalConstants = $connection instanceof Connection;
+
+        try {
+            $delete = $connection->prepare($deleteSql);
+        } catch (TableNotFoundException $e) {
+            return true;
+        } catch (\PDOException $e) {
+            return true;
+        }
+        $delete->bindValue(':time', time(), $useDbalConstants ? ParameterType::INTEGER : \PDO::PARAM_INT);
 
         if ('' !== $this->namespace) {
-            $delete->bindValue(':namespace', sprintf('%s%%', $this->namespace), \PDO::PARAM_STR);
+            $delete->bindValue(':namespace', sprintf('%s%%', $this->namespace), $useDbalConstants ? ParameterType::STRING : \PDO::PARAM_STR);
         }
+        try {
+            // Doctrine DBAL ^2.13 || >= 3.1
+            if ($delete instanceof Statement && method_exists($delete, 'executeStatement')) {
+                $delete->executeStatement();
 
-        return $delete->execute();
+                return true;
+            }
+
+            return $delete->execute();
+        } catch (TableNotFoundException $e) {
+            return true;
+        } catch (\PDOException $e) {
+            return true;
+        }
     }
 
     /**
@@ -173,13 +204,16 @@ trait PdoTrait
      */
     protected function doFetch(array $ids)
     {
+        $connection = $this->getConnection();
+        $useDbalConstants = $connection instanceof Connection;
+
         $now = time();
         $expired = [];
 
         $sql = str_pad('', (\count($ids) << 1) - 1, '?,');
         $sql = "SELECT $this->idCol, CASE WHEN $this->lifetimeCol IS NULL OR $this->lifetimeCol + $this->timeCol > ? THEN $this->dataCol ELSE NULL END FROM $this->table WHERE $this->idCol IN ($sql)";
-        $stmt = $this->getConnection()->prepare($sql);
-        $stmt->bindValue($i = 1, $now, \PDO::PARAM_INT);
+        $stmt = $connection->prepare($sql);
+        $stmt->bindValue($i = 1, $now, $useDbalConstants ? ParameterType::INTEGER : \PDO::PARAM_INT);
         foreach ($ids as $id) {
             $stmt->bindValue(++$i, $id);
         }
@@ -196,15 +230,15 @@ trait PdoTrait
             if (null === $row[1]) {
                 $expired[] = $row[0];
             } else {
-                yield $row[0] => parent::unserialize(\is_resource($row[1]) ? stream_get_contents($row[1]) : $row[1]);
+                yield $row[0] => $this->marshaller->unmarshall(\is_resource($row[1]) ? stream_get_contents($row[1]) : $row[1]);
             }
         }
 
         if ($expired) {
             $sql = str_pad('', (\count($expired) << 1) - 1, '?,');
             $sql = "DELETE FROM $this->table WHERE $this->lifetimeCol + $this->timeCol <= ? AND $this->idCol IN ($sql)";
-            $stmt = $this->getConnection()->prepare($sql);
-            $stmt->bindValue($i = 1, $now, \PDO::PARAM_INT);
+            $stmt = $connection->prepare($sql);
+            $stmt->bindValue($i = 1, $now, $useDbalConstants ? ParameterType::INTEGER : \PDO::PARAM_INT);
             foreach ($expired as $id) {
                 $stmt->bindValue(++$i, $id);
             }
@@ -217,11 +251,14 @@ trait PdoTrait
      */
     protected function doHave($id)
     {
+        $connection = $this->getConnection();
+        $useDbalConstants = $connection instanceof Connection;
+
         $sql = "SELECT 1 FROM $this->table WHERE $this->idCol = :id AND ($this->lifetimeCol IS NULL OR $this->lifetimeCol + $this->timeCol > :time)";
-        $stmt = $this->getConnection()->prepare($sql);
+        $stmt = $connection->prepare($sql);
 
         $stmt->bindValue(':id', $id);
-        $stmt->bindValue(':time', time(), \PDO::PARAM_INT);
+        $stmt->bindValue(':time', time(), $useDbalConstants ? ParameterType::INTEGER : \PDO::PARAM_INT);
         $result = $stmt->execute();
 
         return (bool) (\is_object($result) ? $result->fetchOne() : $stmt->fetchColumn());
@@ -244,10 +281,14 @@ trait PdoTrait
             $sql = "DELETE FROM $this->table WHERE $this->idCol LIKE '$namespace%'";
         }
 
-        if (method_exists($conn, 'executeStatement')) {
-            $conn->executeStatement($sql);
-        } else {
-            $conn->exec($sql);
+        try {
+            if ($conn instanceof Connection && method_exists($conn, 'executeStatement')) {
+                $conn->executeStatement($sql);
+            } else {
+                $conn->exec($sql);
+            }
+        } catch (TableNotFoundException $e) {
+        } catch (\PDOException $e) {
         }
 
         return true;
@@ -260,8 +301,12 @@ trait PdoTrait
     {
         $sql = str_pad('', (\count($ids) << 1) - 1, '?,');
         $sql = "DELETE FROM $this->table WHERE $this->idCol IN ($sql)";
-        $stmt = $this->getConnection()->prepare($sql);
-        $stmt->execute(array_values($ids));
+        try {
+            $stmt = $this->getConnection()->prepare($sql);
+            $stmt->execute(array_values($ids));
+        } catch (TableNotFoundException $e) {
+        } catch (\PDOException $e) {
+        }
 
         return true;
     }
@@ -269,24 +314,15 @@ trait PdoTrait
     /**
      * {@inheritdoc}
      */
-    protected function doSave(array $values, $lifetime)
+    protected function doSave(array $values, int $lifetime)
     {
-        $serialized = [];
-        $failed = [];
-
-        foreach ($values as $id => $value) {
-            try {
-                $serialized[$id] = serialize($value);
-            } catch (\Exception $e) {
-                $failed[] = $id;
-            }
-        }
-
-        if (!$serialized) {
+        if (!$values = $this->marshaller->marshall($values, $failed)) {
             return $failed;
         }
 
         $conn = $this->getConnection();
+        $useDbalConstants = $conn instanceof Connection;
+
         $driver = $this->driver;
         $insertSql = "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time)";
 
@@ -321,39 +357,62 @@ trait PdoTrait
 
         $now = time();
         $lifetime = $lifetime ?: null;
-        $stmt = $conn->prepare($sql);
+        try {
+            $stmt = $conn->prepare($sql);
+        } catch (TableNotFoundException $e) {
+            if (!$conn->isTransactionActive() || \in_array($this->driver, ['pgsql', 'sqlite', 'sqlsrv'], true)) {
+                $this->createTable();
+            }
+            $stmt = $conn->prepare($sql);
+        } catch (\PDOException $e) {
+            if (!$conn->inTransaction() || \in_array($this->driver, ['pgsql', 'sqlite', 'sqlsrv'], true)) {
+                $this->createTable();
+            }
+            $stmt = $conn->prepare($sql);
+        }
 
         if ('sqlsrv' === $driver || 'oci' === $driver) {
             $stmt->bindParam(1, $id);
             $stmt->bindParam(2, $id);
-            $stmt->bindParam(3, $data, \PDO::PARAM_LOB);
-            $stmt->bindValue(4, $lifetime, \PDO::PARAM_INT);
-            $stmt->bindValue(5, $now, \PDO::PARAM_INT);
-            $stmt->bindParam(6, $data, \PDO::PARAM_LOB);
-            $stmt->bindValue(7, $lifetime, \PDO::PARAM_INT);
-            $stmt->bindValue(8, $now, \PDO::PARAM_INT);
+            $stmt->bindParam(3, $data, $useDbalConstants ? ParameterType::LARGE_OBJECT : \PDO::PARAM_LOB);
+            $stmt->bindValue(4, $lifetime, $useDbalConstants ? ParameterType::INTEGER : \PDO::PARAM_INT);
+            $stmt->bindValue(5, $now, $useDbalConstants ? ParameterType::INTEGER : \PDO::PARAM_INT);
+            $stmt->bindParam(6, $data, $useDbalConstants ? ParameterType::LARGE_OBJECT : \PDO::PARAM_LOB);
+            $stmt->bindValue(7, $lifetime, $useDbalConstants ? ParameterType::INTEGER : \PDO::PARAM_INT);
+            $stmt->bindValue(8, $now, $useDbalConstants ? ParameterType::INTEGER : \PDO::PARAM_INT);
         } else {
             $stmt->bindParam(':id', $id);
-            $stmt->bindParam(':data', $data, \PDO::PARAM_LOB);
-            $stmt->bindValue(':lifetime', $lifetime, \PDO::PARAM_INT);
-            $stmt->bindValue(':time', $now, \PDO::PARAM_INT);
+            $stmt->bindParam(':data', $data, $useDbalConstants ? ParameterType::LARGE_OBJECT : \PDO::PARAM_LOB);
+            $stmt->bindValue(':lifetime', $lifetime, $useDbalConstants ? ParameterType::INTEGER : \PDO::PARAM_INT);
+            $stmt->bindValue(':time', $now, $useDbalConstants ? ParameterType::INTEGER : \PDO::PARAM_INT);
         }
         if (null === $driver) {
             $insertStmt = $conn->prepare($insertSql);
 
             $insertStmt->bindParam(':id', $id);
-            $insertStmt->bindParam(':data', $data, \PDO::PARAM_LOB);
-            $insertStmt->bindValue(':lifetime', $lifetime, \PDO::PARAM_INT);
-            $insertStmt->bindValue(':time', $now, \PDO::PARAM_INT);
+            $insertStmt->bindParam(':data', $data, $useDbalConstants ? ParameterType::LARGE_OBJECT : \PDO::PARAM_LOB);
+            $insertStmt->bindValue(':lifetime', $lifetime, $useDbalConstants ? ParameterType::INTEGER : \PDO::PARAM_INT);
+            $insertStmt->bindValue(':time', $now, $useDbalConstants ? ParameterType::INTEGER : \PDO::PARAM_INT);
         }
 
-        foreach ($serialized as $id => $data) {
-            $result = $stmt->execute();
-
+        foreach ($values as $id => $data) {
+            try {
+                $result = $stmt->execute();
+            } catch (TableNotFoundException $e) {
+                if (!$conn->isTransactionActive() || \in_array($this->driver, ['pgsql', 'sqlite', 'sqlsrv'], true)) {
+                    $this->createTable();
+                }
+                $result = $stmt->execute();
+            } catch (\PDOException $e) {
+                if (!$conn->inTransaction() || \in_array($this->driver, ['pgsql', 'sqlite', 'sqlsrv'], true)) {
+                    $this->createTable();
+                }
+                $result = $stmt->execute();
+            }
             if (null === $driver && !(\is_object($result) ? $result->rowCount() : $stmt->rowCount())) {
                 try {
                     $insertStmt->execute();
-                } catch (DBALException $e) {
+                } catch (DBALException|Exception $e) {
                 } catch (\PDOException $e) {
                     // A concurrent write won, let it be
                 }
@@ -369,8 +428,15 @@ trait PdoTrait
     private function getConnection()
     {
         if (null === $this->conn) {
-            $this->conn = new \PDO($this->dsn, $this->username, $this->password, $this->connectionOptions);
-            $this->conn->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+            if (strpos($this->dsn, '://')) {
+                if (!class_exists(DriverManager::class)) {
+                    throw new InvalidArgumentException(sprintf('Failed to parse the DSN "%s". Try running "composer require doctrine/dbal".', $this->dsn));
+                }
+                $this->conn = DriverManager::getConnection(['url' => $this->dsn]);
+            } else {
+                $this->conn = new \PDO($this->dsn, $this->username, $this->password, $this->connectionOptions);
+                $this->conn->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+            }
         }
         if (null === $this->driver) {
             if ($this->conn instanceof \PDO) {
@@ -379,11 +445,9 @@ trait PdoTrait
                 $driver = $this->conn->getDriver();
 
                 switch (true) {
-                    case $driver instanceof \Doctrine\DBAL\Driver\AbstractMySQLDriver:
-                    case $driver instanceof \Doctrine\DBAL\Driver\DrizzlePDOMySql\Driver:
                     case $driver instanceof \Doctrine\DBAL\Driver\Mysqli\Driver:
-                    case $driver instanceof \Doctrine\DBAL\Driver\PDOMySql\Driver:
-                    case $driver instanceof \Doctrine\DBAL\Driver\PDO\MySQL\Driver:
+                        throw new \LogicException(sprintf('The adapter "%s" does not support the mysqli driver, use pdo_mysql instead.', static::class));
+                    case $driver instanceof \Doctrine\DBAL\Driver\AbstractMySQLDriver:
                         $this->driver = 'mysql';
                         break;
                     case $driver instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver:
@@ -404,6 +468,15 @@ trait PdoTrait
                     case $driver instanceof \Doctrine\DBAL\Driver\PDO\SQLSrv\Driver:
                         $this->driver = 'sqlsrv';
                         break;
+                    case $driver instanceof \Doctrine\DBAL\Driver:
+                        $this->driver = [
+                                'mssql' => 'sqlsrv',
+                                'oracle' => 'oci',
+                                'postgresql' => 'pgsql',
+                                'sqlite' => 'sqlite',
+                                'mysql' => 'mysql',
+                            ][$driver->getDatabasePlatform()->getName()] ?? \get_class($driver);
+                        break;
                     default:
                         $this->driver = \get_class($driver);
                         break;
@@ -414,10 +487,7 @@ trait PdoTrait
         return $this->conn;
     }
 
-    /**
-     * @return string
-     */
-    private function getServerVersion()
+    private function getServerVersion(): string
     {
         if (null === $this->serverVersion) {
             $conn = $this->conn instanceof \PDO ? $this->conn : $this->conn->getWrappedConnection();
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/PhpArrayTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/PhpArrayTrait.php
index 972c7512..230c7bd4 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/PhpArrayTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/PhpArrayTrait.php
@@ -11,8 +11,10 @@
 
 namespace Symfony\Component\Cache\Traits;
 
+use Symfony\Component\Cache\Adapter\AdapterInterface;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
+use Symfony\Component\VarExporter\VarExporter;
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
@@ -25,8 +27,8 @@ trait PhpArrayTrait
     use ProxyTrait;
 
     private $file;
+    private $keys;
     private $values;
-    private $zendDetectUnicode;
 
     private static $valuesCache = [];
 
@@ -57,56 +59,63 @@ trait PhpArrayTrait
             }
         }
 
+        $dumpedValues = '';
+        $dumpedMap = [];
         $dump = <<<'EOF'
 <?php
 
 // This file has been auto-generated by the Symfony Cache Component.
 
-return [
+return [[
 
 
 EOF;
 
         foreach ($values as $key => $value) {
             CacheItem::validateKey(\is_int($key) ? (string) $key : $key);
+            $isStaticValue = true;
 
-            if (null === $value || \is_object($value)) {
+            if (null === $value) {
+                $value = "'N;'";
+            } elseif (\is_object($value) || \is_array($value)) {
                 try {
-                    $value = serialize($value);
+                    $value = VarExporter::export($value, $isStaticValue);
                 } catch (\Exception $e) {
-                    throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable "%s" value.', $key, \get_class($value)), 0, $e);
-                }
-            } elseif (\is_array($value)) {
-                try {
-                    $serialized = serialize($value);
-                    $unserialized = unserialize($serialized);
-                } catch (\Exception $e) {
-                    throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable array value.', $key), 0, $e);
-                }
-                // Store arrays serialized if they contain any objects or references
-                if ($unserialized !== $value || (false !== strpos($serialized, ';R:') && preg_match('/;R:[1-9]/', $serialized))) {
-                    $value = $serialized;
+                    throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable "%s" value.', $key, \is_object($value) ? \get_class($value) : 'array'), 0, $e);
                 }
             } elseif (\is_string($value)) {
-                // Serialize strings if they could be confused with serialized objects or arrays
-                if ('N;' === $value || (isset($value[2]) && ':' === $value[1])) {
-                    $value = serialize($value);
+                // Wrap "N;" in a closure to not confuse it with an encoded `null`
+                if ('N;' === $value) {
+                    $isStaticValue = false;
                 }
-            } elseif (!is_scalar($value)) {
+                $value = var_export($value, true);
+            } elseif (!\is_scalar($value)) {
                 throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable "%s" value.', $key, \gettype($value)));
+            } else {
+                $value = var_export($value, true);
             }
 
-            $dump .= var_export($key, true).' => '.var_export($value, true).",\n";
+            if (!$isStaticValue) {
+                $value = str_replace("\n", "\n    ", $value);
+                $value = "static function () {\n    return {$value};\n}";
+            }
+            $hash = hash('md5', $value);
+
+            if (null === $id = $dumpedMap[$hash] ?? null) {
+                $id = $dumpedMap[$hash] = \count($dumpedMap);
+                $dumpedValues .= "{$id} => {$value},\n";
+            }
+
+            $dump .= var_export($key, true)." => {$id},\n";
         }
 
-        $dump .= "\n];\n";
-        $dump = str_replace("' . \"\\0\" . '", "\0", $dump);
+        $dump .= "\n], [\n\n{$dumpedValues}\n]];\n";
 
         $tmpFile = uniqid($this->file, true);
 
         file_put_contents($tmpFile, $dump);
         @chmod($tmpFile, 0666 & ~umask());
-        unset($serialized, $unserialized, $value, $dump);
+        unset($serialized, $value, $dump);
 
         @rename($tmpFile, $this->file);
         unset(self::$valuesCache[$this->file]);
@@ -116,14 +125,23 @@ EOF;
 
     /**
      * {@inheritdoc}
+     *
+     * @param string $prefix
+     *
+     * @return bool
      */
-    public function clear()
+    public function clear(/* string $prefix = '' */)
     {
-        $this->values = [];
+        $prefix = 0 < \func_num_args() ? (string) func_get_arg(0) : '';
+        $this->keys = $this->values = [];
 
         $cleared = @unlink($this->file) || !file_exists($this->file);
         unset(self::$valuesCache[$this->file]);
 
+        if ($this->pool instanceof AdapterInterface) {
+            return $this->pool->clear($prefix) && $cleared;
+        }
+
         return $this->pool->clear() && $cleared;
     }
 
@@ -133,20 +151,19 @@ EOF;
     private function initialize()
     {
         if (isset(self::$valuesCache[$this->file])) {
-            $this->values = self::$valuesCache[$this->file];
+            $values = self::$valuesCache[$this->file];
+        } elseif (!file_exists($this->file)) {
+            $this->keys = $this->values = [];
 
             return;
+        } else {
+            $values = self::$valuesCache[$this->file] = (include $this->file) ?: [[], []];
         }
 
-        if ($this->zendDetectUnicode) {
-            $zmb = ini_set('zend.detect_unicode', 0);
-        }
-        try {
-            $this->values = self::$valuesCache[$this->file] = file_exists($this->file) ? (include $this->file ?: []) : [];
-        } finally {
-            if ($this->zendDetectUnicode) {
-                ini_set('zend.detect_unicode', $zmb);
-            }
+        if (2 !== \count($values) || !isset($values[0], $values[1])) {
+            $this->keys = $this->values = [];
+        } else {
+            [$this->keys, $this->values] = $values;
         }
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/PhpFilesTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/PhpFilesTrait.php
index 2668b26c..c76e7fe3 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/PhpFilesTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/PhpFilesTrait.php
@@ -13,6 +13,7 @@ namespace Symfony\Component\Cache\Traits;
 
 use Symfony\Component\Cache\Exception\CacheException;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
+use Symfony\Component\VarExporter\VarExporter;
 
 /**
  * @author Piotr Stankowski <git@trakos.pl>
@@ -23,14 +24,24 @@ use Symfony\Component\Cache\Exception\InvalidArgumentException;
  */
 trait PhpFilesTrait
 {
-    use FilesystemCommonTrait;
+    use FilesystemCommonTrait {
+        doClear as private doCommonClear;
+        doDelete as private doCommonDelete;
+    }
 
     private $includeHandler;
-    private $zendDetectUnicode;
+    private $appendOnly;
+    private $values = [];
+    private $files = [];
+
+    private static $startTime;
+    private static $valuesCache = [];
 
     public static function isSupported()
     {
-        return \function_exists('opcache_invalidate') && filter_var(ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN);
+        self::$startTime = self::$startTime ?? $_SERVER['REQUEST_TIME'] ?? time();
+
+        return \function_exists('opcache_invalidate') && filter_var(\ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN) && (!\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) || filter_var(\ini_get('opcache.enable_cli'), \FILTER_VALIDATE_BOOLEAN));
     }
 
     /**
@@ -40,19 +51,21 @@ trait PhpFilesTrait
     {
         $time = time();
         $pruned = true;
-        $allowCompile = 'cli' !== \PHP_SAPI || filter_var(ini_get('opcache.enable_cli'), \FILTER_VALIDATE_BOOLEAN);
+        $getExpiry = true;
 
         set_error_handler($this->includeHandler);
         try {
-            foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->directory, \FilesystemIterator::SKIP_DOTS), \RecursiveIteratorIterator::LEAVES_ONLY) as $file) {
-                list($expiresAt) = include $file;
+            foreach ($this->scanHashDir($this->directory) as $file) {
+                try {
+                    if (\is_array($expiresAt = include $file)) {
+                        $expiresAt = $expiresAt[0];
+                    }
+                } catch (\ErrorException $e) {
+                    $expiresAt = $time;
+                }
 
                 if ($time >= $expiresAt) {
-                    $pruned = @unlink($file) && !file_exists($file) && $pruned;
-
-                    if ($allowCompile) {
-                        @opcache_invalidate($file, true);
-                    }
+                    $pruned = $this->doUnlink($file) && !file_exists($file) && $pruned;
                 }
             }
         } finally {
@@ -67,41 +80,75 @@ trait PhpFilesTrait
      */
     protected function doFetch(array $ids)
     {
-        $values = [];
-        $now = time();
-
-        if ($this->zendDetectUnicode) {
-            $zmb = ini_set('zend.detect_unicode', 0);
+        if ($this->appendOnly) {
+            $now = 0;
+            $missingIds = [];
+        } else {
+            $now = time();
+            $missingIds = $ids;
+            $ids = [];
         }
+        $values = [];
+
+        begin:
+        $getExpiry = false;
+
+        foreach ($ids as $id) {
+            if (null === $value = $this->values[$id] ?? null) {
+                $missingIds[] = $id;
+            } elseif ('N;' === $value) {
+                $values[$id] = null;
+            } elseif (!\is_object($value)) {
+                $values[$id] = $value;
+            } elseif (!$value instanceof LazyValue) {
+                $values[$id] = $value();
+            } elseif (false === $values[$id] = include $value->file) {
+                unset($values[$id], $this->values[$id]);
+                $missingIds[] = $id;
+            }
+            if (!$this->appendOnly) {
+                unset($this->values[$id]);
+            }
+        }
+
+        if (!$missingIds) {
+            return $values;
+        }
+
         set_error_handler($this->includeHandler);
         try {
-            foreach ($ids as $id) {
+            $getExpiry = true;
+
+            foreach ($missingIds as $k => $id) {
                 try {
-                    $file = $this->getFile($id);
-                    list($expiresAt, $values[$id]) = include $file;
-                    if ($now >= $expiresAt) {
-                        unset($values[$id]);
+                    $file = $this->files[$id] ?? $this->files[$id] = $this->getFile($id);
+
+                    if (isset(self::$valuesCache[$file])) {
+                        [$expiresAt, $this->values[$id]] = self::$valuesCache[$file];
+                    } elseif (\is_array($expiresAt = include $file)) {
+                        if ($this->appendOnly) {
+                            self::$valuesCache[$file] = $expiresAt;
+                        }
+
+                        [$expiresAt, $this->values[$id]] = $expiresAt;
+                    } elseif ($now < $expiresAt) {
+                        $this->values[$id] = new LazyValue($file);
                     }
-                } catch (\Exception $e) {
-                    continue;
+
+                    if ($now >= $expiresAt) {
+                        unset($this->values[$id], $missingIds[$k], self::$valuesCache[$file]);
+                    }
+                } catch (\ErrorException $e) {
+                    unset($missingIds[$k]);
                 }
             }
         } finally {
             restore_error_handler();
-            if ($this->zendDetectUnicode) {
-                ini_set('zend.detect_unicode', $zmb);
-            }
         }
 
-        foreach ($values as $id => $value) {
-            if ('N;' === $value) {
-                $values[$id] = null;
-            } elseif (\is_string($value) && isset($value[2]) && ':' === $value[1]) {
-                $values[$id] = parent::unserialize($value);
-            }
-        }
-
-        return $values;
+        $ids = $missingIds;
+        $missingIds = [];
+        goto begin;
     }
 
     /**
@@ -109,44 +156,94 @@ trait PhpFilesTrait
      */
     protected function doHave($id)
     {
-        return (bool) $this->doFetch([$id]);
+        if ($this->appendOnly && isset($this->values[$id])) {
+            return true;
+        }
+
+        set_error_handler($this->includeHandler);
+        try {
+            $file = $this->files[$id] ?? $this->files[$id] = $this->getFile($id);
+            $getExpiry = true;
+
+            if (isset(self::$valuesCache[$file])) {
+                [$expiresAt, $value] = self::$valuesCache[$file];
+            } elseif (\is_array($expiresAt = include $file)) {
+                if ($this->appendOnly) {
+                    self::$valuesCache[$file] = $expiresAt;
+                }
+
+                [$expiresAt, $value] = $expiresAt;
+            } elseif ($this->appendOnly) {
+                $value = new LazyValue($file);
+            }
+        } catch (\ErrorException $e) {
+            return false;
+        } finally {
+            restore_error_handler();
+        }
+        if ($this->appendOnly) {
+            $now = 0;
+            $this->values[$id] = $value;
+        } else {
+            $now = time();
+        }
+
+        return $now < $expiresAt;
     }
 
     /**
      * {@inheritdoc}
      */
-    protected function doSave(array $values, $lifetime)
+    protected function doSave(array $values, int $lifetime)
     {
         $ok = true;
-        $data = [$lifetime ? time() + $lifetime : \PHP_INT_MAX, ''];
-        $allowCompile = 'cli' !== \PHP_SAPI || filter_var(ini_get('opcache.enable_cli'), \FILTER_VALIDATE_BOOLEAN);
+        $expiry = $lifetime ? time() + $lifetime : 'PHP_INT_MAX';
+        $allowCompile = self::isSupported();
 
         foreach ($values as $key => $value) {
-            if (null === $value || \is_object($value)) {
-                $value = serialize($value);
-            } elseif (\is_array($value)) {
-                $serialized = serialize($value);
-                $unserialized = parent::unserialize($serialized);
-                // Store arrays serialized if they contain any objects or references
-                if ($unserialized !== $value || (false !== strpos($serialized, ';R:') && preg_match('/;R:[1-9]/', $serialized))) {
-                    $value = $serialized;
+            unset($this->values[$key]);
+            $isStaticValue = true;
+            if (null === $value) {
+                $value = "'N;'";
+            } elseif (\is_object($value) || \is_array($value)) {
+                try {
+                    $value = VarExporter::export($value, $isStaticValue);
+                } catch (\Exception $e) {
+                    throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable "%s" value.', $key, \is_object($value) ? \get_class($value) : 'array'), 0, $e);
                 }
             } elseif (\is_string($value)) {
-                // Serialize strings if they could be confused with serialized objects or arrays
-                if ('N;' === $value || (isset($value[2]) && ':' === $value[1])) {
-                    $value = serialize($value);
+                // Wrap "N;" in a closure to not confuse it with an encoded `null`
+                if ('N;' === $value) {
+                    $isStaticValue = false;
                 }
-            } elseif (!is_scalar($value)) {
+                $value = var_export($value, true);
+            } elseif (!\is_scalar($value)) {
                 throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable "%s" value.', $key, \gettype($value)));
+            } else {
+                $value = var_export($value, true);
             }
 
-            $data[1] = $value;
-            $file = $this->getFile($key, true);
-            $ok = $this->write($file, '<?php return '.var_export($data, true).';') && $ok;
+            $encodedKey = rawurlencode($key);
+
+            if ($isStaticValue) {
+                $value = "return [{$expiry}, {$value}];";
+            } elseif ($this->appendOnly) {
+                $value = "return [{$expiry}, static function () { return {$value}; }];";
+            } else {
+                // We cannot use a closure here because of https://bugs.php.net/76982
+                $value = str_replace('\Symfony\Component\VarExporter\Internal\\', '', $value);
+                $value = "namespace Symfony\Component\VarExporter\Internal;\n\nreturn \$getExpiry ? {$expiry} : {$value};";
+            }
+
+            $file = $this->files[$key] = $this->getFile($key, true);
+            // Since OPcache only compiles files older than the script execution start, set the file's mtime in the past
+            $ok = $this->write($file, "<?php //{$encodedKey}\n\n{$value}\n", self::$startTime - 10) && $ok;
 
             if ($allowCompile) {
                 @opcache_invalidate($file, true);
+                @opcache_compile_file($file);
             }
+            unset(self::$valuesCache[$file]);
         }
 
         if (!$ok && !is_writable($this->directory)) {
@@ -155,4 +252,62 @@ trait PhpFilesTrait
 
         return $ok;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doClear($namespace)
+    {
+        $this->values = [];
+
+        return $this->doCommonClear($namespace);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doDelete(array $ids)
+    {
+        foreach ($ids as $id) {
+            unset($this->values[$id]);
+        }
+
+        return $this->doCommonDelete($ids);
+    }
+
+    protected function doUnlink($file)
+    {
+        unset(self::$valuesCache[$file]);
+
+        if (self::isSupported()) {
+            @opcache_invalidate($file, true);
+        }
+
+        return @unlink($file);
+    }
+
+    private function getFileKey(string $file): string
+    {
+        if (!$h = @fopen($file, 'r')) {
+            return '';
+        }
+
+        $encodedKey = substr(fgets($h), 8);
+        fclose($h);
+
+        return rawurldecode(rtrim($encodedKey));
+    }
+}
+
+/**
+ * @internal
+ */
+class LazyValue
+{
+    public $file;
+
+    public function __construct(string $file)
+    {
+        $this->file = $file;
+    }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/ProxyTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/ProxyTrait.php
index d9e085b9..c86f360a 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/ProxyTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/ProxyTrait.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\Cache\Traits;
 
 use Symfony\Component\Cache\PruneableInterface;
-use Symfony\Component\Cache\ResettableInterface;
+use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
@@ -36,7 +36,7 @@ trait ProxyTrait
      */
     public function reset()
     {
-        if ($this->pool instanceof ResettableInterface) {
+        if ($this->pool instanceof ResetInterface) {
             $this->pool->reset();
         }
     }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/RedisClusterNodeProxy.php b/advancedcontentfilter/vendor/symfony/cache/Traits/RedisClusterNodeProxy.php
new file mode 100644
index 00000000..deba74f6
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/RedisClusterNodeProxy.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Traits;
+
+/**
+ * This file acts as a wrapper to the \RedisCluster implementation so it can accept the same type of calls as
+ *  individual \Redis objects.
+ *
+ * Calls are made to individual nodes via: RedisCluster->{method}($host, ...args)'
+ *  according to https://github.com/phpredis/phpredis/blob/develop/cluster.markdown#directed-node-commands
+ *
+ * @author Jack Thomas <jack.thomas@solidalpha.com>
+ *
+ * @internal
+ */
+class RedisClusterNodeProxy
+{
+    private $host;
+    private $redis;
+
+    /**
+     * @param \RedisCluster|RedisClusterProxy $redis
+     */
+    public function __construct(array $host, $redis)
+    {
+        $this->host = $host;
+        $this->redis = $redis;
+    }
+
+    public function __call(string $method, array $args)
+    {
+        return $this->redis->{$method}($this->host, ...$args);
+    }
+
+    public function scan(&$iIterator, $strPattern = null, $iCount = null)
+    {
+        return $this->redis->scan($iIterator, $this->host, $strPattern, $iCount);
+    }
+
+    public function getOption($name)
+    {
+        return $this->redis->getOption($name);
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/RedisClusterProxy.php b/advancedcontentfilter/vendor/symfony/cache/Traits/RedisClusterProxy.php
new file mode 100644
index 00000000..b4cef59a
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/RedisClusterProxy.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Traits;
+
+/**
+ * @author Alessandro Chitolina <alekitto@gmail.com>
+ *
+ * @internal
+ */
+class RedisClusterProxy
+{
+    private $redis;
+    private $initializer;
+
+    public function __construct(\Closure $initializer)
+    {
+        $this->initializer = $initializer;
+    }
+
+    public function __call($method, array $args)
+    {
+        $this->redis ?: $this->redis = $this->initializer->__invoke();
+
+        return $this->redis->{$method}(...$args);
+    }
+
+    public function hscan($strKey, &$iIterator, $strPattern = null, $iCount = null)
+    {
+        $this->redis ?: $this->redis = $this->initializer->__invoke();
+
+        return $this->redis->hscan($strKey, $iIterator, $strPattern, $iCount);
+    }
+
+    public function scan(&$iIterator, $strPattern = null, $iCount = null)
+    {
+        $this->redis ?: $this->redis = $this->initializer->__invoke();
+
+        return $this->redis->scan($iIterator, $strPattern, $iCount);
+    }
+
+    public function sscan($strKey, &$iIterator, $strPattern = null, $iCount = null)
+    {
+        $this->redis ?: $this->redis = $this->initializer->__invoke();
+
+        return $this->redis->sscan($strKey, $iIterator, $strPattern, $iCount);
+    }
+
+    public function zscan($strKey, &$iIterator, $strPattern = null, $iCount = null)
+    {
+        $this->redis ?: $this->redis = $this->initializer->__invoke();
+
+        return $this->redis->zscan($strKey, $iIterator, $strPattern, $iCount);
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/RedisProxy.php b/advancedcontentfilter/vendor/symfony/cache/Traits/RedisProxy.php
index 98ea3aba..2b0b8573 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/RedisProxy.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/RedisProxy.php
@@ -32,7 +32,7 @@ class RedisProxy
     {
         $this->ready ?: $this->ready = $this->initializer->__invoke($this->redis);
 
-        return \call_user_func_array([$this->redis, $method], $args);
+        return $this->redis->{$method}(...$args);
     }
 
     public function hscan($strKey, &$iIterator, $strPattern = null, $iCount = null)
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/RedisTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/RedisTrait.php
index a30d6d3f..dabdde4e 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/RedisTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/RedisTrait.php
@@ -13,10 +13,13 @@ namespace Symfony\Component\Cache\Traits;
 
 use Predis\Connection\Aggregate\ClusterInterface;
 use Predis\Connection\Aggregate\RedisCluster;
-use Predis\Connection\Factory;
+use Predis\Connection\Aggregate\ReplicationInterface;
+use Predis\Response\ErrorInterface;
 use Predis\Response\Status;
 use Symfony\Component\Cache\Exception\CacheException;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
+use Symfony\Component\Cache\Marshaller\DefaultMarshaller;
+use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 
 /**
  * @author Aurimas Niekis <aurimas@niekis.lt>
@@ -33,24 +36,40 @@ trait RedisTrait
         'timeout' => 30,
         'read_timeout' => 0,
         'retry_interval' => 0,
-        'lazy' => false,
+        'tcp_keepalive' => 0,
+        'lazy' => null,
+        'redis_cluster' => false,
+        'redis_sentinel' => null,
+        'dbindex' => 0,
+        'failover' => 'none',
+        'ssl' => null, // see https://php.net/context.ssl
     ];
     private $redis;
+    private $marshaller;
 
     /**
-     * @param \Redis|\RedisArray|\RedisCluster|\Predis\Client $redisClient
+     * @param \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy|RedisClusterProxy $redis
      */
-    private function init($redisClient, $namespace = '', $defaultLifetime = 0)
+    private function init($redis, string $namespace, int $defaultLifetime, ?MarshallerInterface $marshaller)
     {
         parent::__construct($namespace, $defaultLifetime);
 
         if (preg_match('#[^-+_.A-Za-z0-9]#', $namespace, $match)) {
             throw new InvalidArgumentException(sprintf('RedisAdapter namespace contains "%s" but only characters in [-+_.A-Za-z0-9] are allowed.', $match[0]));
         }
-        if (!$redisClient instanceof \Redis && !$redisClient instanceof \RedisArray && !$redisClient instanceof \RedisCluster && !$redisClient instanceof \Predis\Client && !$redisClient instanceof RedisProxy) {
-            throw new InvalidArgumentException(sprintf('"%s()" expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\Client, "%s" given.', __METHOD__, \is_object($redisClient) ? \get_class($redisClient) : \gettype($redisClient)));
+
+        if (!$redis instanceof \Redis && !$redis instanceof \RedisArray && !$redis instanceof \RedisCluster && !$redis instanceof \Predis\ClientInterface && !$redis instanceof RedisProxy && !$redis instanceof RedisClusterProxy) {
+            throw new InvalidArgumentException(sprintf('"%s()" expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\ClientInterface, "%s" given.', __METHOD__, \is_object($redis) ? \get_class($redis) : \gettype($redis)));
         }
-        $this->redis = $redisClient;
+
+        if ($redis instanceof \Predis\ClientInterface && $redis->getOptions()->exceptions) {
+            $options = clone $redis->getOptions();
+            \Closure::bind(function () { $this->options['exceptions'] = false; }, $options, $options)();
+            $redis = new $redis($redis->getConnection(), $options);
+        }
+
+        $this->redis = $redis;
+        $this->marshaller = $marshaller ?? new DefaultMarshaller();
     }
 
     /**
@@ -68,57 +87,117 @@ trait RedisTrait
      *
      * @throws InvalidArgumentException when the DSN is invalid
      *
-     * @return \Redis|\Predis\Client According to the "class" option
+     * @return \Redis|\RedisCluster|RedisClusterProxy|RedisProxy|\Predis\ClientInterface According to the "class" option
      */
     public static function createConnection($dsn, array $options = [])
     {
-        if (0 !== strpos($dsn, 'redis://')) {
-            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s" does not start with "redis://".', $dsn));
+        if (str_starts_with($dsn, 'redis:')) {
+            $scheme = 'redis';
+        } elseif (str_starts_with($dsn, 'rediss:')) {
+            $scheme = 'rediss';
+        } else {
+            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s" does not start with "redis:" or "rediss".', $dsn));
         }
-        $params = preg_replace_callback('#^redis://(?:(?:[^:@]*+:)?([^@]*+)@)?#', function ($m) use (&$auth) {
-            if (isset($m[1])) {
-                $auth = $m[1];
+
+        if (!\extension_loaded('redis') && !class_exists(\Predis\Client::class)) {
+            throw new CacheException(sprintf('Cannot find the "redis" extension nor the "predis/predis" package: "%s".', $dsn));
+        }
+
+        $params = preg_replace_callback('#^'.$scheme.':(//)?(?:(?:[^:@]*+:)?([^@]*+)@)?#', function ($m) use (&$auth) {
+            if (isset($m[2])) {
+                $auth = $m[2];
+
+                if ('' === $auth) {
+                    $auth = null;
+                }
             }
 
-            return 'file://';
+            return 'file:'.($m[1] ?? '');
         }, $dsn);
+
         if (false === $params = parse_url($params)) {
             throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s".', $dsn));
         }
-        if (!isset($params['host']) && !isset($params['path'])) {
-            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s".', $dsn));
-        }
-        if (isset($params['path']) && preg_match('#/(\d+)$#', $params['path'], $m)) {
-            $params['dbindex'] = $m[1];
-            $params['path'] = substr($params['path'], 0, -\strlen($m[0]));
-        }
-        if (isset($params['host'])) {
-            $scheme = 'tcp';
-        } else {
-            $scheme = 'unix';
-        }
-        $params += [
-            'host' => isset($params['host']) ? $params['host'] : $params['path'],
-            'port' => isset($params['host']) ? 6379 : null,
-            'dbindex' => 0,
-        ];
+
+        $query = $hosts = [];
+
+        $tls = 'rediss' === $scheme;
+        $tcpScheme = $tls ? 'tls' : 'tcp';
+
         if (isset($params['query'])) {
             parse_str($params['query'], $query);
-            $params += $query;
+
+            if (isset($query['host'])) {
+                if (!\is_array($hosts = $query['host'])) {
+                    throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s".', $dsn));
+                }
+                foreach ($hosts as $host => $parameters) {
+                    if (\is_string($parameters)) {
+                        parse_str($parameters, $parameters);
+                    }
+                    if (false === $i = strrpos($host, ':')) {
+                        $hosts[$host] = ['scheme' => $tcpScheme, 'host' => $host, 'port' => 6379] + $parameters;
+                    } elseif ($port = (int) substr($host, 1 + $i)) {
+                        $hosts[$host] = ['scheme' => $tcpScheme, 'host' => substr($host, 0, $i), 'port' => $port] + $parameters;
+                    } else {
+                        $hosts[$host] = ['scheme' => 'unix', 'path' => substr($host, 0, $i)] + $parameters;
+                    }
+                }
+                $hosts = array_values($hosts);
+            }
         }
-        $params += $options + self::$defaultConnectionOptions;
-        if (null === $params['class'] && !\extension_loaded('redis') && !class_exists(\Predis\Client::class)) {
-            throw new CacheException(sprintf('Cannot find the "redis" extension, and "predis/predis" is not installed: "%s".', $dsn));
+
+        if (isset($params['host']) || isset($params['path'])) {
+            if (!isset($params['dbindex']) && isset($params['path'])) {
+                if (preg_match('#/(\d+)$#', $params['path'], $m)) {
+                    $params['dbindex'] = $m[1];
+                    $params['path'] = substr($params['path'], 0, -\strlen($m[0]));
+                } elseif (isset($params['host'])) {
+                    throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s", the "dbindex" parameter must be a number.', $dsn));
+                }
+            }
+
+            if (isset($params['host'])) {
+                array_unshift($hosts, ['scheme' => $tcpScheme, 'host' => $params['host'], 'port' => $params['port'] ?? 6379]);
+            } else {
+                array_unshift($hosts, ['scheme' => 'unix', 'path' => $params['path']]);
+            }
+        }
+
+        if (!$hosts) {
+            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s".', $dsn));
+        }
+
+        $params += $query + $options + self::$defaultConnectionOptions;
+
+        if (isset($params['redis_sentinel']) && !class_exists(\Predis\Client::class)) {
+            throw new CacheException(sprintf('Redis Sentinel support requires the "predis/predis" package: "%s".', $dsn));
+        }
+
+        if (null === $params['class'] && !isset($params['redis_sentinel']) && \extension_loaded('redis')) {
+            $class = $params['redis_cluster'] ? \RedisCluster::class : (1 < \count($hosts) ? \RedisArray::class : \Redis::class);
+        } else {
+            $class = $params['class'] ?? \Predis\Client::class;
+
+            if (isset($params['redis_sentinel']) && !is_a($class, \Predis\Client::class, true)) {
+                throw new CacheException(sprintf('Cannot use Redis Sentinel: class "%s" does not extend "Predis\Client": "%s".', $class, $dsn));
+            }
         }
-        $class = null === $params['class'] ? (\extension_loaded('redis') ? \Redis::class : \Predis\Client::class) : $params['class'];
 
         if (is_a($class, \Redis::class, true)) {
             $connect = $params['persistent'] || $params['persistent_id'] ? 'pconnect' : 'connect';
             $redis = new $class();
 
-            $initializer = function ($redis) use ($connect, $params, $dsn, $auth) {
+            $initializer = static function ($redis) use ($connect, $params, $dsn, $auth, $hosts, $tls) {
+                $host = $hosts[0]['host'] ?? $hosts[0]['path'];
+                $port = $hosts[0]['port'] ?? 0;
+
+                if (isset($hosts[0]['host']) && $tls) {
+                    $host = 'tls://'.$host;
+                }
+
                 try {
-                    @$redis->{$connect}($params['host'], $params['port'], $params['timeout'], $params['persistent_id'], $params['retry_interval']);
+                    @$redis->{$connect}($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...\defined('Redis::SCAN_PREFIX') ? [['stream' => $params['ssl'] ?? null]] : []);
 
                     set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
                     $isConnected = $redis->isConnected();
@@ -130,11 +209,14 @@ trait RedisTrait
 
                     if ((null !== $auth && !$redis->auth($auth))
                         || ($params['dbindex'] && !$redis->select($params['dbindex']))
-                        || ($params['read_timeout'] && !$redis->setOption(\Redis::OPT_READ_TIMEOUT, $params['read_timeout']))
                     ) {
                         $e = preg_replace('/^ERR /', '', $redis->getLastError());
                         throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e.'.');
                     }
+
+                    if (0 < $params['tcp_keepalive'] && \defined('Redis::OPT_TCP_KEEPALIVE')) {
+                        $redis->setOption(\Redis::OPT_TCP_KEEPALIVE, $params['tcp_keepalive']);
+                    }
                 } catch (\RedisException $e) {
                     throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e->getMessage());
                 }
@@ -147,13 +229,92 @@ trait RedisTrait
             } else {
                 $initializer($redis);
             }
-        } elseif (is_a($class, \Predis\Client::class, true)) {
-            $params['scheme'] = $scheme;
-            $params['database'] = $params['dbindex'] ?: null;
-            $params['password'] = $auth;
-            $redis = new $class((new Factory())->create($params));
+        } elseif (is_a($class, \RedisArray::class, true)) {
+            foreach ($hosts as $i => $host) {
+                switch ($host['scheme']) {
+                    case 'tcp': $hosts[$i] = $host['host'].':'.$host['port']; break;
+                    case 'tls': $hosts[$i] = 'tls://'.$host['host'].':'.$host['port']; break;
+                    default: $hosts[$i] = $host['path'];
+                }
+            }
+            $params['lazy_connect'] = $params['lazy'] ?? true;
+            $params['connect_timeout'] = $params['timeout'];
+
+            try {
+                $redis = new $class($hosts, $params);
+            } catch (\RedisClusterException $e) {
+                throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e->getMessage());
+            }
+
+            if (0 < $params['tcp_keepalive'] && \defined('Redis::OPT_TCP_KEEPALIVE')) {
+                $redis->setOption(\Redis::OPT_TCP_KEEPALIVE, $params['tcp_keepalive']);
+            }
+        } elseif (is_a($class, \RedisCluster::class, true)) {
+            $initializer = static function () use ($class, $params, $dsn, $hosts) {
+                foreach ($hosts as $i => $host) {
+                    switch ($host['scheme']) {
+                        case 'tcp': $hosts[$i] = $host['host'].':'.$host['port']; break;
+                        case 'tls': $hosts[$i] = 'tls://'.$host['host'].':'.$host['port']; break;
+                        default: $hosts[$i] = $host['path'];
+                    }
+                }
+
+                try {
+                    $redis = new $class(null, $hosts, $params['timeout'], $params['read_timeout'], (bool) $params['persistent'], $params['auth'] ?? '', ...\defined('Redis::SCAN_PREFIX') ? [$params['ssl'] ?? null] : []);
+                } catch (\RedisClusterException $e) {
+                    throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e->getMessage());
+                }
+
+                if (0 < $params['tcp_keepalive'] && \defined('Redis::OPT_TCP_KEEPALIVE')) {
+                    $redis->setOption(\Redis::OPT_TCP_KEEPALIVE, $params['tcp_keepalive']);
+                }
+                switch ($params['failover']) {
+                    case 'error': $redis->setOption(\RedisCluster::OPT_SLAVE_FAILOVER, \RedisCluster::FAILOVER_ERROR); break;
+                    case 'distribute': $redis->setOption(\RedisCluster::OPT_SLAVE_FAILOVER, \RedisCluster::FAILOVER_DISTRIBUTE); break;
+                    case 'slaves': $redis->setOption(\RedisCluster::OPT_SLAVE_FAILOVER, \RedisCluster::FAILOVER_DISTRIBUTE_SLAVES); break;
+                }
+
+                return $redis;
+            };
+
+            $redis = $params['lazy'] ? new RedisClusterProxy($initializer) : $initializer();
+        } elseif (is_a($class, \Predis\ClientInterface::class, true)) {
+            if ($params['redis_cluster']) {
+                $params['cluster'] = 'redis';
+                if (isset($params['redis_sentinel'])) {
+                    throw new InvalidArgumentException(sprintf('Cannot use both "redis_cluster" and "redis_sentinel" at the same time: "%s".', $dsn));
+                }
+            } elseif (isset($params['redis_sentinel'])) {
+                $params['replication'] = 'sentinel';
+                $params['service'] = $params['redis_sentinel'];
+            }
+            $params += ['parameters' => []];
+            $params['parameters'] += [
+                'persistent' => $params['persistent'],
+                'timeout' => $params['timeout'],
+                'read_write_timeout' => $params['read_timeout'],
+                'tcp_nodelay' => true,
+            ];
+            if ($params['dbindex']) {
+                $params['parameters']['database'] = $params['dbindex'];
+            }
+            if (null !== $auth) {
+                $params['parameters']['password'] = $auth;
+            }
+            if (1 === \count($hosts) && !($params['redis_cluster'] || $params['redis_sentinel'])) {
+                $hosts = $hosts[0];
+            } elseif (\in_array($params['failover'], ['slaves', 'distribute'], true) && !isset($params['replication'])) {
+                $params['replication'] = true;
+                $hosts[0] += ['alias' => 'master'];
+            }
+            $params['exceptions'] = false;
+
+            $redis = new $class($hosts, array_diff_key($params, array_diff_key(self::$defaultConnectionOptions, ['ssl' => null])));
+            if (isset($params['redis_sentinel'])) {
+                $redis->getConnection()->setSentinelTimeout($params['timeout']);
+            }
         } elseif (class_exists($class, false)) {
-            throw new InvalidArgumentException(sprintf('"%s" is not a subclass of "Redis" or "Predis\Client".', $class));
+            throw new InvalidArgumentException(sprintf('"%s" is not a subclass of "Redis", "RedisArray", "RedisCluster" nor "Predis\ClientInterface".', $class));
         } else {
             throw new InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));
         }
@@ -172,7 +333,7 @@ trait RedisTrait
 
         $result = [];
 
-        if ($this->redis instanceof \Predis\Client && $this->redis->getConnection() instanceof ClusterInterface) {
+        if ($this->redis instanceof \Predis\ClientInterface && $this->redis->getConnection() instanceof ClusterInterface) {
             $values = $this->pipeline(function () use ($ids) {
                 foreach ($ids as $id) {
                     yield 'get' => [$id];
@@ -190,7 +351,7 @@ trait RedisTrait
 
         foreach ($values as $id => $v) {
             if ($v) {
-                $result[$id] = parent::unserialize($v);
+                $result[$id] = $this->marshaller->unmarshall($v);
             }
         }
 
@@ -210,32 +371,19 @@ trait RedisTrait
      */
     protected function doClear($namespace)
     {
-        $cleared = true;
-        $hosts = [$this->redis];
-        $evalArgs = [[$namespace], 0];
-
-        if ($this->redis instanceof \Predis\Client) {
-            $evalArgs = [0, $namespace];
-
-            $connection = $this->redis->getConnection();
-            if ($connection instanceof ClusterInterface && $connection instanceof \Traversable) {
-                $hosts = [];
-                foreach ($connection as $c) {
-                    $hosts[] = new \Predis\Client($c);
-                }
-            }
-        } elseif ($this->redis instanceof \RedisArray) {
-            $hosts = [];
-            foreach ($this->redis->_hosts() as $host) {
-                $hosts[] = $this->redis->_instance($host);
-            }
-        } elseif ($this->redis instanceof \RedisCluster) {
-            $hosts = [];
-            foreach ($this->redis->_masters() as $host) {
-                $hosts[] = $h = new \Redis();
-                $h->connect($host[0], $host[1]);
-            }
+        if ($this->redis instanceof \Predis\ClientInterface) {
+            $prefix = $this->redis->getOptions()->prefix ? $this->redis->getOptions()->prefix->getPrefix() : '';
+            $prefixLen = \strlen($prefix ?? '');
         }
+
+        $cleared = true;
+        $hosts = $this->getHosts();
+        $host = reset($hosts);
+        if ($host instanceof \Predis\Client && $host->getConnection() instanceof ReplicationInterface) {
+            // Predis supports info command only on the master in replication environments
+            $hosts = [$host->getClientFor('master')];
+        }
+
         foreach ($hosts as $host) {
             if (!isset($namespace[0])) {
                 $cleared = $host->flushDb() && $cleared;
@@ -243,24 +391,36 @@ trait RedisTrait
             }
 
             $info = $host->info('Server');
-            $info = isset($info['Server']) ? $info['Server'] : $info;
+            $info = !$info instanceof ErrorInterface ? $info['Server'] ?? $info : ['redis_version' => '2.0'];
+
+            if (!$host instanceof \Predis\ClientInterface) {
+                $prefix = \defined('Redis::SCAN_PREFIX') && (\Redis::SCAN_PREFIX & $host->getOption(\Redis::OPT_SCAN)) ? '' : $host->getOption(\Redis::OPT_PREFIX);
+                $prefixLen = \strlen($host->getOption(\Redis::OPT_PREFIX) ?? '');
+            }
+            $pattern = $prefix.$namespace.'*';
 
             if (!version_compare($info['redis_version'], '2.8', '>=')) {
                 // As documented in Redis documentation (http://redis.io/commands/keys) using KEYS
                 // can hang your server when it is executed against large databases (millions of items).
                 // Whenever you hit this scale, you should really consider upgrading to Redis 2.8 or above.
-                $cleared = $host->eval("local keys=redis.call('KEYS',ARGV[1]..'*') for i=1,#keys,5000 do redis.call('DEL',unpack(keys,i,math.min(i+4999,#keys))) end return 1", $evalArgs[0], $evalArgs[1]) && $cleared;
+                $args = $this->redis instanceof \Predis\ClientInterface ? [0, $pattern] : [[$pattern], 0];
+                $cleared = $host->eval("local keys=redis.call('KEYS',ARGV[1]) for i=1,#keys,5000 do redis.call('DEL',unpack(keys,i,math.min(i+4999,#keys))) end return 1", $args[0], $args[1]) && $cleared;
                 continue;
             }
 
             $cursor = null;
             do {
-                $keys = $host instanceof \Predis\Client ? $host->scan($cursor, 'MATCH', $namespace.'*', 'COUNT', 1000) : $host->scan($cursor, $namespace.'*', 1000);
+                $keys = $host instanceof \Predis\ClientInterface ? $host->scan($cursor, 'MATCH', $pattern, 'COUNT', 1000) : $host->scan($cursor, $pattern, 1000);
                 if (isset($keys[1]) && \is_array($keys[1])) {
                     $cursor = $keys[0];
                     $keys = $keys[1];
                 }
                 if ($keys) {
+                    if ($prefixLen) {
+                        foreach ($keys as $i => $key) {
+                            $keys[$i] = substr($key, $prefixLen);
+                        }
+                    }
                     $this->doDelete($keys);
                 }
             } while ($cursor = (int) $cursor);
@@ -278,7 +438,7 @@ trait RedisTrait
             return true;
         }
 
-        if ($this->redis instanceof \Predis\Client && $this->redis->getConnection() instanceof ClusterInterface) {
+        if ($this->redis instanceof \Predis\ClientInterface && $this->redis->getConnection() instanceof ClusterInterface) {
             $this->pipeline(function () use ($ids) {
                 foreach ($ids as $id) {
                     yield 'del' => [$id];
@@ -294,25 +454,14 @@ trait RedisTrait
     /**
      * {@inheritdoc}
      */
-    protected function doSave(array $values, $lifetime)
+    protected function doSave(array $values, int $lifetime)
     {
-        $serialized = [];
-        $failed = [];
-
-        foreach ($values as $id => $value) {
-            try {
-                $serialized[$id] = serialize($value);
-            } catch (\Exception $e) {
-                $failed[] = $id;
-            }
-        }
-
-        if (!$serialized) {
+        if (!$values = $this->marshaller->marshall($values, $failed)) {
             return $failed;
         }
 
-        $results = $this->pipeline(function () use ($serialized, $lifetime) {
-            foreach ($serialized as $id => $value) {
+        $results = $this->pipeline(function () use ($values, $lifetime) {
+            foreach ($values as $id => $value) {
                 if (0 >= $lifetime) {
                     yield 'set' => [$id, $value];
                 } else {
@@ -320,8 +469,9 @@ trait RedisTrait
                 }
             }
         });
+
         foreach ($results as $id => $result) {
-            if (true !== $result && (!$result instanceof Status || $result !== Status::get('OK'))) {
+            if (true !== $result && (!$result instanceof Status || Status::get('OK') !== $result)) {
                 $failed[] = $id;
             }
         }
@@ -329,54 +479,87 @@ trait RedisTrait
         return $failed;
     }
 
-    private function pipeline(\Closure $generator)
+    private function pipeline(\Closure $generator, $redis = null): \Generator
     {
         $ids = [];
+        $redis = $redis ?? $this->redis;
 
-        if ($this->redis instanceof \RedisCluster || ($this->redis instanceof \Predis\Client && $this->redis->getConnection() instanceof RedisCluster)) {
+        if ($redis instanceof RedisClusterProxy || $redis instanceof \RedisCluster || ($redis instanceof \Predis\ClientInterface && $redis->getConnection() instanceof RedisCluster)) {
             // phpredis & predis don't support pipelining with RedisCluster
             // see https://github.com/phpredis/phpredis/blob/develop/cluster.markdown#pipelining
             // see https://github.com/nrk/predis/issues/267#issuecomment-123781423
             $results = [];
             foreach ($generator() as $command => $args) {
-                $results[] = \call_user_func_array([$this->redis, $command], $args);
-                $ids[] = $args[0];
+                $results[] = $redis->{$command}(...$args);
+                $ids[] = 'eval' === $command ? ($redis instanceof \Predis\ClientInterface ? $args[2] : $args[1][0]) : $args[0];
             }
-        } elseif ($this->redis instanceof \Predis\Client) {
-            $results = $this->redis->pipeline(function ($redis) use ($generator, &$ids) {
+        } elseif ($redis instanceof \Predis\ClientInterface) {
+            $results = $redis->pipeline(static function ($redis) use ($generator, &$ids) {
                 foreach ($generator() as $command => $args) {
-                    \call_user_func_array([$redis, $command], $args);
-                    $ids[] = $args[0];
+                    $redis->{$command}(...$args);
+                    $ids[] = 'eval' === $command ? $args[2] : $args[0];
                 }
             });
-        } elseif ($this->redis instanceof \RedisArray) {
+        } elseif ($redis instanceof \RedisArray) {
             $connections = $results = $ids = [];
             foreach ($generator() as $command => $args) {
-                if (!isset($connections[$h = $this->redis->_target($args[0])])) {
-                    $connections[$h] = [$this->redis->_instance($h), -1];
+                $id = 'eval' === $command ? $args[1][0] : $args[0];
+                if (!isset($connections[$h = $redis->_target($id)])) {
+                    $connections[$h] = [$redis->_instance($h), -1];
                     $connections[$h][0]->multi(\Redis::PIPELINE);
                 }
-                \call_user_func_array([$connections[$h][0], $command], $args);
+                $connections[$h][0]->{$command}(...$args);
                 $results[] = [$h, ++$connections[$h][1]];
-                $ids[] = $args[0];
+                $ids[] = $id;
             }
             foreach ($connections as $h => $c) {
                 $connections[$h] = $c[0]->exec();
             }
-            foreach ($results as $k => list($h, $c)) {
+            foreach ($results as $k => [$h, $c]) {
                 $results[$k] = $connections[$h][$c];
             }
         } else {
-            $this->redis->multi(\Redis::PIPELINE);
+            $redis->multi(\Redis::PIPELINE);
             foreach ($generator() as $command => $args) {
-                \call_user_func_array([$this->redis, $command], $args);
-                $ids[] = $args[0];
+                $redis->{$command}(...$args);
+                $ids[] = 'eval' === $command ? $args[1][0] : $args[0];
             }
-            $results = $this->redis->exec();
+            $results = $redis->exec();
+        }
+
+        if (!$redis instanceof \Predis\ClientInterface && 'eval' === $command && $redis->getLastError()) {
+            $e = new \RedisException($redis->getLastError());
+            $results = array_map(function ($v) use ($e) { return false === $v ? $e : $v; }, $results);
         }
 
         foreach ($ids as $k => $id) {
             yield $id => $results[$k];
         }
     }
+
+    private function getHosts(): array
+    {
+        $hosts = [$this->redis];
+        if ($this->redis instanceof \Predis\ClientInterface) {
+            $connection = $this->redis->getConnection();
+            if ($connection instanceof ClusterInterface && $connection instanceof \Traversable) {
+                $hosts = [];
+                foreach ($connection as $c) {
+                    $hosts[] = new \Predis\Client($c);
+                }
+            }
+        } elseif ($this->redis instanceof \RedisArray) {
+            $hosts = [];
+            foreach ($this->redis->_hosts() as $host) {
+                $hosts[] = $this->redis->_instance($host);
+            }
+        } elseif ($this->redis instanceof RedisClusterProxy || $this->redis instanceof \RedisCluster) {
+            $hosts = [];
+            foreach ($this->redis->_masters() as $host) {
+                $hosts[] = new RedisClusterNodeProxy($host, $this->redis);
+            }
+        }
+
+        return $hosts;
+    }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/composer.json b/advancedcontentfilter/vendor/symfony/cache/composer.json
index f412e4f1..7a9e8df5 100644
--- a/advancedcontentfilter/vendor/symfony/cache/composer.json
+++ b/advancedcontentfilter/vendor/symfony/cache/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "symfony/cache",
     "type": "library",
-    "description": "Symfony Cache component with PSR-6, PSR-16, and tags",
+    "description": "Provides extended PSR-6, PSR-16 (and tags) implementations",
     "keywords": ["caching", "psr6"],
     "homepage": "https://symfony.com",
     "license": "MIT",
@@ -16,24 +16,37 @@
         }
     ],
     "provide": {
-        "psr/cache-implementation": "1.0",
-        "psr/simple-cache-implementation": "1.0"
+        "psr/cache-implementation": "1.0|2.0",
+        "psr/simple-cache-implementation": "1.0|2.0",
+        "symfony/cache-implementation": "1.0|2.0"
     },
     "require": {
-        "php": "^5.5.9|>=7.0.8",
-        "psr/cache": "~1.0",
-        "psr/log": "~1.0",
-        "psr/simple-cache": "^1.0",
-        "symfony/polyfill-apcu": "~1.1"
+        "php": ">=7.1.3",
+        "psr/cache": "^1.0|^2.0",
+        "psr/log": "^1|^2|^3",
+        "symfony/cache-contracts": "^1.1.7|^2",
+        "symfony/polyfill-php73": "^1.9",
+        "symfony/polyfill-php80": "^1.16",
+        "symfony/service-contracts": "^1.1|^2",
+        "symfony/var-exporter": "^4.2|^5.0"
     },
     "require-dev": {
         "cache/integration-tests": "dev-master",
-        "doctrine/cache": "^1.6",
-        "doctrine/dbal": "^2.4|^3.0",
-        "predis/predis": "^1.0"
+        "doctrine/cache": "^1.6|^2.0",
+        "doctrine/dbal": "^2.7|^3.0",
+        "predis/predis": "^1.1",
+        "psr/simple-cache": "^1.0|^2.0",
+        "symfony/config": "^4.2|^5.0",
+        "symfony/dependency-injection": "^3.4|^4.1|^5.0",
+        "symfony/filesystem": "^4.4|^5.0",
+        "symfony/http-kernel": "^4.4",
+        "symfony/var-dumper": "^4.4|^5.0"
     },
     "conflict": {
-        "symfony/var-dumper": "<3.3"
+        "doctrine/dbal": "<2.7",
+        "symfony/dependency-injection": "<3.4",
+        "symfony/http-kernel": "<4.4|>=5.0",
+        "symfony/var-dumper": "<4.4"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Cache\\": "" },
diff --git a/advancedcontentfilter/vendor/symfony/deprecation-contracts/.gitignore b/advancedcontentfilter/vendor/symfony/deprecation-contracts/.gitignore
new file mode 100644
index 00000000..c49a5d8d
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/deprecation-contracts/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/advancedcontentfilter/vendor/symfony/deprecation-contracts/CHANGELOG.md b/advancedcontentfilter/vendor/symfony/deprecation-contracts/CHANGELOG.md
new file mode 100644
index 00000000..7932e261
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/deprecation-contracts/CHANGELOG.md
@@ -0,0 +1,5 @@
+CHANGELOG
+=========
+
+The changelog is maintained for all Symfony contracts at the following URL:
+https://github.com/symfony/contracts/blob/main/CHANGELOG.md
diff --git a/advancedcontentfilter/vendor/symfony/deprecation-contracts/LICENSE b/advancedcontentfilter/vendor/symfony/deprecation-contracts/LICENSE
new file mode 100644
index 00000000..406242ff
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/deprecation-contracts/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2020-2022 Fabien Potencier
+
+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/advancedcontentfilter/vendor/symfony/deprecation-contracts/README.md b/advancedcontentfilter/vendor/symfony/deprecation-contracts/README.md
new file mode 100644
index 00000000..4957933a
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/deprecation-contracts/README.md
@@ -0,0 +1,26 @@
+Symfony Deprecation Contracts
+=============================
+
+A generic function and convention to trigger deprecation notices.
+
+This package provides a single global function named `trigger_deprecation()` that triggers silenced deprecation notices.
+
+By using a custom PHP error handler such as the one provided by the Symfony ErrorHandler component,
+the triggered deprecations can be caught and logged for later discovery, both on dev and prod environments.
+
+The function requires at least 3 arguments:
+ - the name of the Composer package that is triggering the deprecation
+ - the version of the package that introduced the deprecation
+ - the message of the deprecation
+ - more arguments can be provided: they will be inserted in the message using `printf()` formatting
+
+Example:
+```php
+trigger_deprecation('symfony/blockchain', '8.9', 'Using "%s" is deprecated, use "%s" instead.', 'bitcoin', 'fabcoin');
+```
+
+This will generate the following message:
+`Since symfony/blockchain 8.9: Using "bitcoin" is deprecated, use "fabcoin" instead.`
+
+While not necessarily recommended, the deprecation notices can be completely ignored by declaring an empty
+`function trigger_deprecation() {}` in your application.
diff --git a/advancedcontentfilter/vendor/symfony/deprecation-contracts/composer.json b/advancedcontentfilter/vendor/symfony/deprecation-contracts/composer.json
new file mode 100644
index 00000000..cc7cc123
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/deprecation-contracts/composer.json
@@ -0,0 +1,35 @@
+{
+    "name": "symfony/deprecation-contracts",
+    "type": "library",
+    "description": "A generic function and convention to trigger deprecation notices",
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Nicolas Grekas",
+            "email": "p@tchwork.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=7.1"
+    },
+    "autoload": {
+        "files": [
+            "function.php"
+        ]
+    },
+    "minimum-stability": "dev",
+    "extra": {
+        "branch-alias": {
+            "dev-main": "2.5-dev"
+        },
+        "thanks": {
+            "name": "symfony/contracts",
+            "url": "https://github.com/symfony/contracts"
+        }
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/deprecation-contracts/function.php b/advancedcontentfilter/vendor/symfony/deprecation-contracts/function.php
new file mode 100644
index 00000000..d4371504
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/deprecation-contracts/function.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+if (!function_exists('trigger_deprecation')) {
+    /**
+     * Triggers a silenced deprecation notice.
+     *
+     * @param string $package The name of the Composer package that is triggering the deprecation
+     * @param string $version The version of the package that introduced the deprecation
+     * @param string $message The message of the deprecation
+     * @param mixed  ...$args Values to insert in the message using printf() formatting
+     *
+     * @author Nicolas Grekas <p@tchwork.com>
+     */
+    function trigger_deprecation(string $package, string $version, string $message, ...$args): void
+    {
+        @trigger_error(($package || $version ? "Since $package $version: " : '').($args ? vsprintf($message, $args) : $message), \E_USER_DEPRECATED);
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php73/LICENSE b/advancedcontentfilter/vendor/symfony/polyfill-php73/LICENSE
new file mode 100644
index 00000000..7536caea
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/polyfill-php73/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2018-present Fabien Potencier
+
+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/advancedcontentfilter/vendor/symfony/polyfill-php73/Php73.php b/advancedcontentfilter/vendor/symfony/polyfill-php73/Php73.php
new file mode 100644
index 00000000..65c35a6a
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/polyfill-php73/Php73.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Php73;
+
+/**
+ * @author Gabriel Caruso <carusogabriel34@gmail.com>
+ * @author Ion Bazan <ion.bazan@gmail.com>
+ *
+ * @internal
+ */
+final class Php73
+{
+    public static $startAt = 1533462603;
+
+    /**
+     * @param bool $asNum
+     *
+     * @return array|float|int
+     */
+    public static function hrtime($asNum = false)
+    {
+        $ns = microtime(false);
+        $s = substr($ns, 11) - self::$startAt;
+        $ns = 1E9 * (float) $ns;
+
+        if ($asNum) {
+            $ns += $s * 1E9;
+
+            return \PHP_INT_SIZE === 4 ? $ns : (int) $ns;
+        }
+
+        return [$s, (int) $ns];
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php73/README.md b/advancedcontentfilter/vendor/symfony/polyfill-php73/README.md
new file mode 100644
index 00000000..032fafbd
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/polyfill-php73/README.md
@@ -0,0 +1,18 @@
+Symfony Polyfill / Php73
+========================
+
+This component provides functions added to PHP 7.3 core:
+
+- [`array_key_first`](https://php.net/array_key_first)
+- [`array_key_last`](https://php.net/array_key_last)
+- [`hrtime`](https://php.net/function.hrtime)
+- [`is_countable`](https://php.net/is_countable)
+- [`JsonException`](https://php.net/JsonException)
+
+More information can be found in the
+[main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md).
+
+License
+=======
+
+This library is released under the [MIT license](LICENSE).
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php73/Resources/stubs/JsonException.php b/advancedcontentfilter/vendor/symfony/polyfill-php73/Resources/stubs/JsonException.php
new file mode 100644
index 00000000..f06d6c26
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/polyfill-php73/Resources/stubs/JsonException.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+if (\PHP_VERSION_ID < 70300) {
+    class JsonException extends Exception
+    {
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php73/bootstrap.php b/advancedcontentfilter/vendor/symfony/polyfill-php73/bootstrap.php
new file mode 100644
index 00000000..d6b21538
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/polyfill-php73/bootstrap.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Polyfill\Php73 as p;
+
+if (\PHP_VERSION_ID >= 70300) {
+    return;
+}
+
+if (!function_exists('is_countable')) {
+    function is_countable($value) { return is_array($value) || $value instanceof Countable || $value instanceof ResourceBundle || $value instanceof SimpleXmlElement; }
+}
+if (!function_exists('hrtime')) {
+    require_once __DIR__.'/Php73.php';
+    p\Php73::$startAt = (int) microtime(true);
+    function hrtime($as_number = false) { return p\Php73::hrtime($as_number); }
+}
+if (!function_exists('array_key_first')) {
+    function array_key_first(array $array) { foreach ($array as $key => $value) { return $key; } }
+}
+if (!function_exists('array_key_last')) {
+    function array_key_last(array $array) { return key(array_slice($array, -1, 1, true)); }
+}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php73/composer.json b/advancedcontentfilter/vendor/symfony/polyfill-php73/composer.json
new file mode 100644
index 00000000..3d47d154
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/polyfill-php73/composer.json
@@ -0,0 +1,33 @@
+{
+    "name": "symfony/polyfill-php73",
+    "type": "library",
+    "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
+    "keywords": ["polyfill", "shim", "compatibility", "portable"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Nicolas Grekas",
+            "email": "p@tchwork.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=7.1"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Polyfill\\Php73\\": "" },
+        "files": [ "bootstrap.php" ],
+        "classmap": [ "Resources/stubs" ]
+    },
+    "minimum-stability": "dev",
+    "extra": {
+        "thanks": {
+            "name": "symfony/polyfill",
+            "url": "https://github.com/symfony/polyfill"
+        }
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php80/LICENSE b/advancedcontentfilter/vendor/symfony/polyfill-php80/LICENSE
new file mode 100644
index 00000000..0ed3a246
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/polyfill-php80/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2020-present Fabien Potencier
+
+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/advancedcontentfilter/vendor/symfony/polyfill-php80/Php80.php b/advancedcontentfilter/vendor/symfony/polyfill-php80/Php80.php
new file mode 100644
index 00000000..362dd1a9
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/polyfill-php80/Php80.php
@@ -0,0 +1,115 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Php80;
+
+/**
+ * @author Ion Bazan <ion.bazan@gmail.com>
+ * @author Nico Oelgart <nicoswd@gmail.com>
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @internal
+ */
+final class Php80
+{
+    public static function fdiv(float $dividend, float $divisor): float
+    {
+        return @($dividend / $divisor);
+    }
+
+    public static function get_debug_type($value): string
+    {
+        switch (true) {
+            case null === $value: return 'null';
+            case \is_bool($value): return 'bool';
+            case \is_string($value): return 'string';
+            case \is_array($value): return 'array';
+            case \is_int($value): return 'int';
+            case \is_float($value): return 'float';
+            case \is_object($value): break;
+            case $value instanceof \__PHP_Incomplete_Class: return '__PHP_Incomplete_Class';
+            default:
+                if (null === $type = @get_resource_type($value)) {
+                    return 'unknown';
+                }
+
+                if ('Unknown' === $type) {
+                    $type = 'closed';
+                }
+
+                return "resource ($type)";
+        }
+
+        $class = \get_class($value);
+
+        if (false === strpos($class, '@')) {
+            return $class;
+        }
+
+        return (get_parent_class($class) ?: key(class_implements($class)) ?: 'class').'@anonymous';
+    }
+
+    public static function get_resource_id($res): int
+    {
+        if (!\is_resource($res) && null === @get_resource_type($res)) {
+            throw new \TypeError(sprintf('Argument 1 passed to get_resource_id() must be of the type resource, %s given', get_debug_type($res)));
+        }
+
+        return (int) $res;
+    }
+
+    public static function preg_last_error_msg(): string
+    {
+        switch (preg_last_error()) {
+            case \PREG_INTERNAL_ERROR:
+                return 'Internal error';
+            case \PREG_BAD_UTF8_ERROR:
+                return 'Malformed UTF-8 characters, possibly incorrectly encoded';
+            case \PREG_BAD_UTF8_OFFSET_ERROR:
+                return 'The offset did not correspond to the beginning of a valid UTF-8 code point';
+            case \PREG_BACKTRACK_LIMIT_ERROR:
+                return 'Backtrack limit exhausted';
+            case \PREG_RECURSION_LIMIT_ERROR:
+                return 'Recursion limit exhausted';
+            case \PREG_JIT_STACKLIMIT_ERROR:
+                return 'JIT stack limit exhausted';
+            case \PREG_NO_ERROR:
+                return 'No error';
+            default:
+                return 'Unknown error';
+        }
+    }
+
+    public static function str_contains(string $haystack, string $needle): bool
+    {
+        return '' === $needle || false !== strpos($haystack, $needle);
+    }
+
+    public static function str_starts_with(string $haystack, string $needle): bool
+    {
+        return 0 === strncmp($haystack, $needle, \strlen($needle));
+    }
+
+    public static function str_ends_with(string $haystack, string $needle): bool
+    {
+        if ('' === $needle || $needle === $haystack) {
+            return true;
+        }
+
+        if ('' === $haystack) {
+            return false;
+        }
+
+        $needleLength = \strlen($needle);
+
+        return $needleLength <= \strlen($haystack) && 0 === substr_compare($haystack, $needle, -$needleLength);
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php80/PhpToken.php b/advancedcontentfilter/vendor/symfony/polyfill-php80/PhpToken.php
new file mode 100644
index 00000000..fe6e6910
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/polyfill-php80/PhpToken.php
@@ -0,0 +1,103 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Php80;
+
+/**
+ * @author Fedonyuk Anton <info@ensostudio.ru>
+ *
+ * @internal
+ */
+class PhpToken implements \Stringable
+{
+    /**
+     * @var int
+     */
+    public $id;
+
+    /**
+     * @var string
+     */
+    public $text;
+
+    /**
+     * @var int
+     */
+    public $line;
+
+    /**
+     * @var int
+     */
+    public $pos;
+
+    public function __construct(int $id, string $text, int $line = -1, int $position = -1)
+    {
+        $this->id = $id;
+        $this->text = $text;
+        $this->line = $line;
+        $this->pos = $position;
+    }
+
+    public function getTokenName(): ?string
+    {
+        if ('UNKNOWN' === $name = token_name($this->id)) {
+            $name = \strlen($this->text) > 1 || \ord($this->text) < 32 ? null : $this->text;
+        }
+
+        return $name;
+    }
+
+    /**
+     * @param int|string|array $kind
+     */
+    public function is($kind): bool
+    {
+        foreach ((array) $kind as $value) {
+            if (\in_array($value, [$this->id, $this->text], true)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public function isIgnorable(): bool
+    {
+        return \in_array($this->id, [\T_WHITESPACE, \T_COMMENT, \T_DOC_COMMENT, \T_OPEN_TAG], true);
+    }
+
+    public function __toString(): string
+    {
+        return (string) $this->text;
+    }
+
+    /**
+     * @return static[]
+     */
+    public static function tokenize(string $code, int $flags = 0): array
+    {
+        $line = 1;
+        $position = 0;
+        $tokens = token_get_all($code, $flags);
+        foreach ($tokens as $index => $token) {
+            if (\is_string($token)) {
+                $id = \ord($token);
+                $text = $token;
+            } else {
+                [$id, $text, $line] = $token;
+            }
+            $tokens[$index] = new static($id, $text, $line, $position);
+            $position += \strlen($text);
+        }
+
+        return $tokens;
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php80/README.md b/advancedcontentfilter/vendor/symfony/polyfill-php80/README.md
new file mode 100644
index 00000000..3816c559
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/polyfill-php80/README.md
@@ -0,0 +1,25 @@
+Symfony Polyfill / Php80
+========================
+
+This component provides features added to PHP 8.0 core:
+
+- [`Stringable`](https://php.net/stringable) interface
+- [`fdiv`](https://php.net/fdiv)
+- [`ValueError`](https://php.net/valueerror) class
+- [`UnhandledMatchError`](https://php.net/unhandledmatcherror) class
+- `FILTER_VALIDATE_BOOL` constant
+- [`get_debug_type`](https://php.net/get_debug_type)
+- [`PhpToken`](https://php.net/phptoken) class
+- [`preg_last_error_msg`](https://php.net/preg_last_error_msg)
+- [`str_contains`](https://php.net/str_contains)
+- [`str_starts_with`](https://php.net/str_starts_with)
+- [`str_ends_with`](https://php.net/str_ends_with)
+- [`get_resource_id`](https://php.net/get_resource_id)
+
+More information can be found in the
+[main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md).
+
+License
+=======
+
+This library is released under the [MIT license](LICENSE).
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/Attribute.php b/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/Attribute.php
new file mode 100644
index 00000000..2b955423
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/Attribute.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+#[Attribute(Attribute::TARGET_CLASS)]
+final class Attribute
+{
+    public const TARGET_CLASS = 1;
+    public const TARGET_FUNCTION = 2;
+    public const TARGET_METHOD = 4;
+    public const TARGET_PROPERTY = 8;
+    public const TARGET_CLASS_CONSTANT = 16;
+    public const TARGET_PARAMETER = 32;
+    public const TARGET_ALL = 63;
+    public const IS_REPEATABLE = 64;
+
+    /** @var int */
+    public $flags;
+
+    public function __construct(int $flags = self::TARGET_ALL)
+    {
+        $this->flags = $flags;
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/PhpToken.php b/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/PhpToken.php
new file mode 100644
index 00000000..bd1212f6
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/PhpToken.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+if (\PHP_VERSION_ID < 80000 && extension_loaded('tokenizer')) {
+    class PhpToken extends Symfony\Polyfill\Php80\PhpToken
+    {
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/Stringable.php b/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/Stringable.php
new file mode 100644
index 00000000..7c62d750
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/Stringable.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+if (\PHP_VERSION_ID < 80000) {
+    interface Stringable
+    {
+        /**
+         * @return string
+         */
+        public function __toString();
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php b/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php
new file mode 100644
index 00000000..01c6c6c8
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+if (\PHP_VERSION_ID < 80000) {
+    class UnhandledMatchError extends Error
+    {
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/ValueError.php b/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/ValueError.php
new file mode 100644
index 00000000..783dbc28
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/ValueError.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+if (\PHP_VERSION_ID < 80000) {
+    class ValueError extends Error
+    {
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php80/bootstrap.php b/advancedcontentfilter/vendor/symfony/polyfill-php80/bootstrap.php
new file mode 100644
index 00000000..e5f7dbc1
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/polyfill-php80/bootstrap.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Polyfill\Php80 as p;
+
+if (\PHP_VERSION_ID >= 80000) {
+    return;
+}
+
+if (!defined('FILTER_VALIDATE_BOOL') && defined('FILTER_VALIDATE_BOOLEAN')) {
+    define('FILTER_VALIDATE_BOOL', \FILTER_VALIDATE_BOOLEAN);
+}
+
+if (!function_exists('fdiv')) {
+    function fdiv(float $num1, float $num2): float { return p\Php80::fdiv($num1, $num2); }
+}
+if (!function_exists('preg_last_error_msg')) {
+    function preg_last_error_msg(): string { return p\Php80::preg_last_error_msg(); }
+}
+if (!function_exists('str_contains')) {
+    function str_contains(?string $haystack, ?string $needle): bool { return p\Php80::str_contains($haystack ?? '', $needle ?? ''); }
+}
+if (!function_exists('str_starts_with')) {
+    function str_starts_with(?string $haystack, ?string $needle): bool { return p\Php80::str_starts_with($haystack ?? '', $needle ?? ''); }
+}
+if (!function_exists('str_ends_with')) {
+    function str_ends_with(?string $haystack, ?string $needle): bool { return p\Php80::str_ends_with($haystack ?? '', $needle ?? ''); }
+}
+if (!function_exists('get_debug_type')) {
+    function get_debug_type($value): string { return p\Php80::get_debug_type($value); }
+}
+if (!function_exists('get_resource_id')) {
+    function get_resource_id($resource): int { return p\Php80::get_resource_id($resource); }
+}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php80/composer.json b/advancedcontentfilter/vendor/symfony/polyfill-php80/composer.json
new file mode 100644
index 00000000..46ccde20
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/polyfill-php80/composer.json
@@ -0,0 +1,37 @@
+{
+    "name": "symfony/polyfill-php80",
+    "type": "library",
+    "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+    "keywords": ["polyfill", "shim", "compatibility", "portable"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Ion Bazan",
+            "email": "ion.bazan@gmail.com"
+        },
+        {
+            "name": "Nicolas Grekas",
+            "email": "p@tchwork.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=7.1"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Polyfill\\Php80\\": "" },
+        "files": [ "bootstrap.php" ],
+        "classmap": [ "Resources/stubs" ]
+    },
+    "minimum-stability": "dev",
+    "extra": {
+        "thanks": {
+            "name": "symfony/polyfill",
+            "url": "https://github.com/symfony/polyfill"
+        }
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/.gitignore b/advancedcontentfilter/vendor/symfony/service-contracts/.gitignore
new file mode 100644
index 00000000..c49a5d8d
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/service-contracts/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/Attribute/Required.php b/advancedcontentfilter/vendor/symfony/service-contracts/Attribute/Required.php
new file mode 100644
index 00000000..9df85118
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/service-contracts/Attribute/Required.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Contracts\Service\Attribute;
+
+/**
+ * A required dependency.
+ *
+ * This attribute indicates that a property holds a required dependency. The annotated property or method should be
+ * considered during the instantiation process of the containing class.
+ *
+ * @author Alexander M. Turek <me@derrabus.de>
+ */
+#[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
+final class Required
+{
+}
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/Attribute/SubscribedService.php b/advancedcontentfilter/vendor/symfony/service-contracts/Attribute/SubscribedService.php
new file mode 100644
index 00000000..10d1bc38
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/service-contracts/Attribute/SubscribedService.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Contracts\Service\Attribute;
+
+use Symfony\Contracts\Service\ServiceSubscriberTrait;
+
+/**
+ * Use with {@see ServiceSubscriberTrait} to mark a method's return type
+ * as a subscribed service.
+ *
+ * @author Kevin Bond <kevinbond@gmail.com>
+ */
+#[\Attribute(\Attribute::TARGET_METHOD)]
+final class SubscribedService
+{
+    /**
+     * @param string|null $key The key to use for the service
+     *                         If null, use "ClassName::methodName"
+     */
+    public function __construct(
+        public ?string $key = null
+    ) {
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/CHANGELOG.md b/advancedcontentfilter/vendor/symfony/service-contracts/CHANGELOG.md
new file mode 100644
index 00000000..7932e261
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/service-contracts/CHANGELOG.md
@@ -0,0 +1,5 @@
+CHANGELOG
+=========
+
+The changelog is maintained for all Symfony contracts at the following URL:
+https://github.com/symfony/contracts/blob/main/CHANGELOG.md
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/LICENSE b/advancedcontentfilter/vendor/symfony/service-contracts/LICENSE
new file mode 100644
index 00000000..74cdc2db
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/service-contracts/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2018-2022 Fabien Potencier
+
+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/advancedcontentfilter/vendor/symfony/service-contracts/README.md b/advancedcontentfilter/vendor/symfony/service-contracts/README.md
new file mode 100644
index 00000000..41e054a1
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/service-contracts/README.md
@@ -0,0 +1,9 @@
+Symfony Service Contracts
+=========================
+
+A set of abstractions extracted out of the Symfony components.
+
+Can be used to build on semantics that the Symfony components proved useful - and
+that already have battle tested implementations.
+
+See https://github.com/symfony/contracts/blob/main/README.md for more information.
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/ResetInterface.php b/advancedcontentfilter/vendor/symfony/service-contracts/ResetInterface.php
new file mode 100644
index 00000000..1af1075e
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/service-contracts/ResetInterface.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Contracts\Service;
+
+/**
+ * Provides a way to reset an object to its initial state.
+ *
+ * When calling the "reset()" method on an object, it should be put back to its
+ * initial state. This usually means clearing any internal buffers and forwarding
+ * the call to internal dependencies. All properties of the object should be put
+ * back to the same state it had when it was first ready to use.
+ *
+ * This method could be called, for example, to recycle objects that are used as
+ * services, so that they can be used to handle several requests in the same
+ * process loop (note that we advise making your services stateless instead of
+ * implementing this interface when possible.)
+ */
+interface ResetInterface
+{
+    public function reset();
+}
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/ServiceLocatorTrait.php b/advancedcontentfilter/vendor/symfony/service-contracts/ServiceLocatorTrait.php
new file mode 100644
index 00000000..74dfa436
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/service-contracts/ServiceLocatorTrait.php
@@ -0,0 +1,128 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Contracts\Service;
+
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
+
+// Help opcache.preload discover always-needed symbols
+class_exists(ContainerExceptionInterface::class);
+class_exists(NotFoundExceptionInterface::class);
+
+/**
+ * A trait to help implement ServiceProviderInterface.
+ *
+ * @author Robin Chalas <robin.chalas@gmail.com>
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+trait ServiceLocatorTrait
+{
+    private $factories;
+    private $loading = [];
+    private $providedTypes;
+
+    /**
+     * @param callable[] $factories
+     */
+    public function __construct(array $factories)
+    {
+        $this->factories = $factories;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return bool
+     */
+    public function has(string $id)
+    {
+        return isset($this->factories[$id]);
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return mixed
+     */
+    public function get(string $id)
+    {
+        if (!isset($this->factories[$id])) {
+            throw $this->createNotFoundException($id);
+        }
+
+        if (isset($this->loading[$id])) {
+            $ids = array_values($this->loading);
+            $ids = \array_slice($this->loading, array_search($id, $ids));
+            $ids[] = $id;
+
+            throw $this->createCircularReferenceException($id, $ids);
+        }
+
+        $this->loading[$id] = $id;
+        try {
+            return $this->factories[$id]($this);
+        } finally {
+            unset($this->loading[$id]);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getProvidedServices(): array
+    {
+        if (null === $this->providedTypes) {
+            $this->providedTypes = [];
+
+            foreach ($this->factories as $name => $factory) {
+                if (!\is_callable($factory)) {
+                    $this->providedTypes[$name] = '?';
+                } else {
+                    $type = (new \ReflectionFunction($factory))->getReturnType();
+
+                    $this->providedTypes[$name] = $type ? ($type->allowsNull() ? '?' : '').($type instanceof \ReflectionNamedType ? $type->getName() : $type) : '?';
+                }
+            }
+        }
+
+        return $this->providedTypes;
+    }
+
+    private function createNotFoundException(string $id): NotFoundExceptionInterface
+    {
+        if (!$alternatives = array_keys($this->factories)) {
+            $message = 'is empty...';
+        } else {
+            $last = array_pop($alternatives);
+            if ($alternatives) {
+                $message = sprintf('only knows about the "%s" and "%s" services.', implode('", "', $alternatives), $last);
+            } else {
+                $message = sprintf('only knows about the "%s" service.', $last);
+            }
+        }
+
+        if ($this->loading) {
+            $message = sprintf('The service "%s" has a dependency on a non-existent service "%s". This locator %s', end($this->loading), $id, $message);
+        } else {
+            $message = sprintf('Service "%s" not found: the current service locator %s', $id, $message);
+        }
+
+        return new class($message) extends \InvalidArgumentException implements NotFoundExceptionInterface {
+        };
+    }
+
+    private function createCircularReferenceException(string $id, array $path): ContainerExceptionInterface
+    {
+        return new class(sprintf('Circular reference detected for service "%s", path: "%s".', $id, implode(' -> ', $path))) extends \RuntimeException implements ContainerExceptionInterface {
+        };
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/ServiceProviderInterface.php b/advancedcontentfilter/vendor/symfony/service-contracts/ServiceProviderInterface.php
new file mode 100644
index 00000000..c60ad0bd
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/service-contracts/ServiceProviderInterface.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Contracts\Service;
+
+use Psr\Container\ContainerInterface;
+
+/**
+ * A ServiceProviderInterface exposes the identifiers and the types of services provided by a container.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ * @author Mateusz Sip <mateusz.sip@gmail.com>
+ */
+interface ServiceProviderInterface extends ContainerInterface
+{
+    /**
+     * Returns an associative array of service types keyed by the identifiers provided by the current container.
+     *
+     * Examples:
+     *
+     *  * ['logger' => 'Psr\Log\LoggerInterface'] means the object provides a service named "logger" that implements Psr\Log\LoggerInterface
+     *  * ['foo' => '?'] means the container provides service name "foo" of unspecified type
+     *  * ['bar' => '?Bar\Baz'] means the container provides a service "bar" of type Bar\Baz|null
+     *
+     * @return string[] The provided service types, keyed by service names
+     */
+    public function getProvidedServices(): array;
+}
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/ServiceSubscriberInterface.php b/advancedcontentfilter/vendor/symfony/service-contracts/ServiceSubscriberInterface.php
new file mode 100644
index 00000000..098ab908
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/service-contracts/ServiceSubscriberInterface.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Contracts\Service;
+
+/**
+ * A ServiceSubscriber exposes its dependencies via the static {@link getSubscribedServices} method.
+ *
+ * The getSubscribedServices method returns an array of service types required by such instances,
+ * optionally keyed by the service names used internally. Service types that start with an interrogation
+ * mark "?" are optional, while the other ones are mandatory service dependencies.
+ *
+ * The injected service locators SHOULD NOT allow access to any other services not specified by the method.
+ *
+ * It is expected that ServiceSubscriber instances consume PSR-11-based service locators internally.
+ * This interface does not dictate any injection method for these service locators, although constructor
+ * injection is recommended.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+interface ServiceSubscriberInterface
+{
+    /**
+     * Returns an array of service types required by such instances, optionally keyed by the service names used internally.
+     *
+     * For mandatory dependencies:
+     *
+     *  * ['logger' => 'Psr\Log\LoggerInterface'] means the objects use the "logger" name
+     *    internally to fetch a service which must implement Psr\Log\LoggerInterface.
+     *  * ['loggers' => 'Psr\Log\LoggerInterface[]'] means the objects use the "loggers" name
+     *    internally to fetch an iterable of Psr\Log\LoggerInterface instances.
+     *  * ['Psr\Log\LoggerInterface'] is a shortcut for
+     *  * ['Psr\Log\LoggerInterface' => 'Psr\Log\LoggerInterface']
+     *
+     * otherwise:
+     *
+     *  * ['logger' => '?Psr\Log\LoggerInterface'] denotes an optional dependency
+     *  * ['loggers' => '?Psr\Log\LoggerInterface[]'] denotes an optional iterable dependency
+     *  * ['?Psr\Log\LoggerInterface'] is a shortcut for
+     *  * ['Psr\Log\LoggerInterface' => '?Psr\Log\LoggerInterface']
+     *
+     * @return string[] The required service types, optionally keyed by service names
+     */
+    public static function getSubscribedServices();
+}
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/ServiceSubscriberTrait.php b/advancedcontentfilter/vendor/symfony/service-contracts/ServiceSubscriberTrait.php
new file mode 100644
index 00000000..16e3eb2c
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/service-contracts/ServiceSubscriberTrait.php
@@ -0,0 +1,109 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Contracts\Service;
+
+use Psr\Container\ContainerInterface;
+use Symfony\Contracts\Service\Attribute\SubscribedService;
+
+/**
+ * Implementation of ServiceSubscriberInterface that determines subscribed services from
+ * method return types. Service ids are available as "ClassName::methodName".
+ *
+ * @author Kevin Bond <kevinbond@gmail.com>
+ */
+trait ServiceSubscriberTrait
+{
+    /** @var ContainerInterface */
+    protected $container;
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getSubscribedServices(): array
+    {
+        $services = method_exists(get_parent_class(self::class) ?: '', __FUNCTION__) ? parent::getSubscribedServices() : [];
+        $attributeOptIn = false;
+
+        if (\PHP_VERSION_ID >= 80000) {
+            foreach ((new \ReflectionClass(self::class))->getMethods() as $method) {
+                if (self::class !== $method->getDeclaringClass()->name) {
+                    continue;
+                }
+
+                if (!$attribute = $method->getAttributes(SubscribedService::class)[0] ?? null) {
+                    continue;
+                }
+
+                if ($method->isStatic() || $method->isAbstract() || $method->isGenerator() || $method->isInternal() || $method->getNumberOfRequiredParameters()) {
+                    throw new \LogicException(sprintf('Cannot use "%s" on method "%s::%s()" (can only be used on non-static, non-abstract methods with no parameters).', SubscribedService::class, self::class, $method->name));
+                }
+
+                if (!$returnType = $method->getReturnType()) {
+                    throw new \LogicException(sprintf('Cannot use "%s" on methods without a return type in "%s::%s()".', SubscribedService::class, $method->name, self::class));
+                }
+
+                $serviceId = $returnType instanceof \ReflectionNamedType ? $returnType->getName() : (string) $returnType;
+
+                if ($returnType->allowsNull()) {
+                    $serviceId = '?'.$serviceId;
+                }
+
+                $services[$attribute->newInstance()->key ?? self::class.'::'.$method->name] = $serviceId;
+                $attributeOptIn = true;
+            }
+        }
+
+        if (!$attributeOptIn) {
+            foreach ((new \ReflectionClass(self::class))->getMethods() as $method) {
+                if ($method->isStatic() || $method->isAbstract() || $method->isGenerator() || $method->isInternal() || $method->getNumberOfRequiredParameters()) {
+                    continue;
+                }
+
+                if (self::class !== $method->getDeclaringClass()->name) {
+                    continue;
+                }
+
+                if (!($returnType = $method->getReturnType()) instanceof \ReflectionNamedType) {
+                    continue;
+                }
+
+                if ($returnType->isBuiltin()) {
+                    continue;
+                }
+
+                if (\PHP_VERSION_ID >= 80000) {
+                    trigger_deprecation('symfony/service-contracts', '2.5', 'Using "%s" in "%s" without using the "%s" attribute on any method is deprecated.', ServiceSubscriberTrait::class, self::class, SubscribedService::class);
+                }
+
+                $services[self::class.'::'.$method->name] = '?'.($returnType instanceof \ReflectionNamedType ? $returnType->getName() : $returnType);
+            }
+        }
+
+        return $services;
+    }
+
+    /**
+     * @required
+     *
+     * @return ContainerInterface|null
+     */
+    public function setContainer(ContainerInterface $container)
+    {
+        $this->container = $container;
+
+        if (method_exists(get_parent_class(self::class) ?: '', __FUNCTION__)) {
+            return parent::setContainer($container);
+        }
+
+        return null;
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/Test/ServiceLocatorTest.php b/advancedcontentfilter/vendor/symfony/service-contracts/Test/ServiceLocatorTest.php
new file mode 100644
index 00000000..2a1b565f
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/service-contracts/Test/ServiceLocatorTest.php
@@ -0,0 +1,95 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Contracts\Service\Test;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
+use Symfony\Contracts\Service\ServiceLocatorTrait;
+
+abstract class ServiceLocatorTest extends TestCase
+{
+    /**
+     * @return ContainerInterface
+     */
+    protected function getServiceLocator(array $factories)
+    {
+        return new class($factories) implements ContainerInterface {
+            use ServiceLocatorTrait;
+        };
+    }
+
+    public function testHas()
+    {
+        $locator = $this->getServiceLocator([
+            'foo' => function () { return 'bar'; },
+            'bar' => function () { return 'baz'; },
+            function () { return 'dummy'; },
+        ]);
+
+        $this->assertTrue($locator->has('foo'));
+        $this->assertTrue($locator->has('bar'));
+        $this->assertFalse($locator->has('dummy'));
+    }
+
+    public function testGet()
+    {
+        $locator = $this->getServiceLocator([
+            'foo' => function () { return 'bar'; },
+            'bar' => function () { return 'baz'; },
+        ]);
+
+        $this->assertSame('bar', $locator->get('foo'));
+        $this->assertSame('baz', $locator->get('bar'));
+    }
+
+    public function testGetDoesNotMemoize()
+    {
+        $i = 0;
+        $locator = $this->getServiceLocator([
+            'foo' => function () use (&$i) {
+                ++$i;
+
+                return 'bar';
+            },
+        ]);
+
+        $this->assertSame('bar', $locator->get('foo'));
+        $this->assertSame('bar', $locator->get('foo'));
+        $this->assertSame(2, $i);
+    }
+
+    public function testThrowsOnUndefinedInternalService()
+    {
+        if (!$this->getExpectedException()) {
+            $this->expectException(\Psr\Container\NotFoundExceptionInterface::class);
+            $this->expectExceptionMessage('The service "foo" has a dependency on a non-existent service "bar". This locator only knows about the "foo" service.');
+        }
+        $locator = $this->getServiceLocator([
+            'foo' => function () use (&$locator) { return $locator->get('bar'); },
+        ]);
+
+        $locator->get('foo');
+    }
+
+    public function testThrowsOnCircularReference()
+    {
+        $this->expectException(\Psr\Container\ContainerExceptionInterface::class);
+        $this->expectExceptionMessage('Circular reference detected for service "bar", path: "bar -> baz -> bar".');
+        $locator = $this->getServiceLocator([
+            'foo' => function () use (&$locator) { return $locator->get('bar'); },
+            'bar' => function () use (&$locator) { return $locator->get('baz'); },
+            'baz' => function () use (&$locator) { return $locator->get('bar'); },
+        ]);
+
+        $locator->get('foo');
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/composer.json b/advancedcontentfilter/vendor/symfony/service-contracts/composer.json
new file mode 100644
index 00000000..f0586370
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/service-contracts/composer.json
@@ -0,0 +1,42 @@
+{
+    "name": "symfony/service-contracts",
+    "type": "library",
+    "description": "Generic abstractions related to writing services",
+    "keywords": ["abstractions", "contracts", "decoupling", "interfaces", "interoperability", "standards"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Nicolas Grekas",
+            "email": "p@tchwork.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=7.2.5",
+        "psr/container": "^1.1",
+        "symfony/deprecation-contracts": "^2.1|^3"
+    },
+    "conflict": {
+        "ext-psr": "<1.1|>=2"
+    },
+    "suggest": {
+        "symfony/service-implementation": ""
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Contracts\\Service\\": "" }
+    },
+    "minimum-stability": "dev",
+    "extra": {
+        "branch-alias": {
+            "dev-main": "2.5-dev"
+        },
+        "thanks": {
+            "name": "symfony/contracts",
+            "url": "https://github.com/symfony/contracts"
+        }
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/CHANGELOG.md b/advancedcontentfilter/vendor/symfony/var-exporter/CHANGELOG.md
new file mode 100644
index 00000000..3406c30e
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/var-exporter/CHANGELOG.md
@@ -0,0 +1,12 @@
+CHANGELOG
+=========
+
+5.1.0
+-----
+
+ * added argument `array &$foundClasses` to `VarExporter::export()` to ease with preloading exported values
+
+4.2.0
+-----
+
+ * added the component
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/Exception/ClassNotFoundException.php b/advancedcontentfilter/vendor/symfony/var-exporter/Exception/ClassNotFoundException.php
new file mode 100644
index 00000000..379a7651
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/var-exporter/Exception/ClassNotFoundException.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarExporter\Exception;
+
+class ClassNotFoundException extends \Exception implements ExceptionInterface
+{
+    public function __construct(string $class, ?\Throwable $previous = null)
+    {
+        parent::__construct(sprintf('Class "%s" not found.', $class), 0, $previous);
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/Exception/ExceptionInterface.php b/advancedcontentfilter/vendor/symfony/var-exporter/Exception/ExceptionInterface.php
new file mode 100644
index 00000000..adfaed47
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/var-exporter/Exception/ExceptionInterface.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarExporter\Exception;
+
+interface ExceptionInterface extends \Throwable
+{
+}
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/Exception/NotInstantiableTypeException.php b/advancedcontentfilter/vendor/symfony/var-exporter/Exception/NotInstantiableTypeException.php
new file mode 100644
index 00000000..b9ba225d
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/var-exporter/Exception/NotInstantiableTypeException.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarExporter\Exception;
+
+class NotInstantiableTypeException extends \Exception implements ExceptionInterface
+{
+    public function __construct(string $type, ?\Throwable $previous = null)
+    {
+        parent::__construct(sprintf('Type "%s" is not instantiable.', $type), 0, $previous);
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/Instantiator.php b/advancedcontentfilter/vendor/symfony/var-exporter/Instantiator.php
new file mode 100644
index 00000000..368c769a
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/var-exporter/Instantiator.php
@@ -0,0 +1,92 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarExporter;
+
+use Symfony\Component\VarExporter\Exception\ExceptionInterface;
+use Symfony\Component\VarExporter\Exception\NotInstantiableTypeException;
+use Symfony\Component\VarExporter\Internal\Hydrator;
+use Symfony\Component\VarExporter\Internal\Registry;
+
+/**
+ * A utility class to create objects without calling their constructor.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+final class Instantiator
+{
+    /**
+     * Creates an object and sets its properties without calling its constructor nor any other methods.
+     *
+     * For example:
+     *
+     *     // creates an empty instance of Foo
+     *     Instantiator::instantiate(Foo::class);
+     *
+     *     // creates a Foo instance and sets one of its properties
+     *     Instantiator::instantiate(Foo::class, ['propertyName' => $propertyValue]);
+     *
+     *     // creates a Foo instance and sets a private property defined on its parent Bar class
+     *     Instantiator::instantiate(Foo::class, [], [
+     *         Bar::class => ['privateBarProperty' => $propertyValue],
+     *     ]);
+     *
+     * Instances of ArrayObject, ArrayIterator and SplObjectStorage can be created
+     * by using the special "\0" property name to define their internal value:
+     *
+     *     // creates an SplObjectStorage where $info1 is attached to $obj1, etc.
+     *     Instantiator::instantiate(SplObjectStorage::class, ["\0" => [$obj1, $info1, $obj2, $info2...]]);
+     *
+     *     // creates an ArrayObject populated with $inputArray
+     *     Instantiator::instantiate(ArrayObject::class, ["\0" => [$inputArray]]);
+     *
+     * @param string $class             The class of the instance to create
+     * @param array  $properties        The properties to set on the instance
+     * @param array  $privateProperties The private properties to set on the instance,
+     *                                  keyed by their declaring class
+     *
+     * @throws ExceptionInterface When the instance cannot be created
+     */
+    public static function instantiate(string $class, array $properties = [], array $privateProperties = []): object
+    {
+        $reflector = Registry::$reflectors[$class] ?? Registry::getClassReflector($class);
+
+        if (Registry::$cloneable[$class]) {
+            $wrappedInstance = [clone Registry::$prototypes[$class]];
+        } elseif (Registry::$instantiableWithoutConstructor[$class]) {
+            $wrappedInstance = [$reflector->newInstanceWithoutConstructor()];
+        } elseif (null === Registry::$prototypes[$class]) {
+            throw new NotInstantiableTypeException($class);
+        } elseif ($reflector->implementsInterface('Serializable') && (\PHP_VERSION_ID < 70400 || !method_exists($class, '__unserialize'))) {
+            $wrappedInstance = [unserialize('C:'.\strlen($class).':"'.$class.'":0:{}')];
+        } else {
+            $wrappedInstance = [unserialize('O:'.\strlen($class).':"'.$class.'":0:{}')];
+        }
+
+        if ($properties) {
+            $privateProperties[$class] = isset($privateProperties[$class]) ? $properties + $privateProperties[$class] : $properties;
+        }
+
+        foreach ($privateProperties as $class => $properties) {
+            if (!$properties) {
+                continue;
+            }
+            foreach ($properties as $name => $value) {
+                // because they're also used for "unserialization", hydrators
+                // deal with array of instances, so we need to wrap values
+                $properties[$name] = [$value];
+            }
+            (Hydrator::$hydrators[$class] ?? Hydrator::getHydrator($class))($properties, $wrappedInstance);
+        }
+
+        return $wrappedInstance[0];
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Exporter.php b/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Exporter.php
new file mode 100644
index 00000000..51c29e45
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Exporter.php
@@ -0,0 +1,417 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarExporter\Internal;
+
+use Symfony\Component\VarExporter\Exception\NotInstantiableTypeException;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @internal
+ */
+class Exporter
+{
+    /**
+     * Prepares an array of values for VarExporter.
+     *
+     * For performance this method is public and has no type-hints.
+     *
+     * @param array             &$values
+     * @param \SplObjectStorage $objectsPool
+     * @param array             &$refsPool
+     * @param int               &$objectsCount
+     * @param bool              &$valuesAreStatic
+     *
+     * @throws NotInstantiableTypeException When a value cannot be serialized
+     */
+    public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount, &$valuesAreStatic): array
+    {
+        $refs = $values;
+        foreach ($values as $k => $value) {
+            if (\is_resource($value)) {
+                throw new NotInstantiableTypeException(get_resource_type($value).' resource');
+            }
+            $refs[$k] = $objectsPool;
+
+            if ($isRef = !$valueIsStatic = $values[$k] !== $objectsPool) {
+                $values[$k] = &$value; // Break hard references to make $values completely
+                unset($value);         // independent from the original structure
+                $refs[$k] = $value = $values[$k];
+                if ($value instanceof Reference && 0 > $value->id) {
+                    $valuesAreStatic = false;
+                    ++$value->count;
+                    continue;
+                }
+                $refsPool[] = [&$refs[$k], $value, &$value];
+                $refs[$k] = $values[$k] = new Reference(-\count($refsPool), $value);
+            }
+
+            if (\is_array($value)) {
+                if ($value) {
+                    $value = self::prepare($value, $objectsPool, $refsPool, $objectsCount, $valueIsStatic);
+                }
+                goto handle_value;
+            } elseif (!\is_object($value) || $value instanceof \UnitEnum) {
+                goto handle_value;
+            }
+
+            $valueIsStatic = false;
+            if (isset($objectsPool[$value])) {
+                ++$objectsCount;
+                $value = new Reference($objectsPool[$value][0]);
+                goto handle_value;
+            }
+
+            $class = \get_class($value);
+            $reflector = Registry::$reflectors[$class] ?? Registry::getClassReflector($class);
+            $properties = [];
+
+            if ($reflector->hasMethod('__serialize')) {
+                if (!$reflector->getMethod('__serialize')->isPublic()) {
+                    throw new \Error(sprintf('Call to %s method "%s::__serialize()".', $reflector->getMethod('__serialize')->isProtected() ? 'protected' : 'private', $class));
+                }
+
+                if (!\is_array($serializeProperties = $value->__serialize())) {
+                    throw new \TypeError($class.'::__serialize() must return an array');
+                }
+
+                if ($reflector->hasMethod('__unserialize')) {
+                    $properties = $serializeProperties;
+                } else {
+                    foreach ($serializeProperties as $n => $v) {
+                        $c = \PHP_VERSION_ID >= 80100 && $reflector->hasProperty($n) && ($p = $reflector->getProperty($n))->isReadOnly() ? $p->class : 'stdClass';
+                        $properties[$c][$n] = $v;
+                    }
+                }
+
+                goto prepare_value;
+            }
+
+            $sleep = null;
+            $proto = Registry::$prototypes[$class];
+
+            if (($value instanceof \ArrayIterator || $value instanceof \ArrayObject) && null !== $proto) {
+                // ArrayIterator and ArrayObject need special care because their "flags"
+                // option changes the behavior of the (array) casting operator.
+                [$arrayValue, $properties] = self::getArrayObjectProperties($value, $proto);
+
+                // populates Registry::$prototypes[$class] with a new instance
+                Registry::getClassReflector($class, Registry::$instantiableWithoutConstructor[$class], Registry::$cloneable[$class]);
+            } elseif ($value instanceof \SplObjectStorage && Registry::$cloneable[$class] && null !== $proto) {
+                // By implementing Serializable, SplObjectStorage breaks
+                // internal references; let's deal with it on our own.
+                foreach (clone $value as $v) {
+                    $properties[] = $v;
+                    $properties[] = $value[$v];
+                }
+                $properties = ['SplObjectStorage' => ["\0" => $properties]];
+                $arrayValue = (array) $value;
+            } elseif ($value instanceof \Serializable
+                || $value instanceof \__PHP_Incomplete_Class
+                || \PHP_VERSION_ID < 80200 && $value instanceof \DatePeriod
+            ) {
+                ++$objectsCount;
+                $objectsPool[$value] = [$id = \count($objectsPool), serialize($value), [], 0];
+                $value = new Reference($id);
+                goto handle_value;
+            } else {
+                if (method_exists($class, '__sleep')) {
+                    if (!\is_array($sleep = $value->__sleep())) {
+                        trigger_error('serialize(): __sleep should return an array only containing the names of instance-variables to serialize', \E_USER_NOTICE);
+                        $value = null;
+                        goto handle_value;
+                    }
+                    $sleep = array_flip($sleep);
+                }
+
+                $arrayValue = (array) $value;
+            }
+
+            $proto = (array) $proto;
+
+            foreach ($arrayValue as $name => $v) {
+                $i = 0;
+                $n = (string) $name;
+                if ('' === $n || "\0" !== $n[0]) {
+                    $c = \PHP_VERSION_ID >= 80100 && $reflector->hasProperty($n) && ($p = $reflector->getProperty($n))->isReadOnly() ? $p->class : 'stdClass';
+                } elseif ('*' === $n[1]) {
+                    $n = substr($n, 3);
+                    $c = $reflector->getProperty($n)->class;
+                    if ('Error' === $c) {
+                        $c = 'TypeError';
+                    } elseif ('Exception' === $c) {
+                        $c = 'ErrorException';
+                    }
+                } else {
+                    $i = strpos($n, "\0", 2);
+                    $c = substr($n, 1, $i - 1);
+                    $n = substr($n, 1 + $i);
+                }
+                if (null !== $sleep) {
+                    if (!isset($sleep[$name]) && (!isset($sleep[$n]) || ($i && $c !== $class))) {
+                        unset($arrayValue[$name]);
+                        continue;
+                    }
+                    unset($sleep[$name], $sleep[$n]);
+                }
+                if (!\array_key_exists($name, $proto) || $proto[$name] !== $v || "\x00Error\x00trace" === $name || "\x00Exception\x00trace" === $name) {
+                    $properties[$c][$n] = $v;
+                }
+            }
+            if ($sleep) {
+                foreach ($sleep as $n => $v) {
+                    trigger_error(sprintf('serialize(): "%s" returned as member variable from __sleep() but does not exist', $n), \E_USER_NOTICE);
+                }
+            }
+            if (method_exists($class, '__unserialize')) {
+                $properties = $arrayValue;
+            }
+
+            prepare_value:
+            $objectsPool[$value] = [$id = \count($objectsPool)];
+            $properties = self::prepare($properties, $objectsPool, $refsPool, $objectsCount, $valueIsStatic);
+            ++$objectsCount;
+            $objectsPool[$value] = [$id, $class, $properties, method_exists($class, '__unserialize') ? -$objectsCount : (method_exists($class, '__wakeup') ? $objectsCount : 0)];
+
+            $value = new Reference($id);
+
+            handle_value:
+            if ($isRef) {
+                unset($value); // Break the hard reference created above
+            } elseif (!$valueIsStatic) {
+                $values[$k] = $value;
+            }
+            $valuesAreStatic = $valueIsStatic && $valuesAreStatic;
+        }
+
+        return $values;
+    }
+
+    public static function export($value, string $indent = '')
+    {
+        switch (true) {
+            case \is_int($value) || \is_float($value): return var_export($value, true);
+            case [] === $value: return '[]';
+            case false === $value: return 'false';
+            case true === $value: return 'true';
+            case null === $value: return 'null';
+            case '' === $value: return "''";
+            case $value instanceof \UnitEnum: return '\\'.ltrim(var_export($value, true), '\\');
+        }
+
+        if ($value instanceof Reference) {
+            if (0 <= $value->id) {
+                return '$o['.$value->id.']';
+            }
+            if (!$value->count) {
+                return self::export($value->value, $indent);
+            }
+            $value = -$value->id;
+
+            return '&$r['.$value.']';
+        }
+        $subIndent = $indent.'    ';
+
+        if (\is_string($value)) {
+            $code = sprintf("'%s'", addcslashes($value, "'\\"));
+
+            $code = preg_replace_callback("/((?:[\\0\\r\\n]|\u{202A}|\u{202B}|\u{202D}|\u{202E}|\u{2066}|\u{2067}|\u{2068}|\u{202C}|\u{2069})++)(.)/", function ($m) use ($subIndent) {
+                $m[1] = sprintf('\'."%s".\'', str_replace(
+                    ["\0", "\r", "\n", "\u{202A}", "\u{202B}", "\u{202D}", "\u{202E}", "\u{2066}", "\u{2067}", "\u{2068}", "\u{202C}", "\u{2069}", '\n\\'],
+                    ['\0', '\r', '\n', '\u{202A}', '\u{202B}', '\u{202D}', '\u{202E}', '\u{2066}', '\u{2067}', '\u{2068}', '\u{202C}', '\u{2069}', '\n"'."\n".$subIndent.'."\\'],
+                    $m[1]
+                ));
+
+                if ("'" === $m[2]) {
+                    return substr($m[1], 0, -2);
+                }
+
+                if ('n".\'' === substr($m[1], -4)) {
+                    return substr_replace($m[1], "\n".$subIndent.".'".$m[2], -2);
+                }
+
+                return $m[1].$m[2];
+            }, $code, -1, $count);
+
+            if ($count && str_starts_with($code, "''.")) {
+                $code = substr($code, 3);
+            }
+
+            return $code;
+        }
+
+        if (\is_array($value)) {
+            $j = -1;
+            $code = '';
+            foreach ($value as $k => $v) {
+                $code .= $subIndent;
+                if (!\is_int($k) || 1 !== $k - $j) {
+                    $code .= self::export($k, $subIndent).' => ';
+                }
+                if (\is_int($k) && $k > $j) {
+                    $j = $k;
+                }
+                $code .= self::export($v, $subIndent).",\n";
+            }
+
+            return "[\n".$code.$indent.']';
+        }
+
+        if ($value instanceof Values) {
+            $code = $subIndent."\$r = [],\n";
+            foreach ($value->values as $k => $v) {
+                $code .= $subIndent.'$r['.$k.'] = '.self::export($v, $subIndent).",\n";
+            }
+
+            return "[\n".$code.$indent.']';
+        }
+
+        if ($value instanceof Registry) {
+            return self::exportRegistry($value, $indent, $subIndent);
+        }
+
+        if ($value instanceof Hydrator) {
+            return self::exportHydrator($value, $indent, $subIndent);
+        }
+
+        throw new \UnexpectedValueException(sprintf('Cannot export value of type "%s".', get_debug_type($value)));
+    }
+
+    private static function exportRegistry(Registry $value, string $indent, string $subIndent): string
+    {
+        $code = '';
+        $serializables = [];
+        $seen = [];
+        $prototypesAccess = 0;
+        $factoriesAccess = 0;
+        $r = '\\'.Registry::class;
+        $j = -1;
+
+        foreach ($value->classes as $k => $class) {
+            if (':' === ($class[1] ?? null)) {
+                $serializables[$k] = $class;
+                continue;
+            }
+            if (!Registry::$instantiableWithoutConstructor[$class]) {
+                if (is_subclass_of($class, 'Serializable') && !method_exists($class, '__unserialize')) {
+                    $serializables[$k] = 'C:'.\strlen($class).':"'.$class.'":0:{}';
+                } else {
+                    $serializables[$k] = 'O:'.\strlen($class).':"'.$class.'":0:{}';
+                }
+                if (is_subclass_of($class, 'Throwable')) {
+                    $eol = is_subclass_of($class, 'Error') ? "\0Error\0" : "\0Exception\0";
+                    $serializables[$k] = substr_replace($serializables[$k], '1:{s:'.(5 + \strlen($eol)).':"'.$eol.'trace";a:0:{}}', -4);
+                }
+                continue;
+            }
+            $code .= $subIndent.(1 !== $k - $j ? $k.' => ' : '');
+            $j = $k;
+            $eol = ",\n";
+            $c = '['.self::export($class).']';
+
+            if ($seen[$class] ?? false) {
+                if (Registry::$cloneable[$class]) {
+                    ++$prototypesAccess;
+                    $code .= 'clone $p'.$c;
+                } else {
+                    ++$factoriesAccess;
+                    $code .= '$f'.$c.'()';
+                }
+            } else {
+                $seen[$class] = true;
+                if (Registry::$cloneable[$class]) {
+                    $code .= 'clone ('.($prototypesAccess++ ? '$p' : '($p = &'.$r.'::$prototypes)').$c.' ?? '.$r.'::p';
+                } else {
+                    $code .= '('.($factoriesAccess++ ? '$f' : '($f = &'.$r.'::$factories)').$c.' ?? '.$r.'::f';
+                    $eol = '()'.$eol;
+                }
+                $code .= '('.substr($c, 1, -1).'))';
+            }
+            $code .= $eol;
+        }
+
+        if (1 === $prototypesAccess) {
+            $code = str_replace('($p = &'.$r.'::$prototypes)', $r.'::$prototypes', $code);
+        }
+        if (1 === $factoriesAccess) {
+            $code = str_replace('($f = &'.$r.'::$factories)', $r.'::$factories', $code);
+        }
+        if ('' !== $code) {
+            $code = "\n".$code.$indent;
+        }
+
+        if ($serializables) {
+            $code = $r.'::unserialize(['.$code.'], '.self::export($serializables, $indent).')';
+        } else {
+            $code = '['.$code.']';
+        }
+
+        return '$o = '.$code;
+    }
+
+    private static function exportHydrator(Hydrator $value, string $indent, string $subIndent): string
+    {
+        $code = '';
+        foreach ($value->properties as $class => $properties) {
+            $code .= $subIndent.'    '.self::export($class).' => '.self::export($properties, $subIndent.'    ').",\n";
+        }
+
+        $code = [
+            self::export($value->registry, $subIndent),
+            self::export($value->values, $subIndent),
+            '' !== $code ? "[\n".$code.$subIndent.']' : '[]',
+            self::export($value->value, $subIndent),
+            self::export($value->wakeups, $subIndent),
+        ];
+
+        return '\\'.\get_class($value)."::hydrate(\n".$subIndent.implode(",\n".$subIndent, $code)."\n".$indent.')';
+    }
+
+    /**
+     * @param \ArrayIterator|\ArrayObject $value
+     * @param \ArrayIterator|\ArrayObject $proto
+     */
+    private static function getArrayObjectProperties($value, $proto): array
+    {
+        $reflector = $value instanceof \ArrayIterator ? 'ArrayIterator' : 'ArrayObject';
+        $reflector = Registry::$reflectors[$reflector] ?? Registry::getClassReflector($reflector);
+
+        $properties = [
+            $arrayValue = (array) $value,
+            $reflector->getMethod('getFlags')->invoke($value),
+            $value instanceof \ArrayObject ? $reflector->getMethod('getIteratorClass')->invoke($value) : 'ArrayIterator',
+        ];
+
+        $reflector = $reflector->getMethod('setFlags');
+        $reflector->invoke($proto, \ArrayObject::STD_PROP_LIST);
+
+        if ($properties[1] & \ArrayObject::STD_PROP_LIST) {
+            $reflector->invoke($value, 0);
+            $properties[0] = (array) $value;
+        } else {
+            $reflector->invoke($value, \ArrayObject::STD_PROP_LIST);
+            $arrayValue = (array) $value;
+        }
+        $reflector->invoke($value, $properties[1]);
+
+        if ([[], 0, 'ArrayIterator'] === $properties) {
+            $properties = [];
+        } else {
+            if ('ArrayIterator' === $properties[2]) {
+                unset($properties[2]);
+            }
+            $properties = [$reflector->class => ["\0" => $properties]];
+        }
+
+        return [$arrayValue, $properties];
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Hydrator.php b/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Hydrator.php
new file mode 100644
index 00000000..5ed6bdc9
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Hydrator.php
@@ -0,0 +1,152 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarExporter\Internal;
+
+use Symfony\Component\VarExporter\Exception\ClassNotFoundException;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @internal
+ */
+class Hydrator
+{
+    public static $hydrators = [];
+
+    public $registry;
+    public $values;
+    public $properties;
+    public $value;
+    public $wakeups;
+
+    public function __construct(?Registry $registry, ?Values $values, array $properties, $value, array $wakeups)
+    {
+        $this->registry = $registry;
+        $this->values = $values;
+        $this->properties = $properties;
+        $this->value = $value;
+        $this->wakeups = $wakeups;
+    }
+
+    public static function hydrate($objects, $values, $properties, $value, $wakeups)
+    {
+        foreach ($properties as $class => $vars) {
+            (self::$hydrators[$class] ?? self::getHydrator($class))($vars, $objects);
+        }
+        foreach ($wakeups as $k => $v) {
+            if (\is_array($v)) {
+                $objects[-$k]->__unserialize($v);
+            } else {
+                $objects[$v]->__wakeup();
+            }
+        }
+
+        return $value;
+    }
+
+    public static function getHydrator($class)
+    {
+        switch ($class) {
+            case 'stdClass':
+                return self::$hydrators[$class] = static function ($properties, $objects) {
+                    foreach ($properties as $name => $values) {
+                        foreach ($values as $i => $v) {
+                            $objects[$i]->$name = $v;
+                        }
+                    }
+                };
+
+            case 'ErrorException':
+                return self::$hydrators[$class] = (self::$hydrators['stdClass'] ?? self::getHydrator('stdClass'))->bindTo(null, new class() extends \ErrorException {
+                });
+
+            case 'TypeError':
+                return self::$hydrators[$class] = (self::$hydrators['stdClass'] ?? self::getHydrator('stdClass'))->bindTo(null, new class() extends \Error {
+                });
+
+            case 'SplObjectStorage':
+                return self::$hydrators[$class] = static function ($properties, $objects) {
+                    foreach ($properties as $name => $values) {
+                        if ("\0" === $name) {
+                            foreach ($values as $i => $v) {
+                                for ($j = 0; $j < \count($v); ++$j) {
+                                    $objects[$i]->attach($v[$j], $v[++$j]);
+                                }
+                            }
+                            continue;
+                        }
+                        foreach ($values as $i => $v) {
+                            $objects[$i]->$name = $v;
+                        }
+                    }
+                };
+        }
+
+        if (!class_exists($class) && !interface_exists($class, false) && !trait_exists($class, false)) {
+            throw new ClassNotFoundException($class);
+        }
+        $classReflector = new \ReflectionClass($class);
+
+        switch ($class) {
+            case 'ArrayIterator':
+            case 'ArrayObject':
+                $constructor = \Closure::fromCallable([$classReflector->getConstructor(), 'invokeArgs']);
+
+                return self::$hydrators[$class] = static function ($properties, $objects) use ($constructor) {
+                    foreach ($properties as $name => $values) {
+                        if ("\0" !== $name) {
+                            foreach ($values as $i => $v) {
+                                $objects[$i]->$name = $v;
+                            }
+                        }
+                    }
+                    foreach ($properties["\0"] ?? [] as $i => $v) {
+                        $constructor($objects[$i], $v);
+                    }
+                };
+        }
+
+        if (!$classReflector->isInternal()) {
+            return self::$hydrators[$class] = (self::$hydrators['stdClass'] ?? self::getHydrator('stdClass'))->bindTo(null, $class);
+        }
+
+        if ($classReflector->name !== $class) {
+            return self::$hydrators[$classReflector->name] ?? self::getHydrator($classReflector->name);
+        }
+
+        $propertySetters = [];
+        foreach ($classReflector->getProperties() as $propertyReflector) {
+            if (!$propertyReflector->isStatic()) {
+                $propertyReflector->setAccessible(true);
+                $propertySetters[$propertyReflector->name] = \Closure::fromCallable([$propertyReflector, 'setValue']);
+            }
+        }
+
+        if (!$propertySetters) {
+            return self::$hydrators[$class] = self::$hydrators['stdClass'] ?? self::getHydrator('stdClass');
+        }
+
+        return self::$hydrators[$class] = static function ($properties, $objects) use ($propertySetters) {
+            foreach ($properties as $name => $values) {
+                if ($setValue = $propertySetters[$name] ?? null) {
+                    foreach ($values as $i => $v) {
+                        $setValue($objects[$i], $v);
+                    }
+                    continue;
+                }
+                foreach ($values as $i => $v) {
+                    $objects[$i]->$name = $v;
+                }
+            }
+        };
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Reference.php b/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Reference.php
new file mode 100644
index 00000000..e371c07b
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Reference.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarExporter\Internal;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @internal
+ */
+class Reference
+{
+    public $id;
+    public $value;
+    public $count = 0;
+
+    public function __construct(int $id, $value = null)
+    {
+        $this->id = $id;
+        $this->value = $value;
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Registry.php b/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Registry.php
new file mode 100644
index 00000000..24b77b9e
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Registry.php
@@ -0,0 +1,146 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarExporter\Internal;
+
+use Symfony\Component\VarExporter\Exception\ClassNotFoundException;
+use Symfony\Component\VarExporter\Exception\NotInstantiableTypeException;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @internal
+ */
+class Registry
+{
+    public static $reflectors = [];
+    public static $prototypes = [];
+    public static $factories = [];
+    public static $cloneable = [];
+    public static $instantiableWithoutConstructor = [];
+
+    public $classes = [];
+
+    public function __construct(array $classes)
+    {
+        $this->classes = $classes;
+    }
+
+    public static function unserialize($objects, $serializables)
+    {
+        $unserializeCallback = ini_set('unserialize_callback_func', __CLASS__.'::getClassReflector');
+
+        try {
+            foreach ($serializables as $k => $v) {
+                $objects[$k] = unserialize($v);
+            }
+        } finally {
+            ini_set('unserialize_callback_func', $unserializeCallback);
+        }
+
+        return $objects;
+    }
+
+    public static function p($class)
+    {
+        self::getClassReflector($class, true, true);
+
+        return self::$prototypes[$class];
+    }
+
+    public static function f($class)
+    {
+        $reflector = self::$reflectors[$class] ?? self::getClassReflector($class, true, false);
+
+        return self::$factories[$class] = \Closure::fromCallable([$reflector, 'newInstanceWithoutConstructor']);
+    }
+
+    public static function getClassReflector($class, $instantiableWithoutConstructor = false, $cloneable = null)
+    {
+        if (!($isClass = class_exists($class)) && !interface_exists($class, false) && !trait_exists($class, false)) {
+            throw new ClassNotFoundException($class);
+        }
+        $reflector = new \ReflectionClass($class);
+
+        if ($instantiableWithoutConstructor) {
+            $proto = $reflector->newInstanceWithoutConstructor();
+        } elseif (!$isClass || $reflector->isAbstract()) {
+            throw new NotInstantiableTypeException($class);
+        } elseif ($reflector->name !== $class) {
+            $reflector = self::$reflectors[$name = $reflector->name] ?? self::getClassReflector($name, false, $cloneable);
+            self::$cloneable[$class] = self::$cloneable[$name];
+            self::$instantiableWithoutConstructor[$class] = self::$instantiableWithoutConstructor[$name];
+            self::$prototypes[$class] = self::$prototypes[$name];
+
+            return self::$reflectors[$class] = $reflector;
+        } else {
+            try {
+                $proto = $reflector->newInstanceWithoutConstructor();
+                $instantiableWithoutConstructor = true;
+            } catch (\ReflectionException $e) {
+                $proto = $reflector->implementsInterface('Serializable') && !method_exists($class, '__unserialize') ? 'C:' : 'O:';
+                if ('C:' === $proto && !$reflector->getMethod('unserialize')->isInternal()) {
+                    $proto = null;
+                } else {
+                    try {
+                        $proto = @unserialize($proto.\strlen($class).':"'.$class.'":0:{}');
+                    } catch (\Exception $e) {
+                        if (__FILE__ !== $e->getFile()) {
+                            throw $e;
+                        }
+                        throw new NotInstantiableTypeException($class, $e);
+                    }
+                    if (false === $proto) {
+                        throw new NotInstantiableTypeException($class);
+                    }
+                }
+            }
+            if (null !== $proto && !$proto instanceof \Throwable && !$proto instanceof \Serializable && !method_exists($class, '__sleep') && (\PHP_VERSION_ID < 70400 || !method_exists($class, '__serialize'))) {
+                try {
+                    serialize($proto);
+                } catch (\Exception $e) {
+                    throw new NotInstantiableTypeException($class, $e);
+                }
+            }
+        }
+
+        if (null === $cloneable) {
+            if (($proto instanceof \Reflector || $proto instanceof \ReflectionGenerator || $proto instanceof \ReflectionType || $proto instanceof \IteratorIterator || $proto instanceof \RecursiveIteratorIterator) && (!$proto instanceof \Serializable && !method_exists($proto, '__wakeup') && (\PHP_VERSION_ID < 70400 || !method_exists($class, '__unserialize')))) {
+                throw new NotInstantiableTypeException($class);
+            }
+
+            $cloneable = $reflector->isCloneable() && !$reflector->hasMethod('__clone');
+        }
+
+        self::$cloneable[$class] = $cloneable;
+        self::$instantiableWithoutConstructor[$class] = $instantiableWithoutConstructor;
+        self::$prototypes[$class] = $proto;
+
+        if ($proto instanceof \Throwable) {
+            static $setTrace;
+
+            if (null === $setTrace) {
+                $setTrace = [
+                    new \ReflectionProperty(\Error::class, 'trace'),
+                    new \ReflectionProperty(\Exception::class, 'trace'),
+                ];
+                $setTrace[0]->setAccessible(true);
+                $setTrace[1]->setAccessible(true);
+                $setTrace[0] = \Closure::fromCallable([$setTrace[0], 'setValue']);
+                $setTrace[1] = \Closure::fromCallable([$setTrace[1], 'setValue']);
+            }
+
+            $setTrace[$proto instanceof \Exception]($proto, []);
+        }
+
+        return self::$reflectors[$class] = $reflector;
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Values.php b/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Values.php
new file mode 100644
index 00000000..21ae04e6
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Values.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarExporter\Internal;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @internal
+ */
+class Values
+{
+    public $values;
+
+    public function __construct(array $values)
+    {
+        $this->values = $values;
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/LICENSE b/advancedcontentfilter/vendor/symfony/var-exporter/LICENSE
new file mode 100644
index 00000000..7536caea
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/var-exporter/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2018-present Fabien Potencier
+
+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/advancedcontentfilter/vendor/symfony/var-exporter/README.md b/advancedcontentfilter/vendor/symfony/var-exporter/README.md
new file mode 100644
index 00000000..a34e4c23
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/var-exporter/README.md
@@ -0,0 +1,38 @@
+VarExporter Component
+=====================
+
+The VarExporter component allows exporting any serializable PHP data structure to
+plain PHP code. While doing so, it preserves all the semantics associated with
+the serialization mechanism of PHP (`__wakeup`, `__sleep`, `Serializable`,
+`__serialize`, `__unserialize`).
+
+It also provides an instantiator that allows creating and populating objects
+without calling their constructor nor any other methods.
+
+The reason to use this component *vs* `serialize()` or
+[igbinary](https://github.com/igbinary/igbinary) is performance: thanks to
+OPcache, the resulting code is significantly faster and more memory efficient
+than using `unserialize()` or `igbinary_unserialize()`.
+
+Unlike `var_export()`, this works on any serializable PHP value.
+
+It also provides a few improvements over `var_export()`/`serialize()`:
+
+ * the output is PSR-2 compatible;
+ * the output can be re-indented without messing up with `\r` or `\n` in the data
+ * missing classes throw a `ClassNotFoundException` instead of being unserialized to
+   `PHP_Incomplete_Class` objects;
+ * references involving `SplObjectStorage`, `ArrayObject` or `ArrayIterator`
+   instances are preserved;
+ * `Reflection*`, `IteratorIterator` and `RecursiveIteratorIterator` classes
+   throw an exception when being serialized (their unserialized version is broken
+   anyway, see https://bugs.php.net/76737).
+
+Resources
+---------
+
+ * [Documentation](https://symfony.com/doc/current/components/var_exporter.html)
+ * [Contributing](https://symfony.com/doc/current/contributing/index.html)
+ * [Report issues](https://github.com/symfony/symfony/issues) and
+   [send Pull Requests](https://github.com/symfony/symfony/pulls)
+   in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/VarExporter.php b/advancedcontentfilter/vendor/symfony/var-exporter/VarExporter.php
new file mode 100644
index 00000000..d4c08091
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/var-exporter/VarExporter.php
@@ -0,0 +1,115 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarExporter;
+
+use Symfony\Component\VarExporter\Exception\ExceptionInterface;
+use Symfony\Component\VarExporter\Internal\Exporter;
+use Symfony\Component\VarExporter\Internal\Hydrator;
+use Symfony\Component\VarExporter\Internal\Registry;
+use Symfony\Component\VarExporter\Internal\Values;
+
+/**
+ * Exports serializable PHP values to PHP code.
+ *
+ * VarExporter allows serializing PHP data structures to plain PHP code (like var_export())
+ * while preserving all the semantics associated with serialize() (unlike var_export()).
+ *
+ * By leveraging OPcache, the generated PHP code is faster than doing the same with unserialize().
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+final class VarExporter
+{
+    /**
+     * Exports a serializable PHP value to PHP code.
+     *
+     * @param mixed $value          The value to export
+     * @param bool  &$isStaticValue Set to true after execution if the provided value is static, false otherwise
+     * @param array &$foundClasses  Classes found in the value are added to this list as both keys and values
+     *
+     * @throws ExceptionInterface When the provided value cannot be serialized
+     */
+    public static function export($value, ?bool &$isStaticValue = null, array &$foundClasses = []): string
+    {
+        $isStaticValue = true;
+
+        if (!\is_object($value) && !(\is_array($value) && $value) && !\is_resource($value) || $value instanceof \UnitEnum) {
+            return Exporter::export($value);
+        }
+
+        $objectsPool = new \SplObjectStorage();
+        $refsPool = [];
+        $objectsCount = 0;
+
+        try {
+            $value = Exporter::prepare([$value], $objectsPool, $refsPool, $objectsCount, $isStaticValue)[0];
+        } finally {
+            $references = [];
+            foreach ($refsPool as $i => $v) {
+                if ($v[0]->count) {
+                    $references[1 + $i] = $v[2];
+                }
+                $v[0] = $v[1];
+            }
+        }
+
+        if ($isStaticValue) {
+            return Exporter::export($value);
+        }
+
+        $classes = [];
+        $values = [];
+        $states = [];
+        foreach ($objectsPool as $i => $v) {
+            [, $class, $values[], $wakeup] = $objectsPool[$v];
+            $foundClasses[$class] = $classes[] = $class;
+
+            if (0 < $wakeup) {
+                $states[$wakeup] = $i;
+            } elseif (0 > $wakeup) {
+                $states[-$wakeup] = [$i, array_pop($values)];
+                $values[] = [];
+            }
+        }
+        ksort($states);
+
+        $wakeups = [null];
+        foreach ($states as $v) {
+            if (\is_array($v)) {
+                $wakeups[-$v[0]] = $v[1];
+            } else {
+                $wakeups[] = $v;
+            }
+        }
+
+        if (null === $wakeups[0]) {
+            unset($wakeups[0]);
+        }
+
+        $properties = [];
+        foreach ($values as $i => $vars) {
+            foreach ($vars as $class => $values) {
+                foreach ($values as $name => $v) {
+                    $properties[$class][$name][$i] = $v;
+                }
+            }
+        }
+
+        if ($classes || $references) {
+            $value = new Hydrator(new Registry($classes), $references ? new Values($references) : null, $properties, $value, $wakeups);
+        } else {
+            $isStaticValue = true;
+        }
+
+        return Exporter::export($value);
+    }
+}
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/composer.json b/advancedcontentfilter/vendor/symfony/var-exporter/composer.json
new file mode 100644
index 00000000..29d4901d
--- /dev/null
+++ b/advancedcontentfilter/vendor/symfony/var-exporter/composer.json
@@ -0,0 +1,32 @@
+{
+    "name": "symfony/var-exporter",
+    "type": "library",
+    "description": "Allows exporting any serializable PHP data structure to plain PHP code",
+    "keywords": ["export", "serialize", "instantiate", "hydrate", "construct", "clone"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Nicolas Grekas",
+            "email": "p@tchwork.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=7.2.5",
+        "symfony/polyfill-php80": "^1.16"
+    },
+    "require-dev": {
+        "symfony/var-dumper": "^4.4.9|^5.0.9|^6.0"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Component\\VarExporter\\": "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "minimum-stability": "dev"
+}

From d838fc6421719e75e70f1a40547dfb3356aa138f Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Tue, 19 Mar 2024 22:51:17 -0400
Subject: [PATCH 061/294] [blockbot] Update Composer dependency ahead of
 release

- Updating jaybizzle/crawler-detect (v1.2.80 => v1.2.116)
---
 blockbot/composer.json                        |  44 +--
 blockbot/composer.lock                        |  16 +-
 blockbot/vendor/composer/ClassLoader.php      |   4 +-
 blockbot/vendor/composer/autoload_real.php    |   3 +
 blockbot/vendor/composer/installed.json       |  15 +-
 .../.github/workflows/php-cs-fixer.yml        |  23 ++
 .../crawler-detect/.github/workflows/test.yml |  56 ++++
 .../jaybizzle/crawler-detect/.php_cs.dist     |  33 ++
 .../vendor/jaybizzle/crawler-detect/LICENSE   |   2 +-
 .../vendor/jaybizzle/crawler-detect/README.md |  30 +-
 .../jaybizzle/crawler-detect/composer.json    |   3 +-
 .../jaybizzle/crawler-detect/export.php       |   2 +-
 .../crawler-detect/raw/Crawlers.json          |   2 +-
 .../jaybizzle/crawler-detect/raw/Crawlers.txt | 302 ++++++++++++++----
 .../crawler-detect/raw/Exclusions.json        |   2 +-
 .../crawler-detect/raw/Exclusions.txt         |   4 +-
 .../crawler-detect/src/CrawlerDetect.php      |  29 +-
 .../src/Fixtures/AbstractProvider.php         |   4 +-
 .../crawler-detect/src/Fixtures/Crawlers.php  | 302 ++++++++++++++----
 .../src/Fixtures/Exclusions.php               |   4 +-
 20 files changed, 686 insertions(+), 194 deletions(-)
 create mode 100644 blockbot/vendor/jaybizzle/crawler-detect/.github/workflows/php-cs-fixer.yml
 create mode 100644 blockbot/vendor/jaybizzle/crawler-detect/.github/workflows/test.yml
 create mode 100644 blockbot/vendor/jaybizzle/crawler-detect/.php_cs.dist

diff --git a/blockbot/composer.json b/blockbot/composer.json
index f13a2d17..40583e20 100644
--- a/blockbot/composer.json
+++ b/blockbot/composer.json
@@ -1,24 +1,24 @@
 {
-	"name": "friendica-addons/blockbot",
-	"description": "Blocking bots based on detecting bots/crawlers/spiders via the user agent and http_from header.",
-	"type": "friendica-addon",
-	"authors": [
-		{
-			"name": "Philipp Holzer",
-			"email": "admin@philipp.info",
-			"homepage": "https://friendica.philipp.info/profile/nupplaphil",
-			"role": "Developer"
-		}
-	],
-	"require": {
-		"php": ">=5.6.0",
-		"jaybizzle/crawler-detect": "1.*"
-	},
-	"license": "3-clause BSD license",
-	"minimum-stability": "stable",
-	"config": {
-		"optimize-autoloader": true,
-		"autoloader-suffix": "BlockBotAddon",
-		"preferred-install": "dist"
-	}
+    "name": "friendica-addons/blockbot",
+    "description": "Blocking bots based on detecting bots/crawlers/spiders via the user agent and http_from header.",
+    "type": "friendica-addon",
+    "authors": [
+        {
+            "name": "Philipp Holzer",
+            "email": "admin@philipp.info",
+            "homepage": "https://friendica.philipp.info/profile/nupplaphil",
+            "role": "Developer"
+        }
+    ],
+    "require": {
+        "php": ">=5.6.0",
+        "jaybizzle/crawler-detect": "1.*"
+    },
+    "license": "3-clause BSD license",
+    "minimum-stability": "stable",
+    "config": {
+        "optimize-autoloader": true,
+        "autoloader-suffix": "BlockBotAddon",
+        "preferred-install": "dist"
+    }
 }
diff --git a/blockbot/composer.lock b/blockbot/composer.lock
index 26b021b1..50f71a37 100644
--- a/blockbot/composer.lock
+++ b/blockbot/composer.lock
@@ -8,24 +8,23 @@
     "packages": [
         {
             "name": "jaybizzle/crawler-detect",
-            "version": "v1.2.80",
+            "version": "v1.2.116",
             "source": {
                 "type": "git",
                 "url": "https://github.com/JayBizzle/Crawler-Detect.git",
-                "reference": "af6a36e6d69670df3f0a3ed8e21d4b8cc67a7847"
+                "reference": "97e9fe30219e60092e107651abb379a38b342921"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/af6a36e6d69670df3f0a3ed8e21d4b8cc67a7847",
-                "reference": "af6a36e6d69670df3f0a3ed8e21d4b8cc67a7847",
+                "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/97e9fe30219e60092e107651abb379a38b342921",
+                "reference": "97e9fe30219e60092e107651abb379a38b342921",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8|^5.5|^6.5",
-                "satooshi/php-coveralls": "1.*"
+                "phpunit/phpunit": "^4.8|^5.5|^6.5|^9.4"
             },
             "type": "library",
             "autoload": {
@@ -53,7 +52,7 @@
                 "crawlerdetect",
                 "php crawler detect"
             ],
-            "time": "2019-04-05T19:52:02+00:00"
+            "time": "2023-07-21T15:49:49+00:00"
         }
     ],
     "packages-dev": [],
@@ -65,5 +64,6 @@
     "platform": {
         "php": ">=5.6.0"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
 }
diff --git a/blockbot/vendor/composer/ClassLoader.php b/blockbot/vendor/composer/ClassLoader.php
index 95f7e097..03b9bb9c 100644
--- a/blockbot/vendor/composer/ClassLoader.php
+++ b/blockbot/vendor/composer/ClassLoader.php
@@ -60,7 +60,7 @@ class ClassLoader
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', $this->prefixesPsr0);
+            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
         }
 
         return array();
@@ -279,7 +279,7 @@ class ClassLoader
      */
     public function setApcuPrefix($apcuPrefix)
     {
-        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
     }
 
     /**
diff --git a/blockbot/vendor/composer/autoload_real.php b/blockbot/vendor/composer/autoload_real.php
index ccb886a2..404079e0 100644
--- a/blockbot/vendor/composer/autoload_real.php
+++ b/blockbot/vendor/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitBlockBotAddon
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/blockbot/vendor/composer/installed.json b/blockbot/vendor/composer/installed.json
index d255d573..db9064b6 100644
--- a/blockbot/vendor/composer/installed.json
+++ b/blockbot/vendor/composer/installed.json
@@ -1,27 +1,26 @@
 [
     {
         "name": "jaybizzle/crawler-detect",
-        "version": "v1.2.80",
-        "version_normalized": "1.2.80.0",
+        "version": "v1.2.116",
+        "version_normalized": "1.2.116.0",
         "source": {
             "type": "git",
             "url": "https://github.com/JayBizzle/Crawler-Detect.git",
-            "reference": "af6a36e6d69670df3f0a3ed8e21d4b8cc67a7847"
+            "reference": "97e9fe30219e60092e107651abb379a38b342921"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/af6a36e6d69670df3f0a3ed8e21d4b8cc67a7847",
-            "reference": "af6a36e6d69670df3f0a3ed8e21d4b8cc67a7847",
+            "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/97e9fe30219e60092e107651abb379a38b342921",
+            "reference": "97e9fe30219e60092e107651abb379a38b342921",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3.0"
         },
         "require-dev": {
-            "phpunit/phpunit": "^4.8|^5.5|^6.5",
-            "satooshi/php-coveralls": "1.*"
+            "phpunit/phpunit": "^4.8|^5.5|^6.5|^9.4"
         },
-        "time": "2019-04-05T19:52:02+00:00",
+        "time": "2023-07-21T15:49:49+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/.github/workflows/php-cs-fixer.yml b/blockbot/vendor/jaybizzle/crawler-detect/.github/workflows/php-cs-fixer.yml
new file mode 100644
index 00000000..1c083c40
--- /dev/null
+++ b/blockbot/vendor/jaybizzle/crawler-detect/.github/workflows/php-cs-fixer.yml
@@ -0,0 +1,23 @@
+name: Check & fix styling
+
+on: [ push ]
+
+jobs:
+    php-cs-fixer:
+        runs-on: ubuntu-latest
+
+        steps:
+            -   name: Checkout code
+                uses: actions/checkout@v2
+                with:
+                    ref: ${{ github.head_ref }}
+
+            -   name: Run PHP CS Fixer
+                uses: docker://oskarstark/php-cs-fixer-ga:2.18.6
+                with:
+                    args: --config=.php_cs.dist --allow-risky=yes
+
+            -   name: Commit changes
+                uses: stefanzweifel/git-auto-commit-action@v4
+                with:
+                    commit_message: Fix styling
\ No newline at end of file
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/.github/workflows/test.yml b/blockbot/vendor/jaybizzle/crawler-detect/.github/workflows/test.yml
new file mode 100644
index 00000000..22911114
--- /dev/null
+++ b/blockbot/vendor/jaybizzle/crawler-detect/.github/workflows/test.yml
@@ -0,0 +1,56 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - "master"
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2]
+
+    name: PHP:${{ matrix.php }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup PHP, with composer
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          tools: composer:v2
+          coverage: xdebug
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: |
+          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+        shell: bash
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+          restore-keys: dependencies-php-${{ matrix.php }}-composer-
+
+      - name: Install Composer dependencies
+        run: |
+          composer install --prefer-dist --no-interaction --no-suggest
+
+      - name: Run Unit tests
+        run: |
+          vendor/bin/phpunit --coverage-clover=tests/logs/clover.xml
+
+      - name: Upload coverage results to Coveralls
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          composer global require php-coveralls/php-coveralls "^1.0"
+          coveralls --coverage_clover=tests/logs/clover.xml -v
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/.php_cs.dist b/blockbot/vendor/jaybizzle/crawler-detect/.php_cs.dist
new file mode 100644
index 00000000..91c91af9
--- /dev/null
+++ b/blockbot/vendor/jaybizzle/crawler-detect/.php_cs.dist
@@ -0,0 +1,33 @@
+<?php
+
+$finder = Symfony\Component\Finder\Finder::create()
+    ->in([
+        __DIR__.'/src',
+        __DIR__.'/tests',
+    ])
+    ->name('*.php')
+    ->ignoreDotFiles(true)
+    ->ignoreVCS(true);
+
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@PSR2' => true,
+        'array_syntax' => ['syntax' => 'long'],
+        'ordered_imports' => ['sortAlgorithm' => 'alpha'],
+        'no_unused_imports' => true,
+        'not_operator_with_successor_space' => true,
+        'trailing_comma_in_multiline_array' => true,
+        'phpdoc_scalar' => true,
+        'unary_operator_spaces' => true,
+        'binary_operator_spaces' => true,
+        'blank_line_before_statement' => [
+            'statements' => ['break', 'continue', 'declare', 'return', 'throw', 'try'],
+        ],
+        'phpdoc_single_line_var_spacing' => true,
+        'phpdoc_var_without_name' => true,
+        'method_argument_space' => [
+            'on_multiline' => 'ensure_fully_multiline',
+            'keep_multiple_spaces_after_comma' => true,
+        ],
+    ])
+    ->setFinder($finder);
\ No newline at end of file
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/LICENSE b/blockbot/vendor/jaybizzle/crawler-detect/LICENSE
index 2f4e15e2..569c7b4f 100644
--- a/blockbot/vendor/jaybizzle/crawler-detect/LICENSE
+++ b/blockbot/vendor/jaybizzle/crawler-detect/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2018 Mark Beech
+Copyright (c) 2015-2020 Mark Beech
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/README.md b/blockbot/vendor/jaybizzle/crawler-detect/README.md
index e7c25f3b..57ec8e8b 100644
--- a/blockbot/vendor/jaybizzle/crawler-detect/README.md
+++ b/blockbot/vendor/jaybizzle/crawler-detect/README.md
@@ -1,24 +1,23 @@
-<p align="center"><a href="http://crawlerdetect.io/" target="_blank"><img src="https://cloud.githubusercontent.com/assets/340752/23082173/1bd1a396-f550-11e6-8aba-4d3c75edea2f.png" width="321" height="219" /></a><br><br>
-<a href="http://crawlerdetect.io/" target="_blank">crawlerdetect.io</a>
+<p align="center"><a href="https://crawlerdetect.io/" target="_blank"><img src="https://cloud.githubusercontent.com/assets/340752/23082173/1bd1a396-f550-11e6-8aba-4d3c75edea2f.png" width="321" height="219" /></a><br><br>
+<a href="https://crawlerdetect.io/" target="_blank">crawlerdetect.io</a>
 <br><br>
 </p>
-
 <p align="center">
-<a href="https://travis-ci.org/JayBizzle/Crawler-Detect"><img src="https://img.shields.io/travis/JayBizzle/Crawler-Detect/master.svg?style=flat-square" /></a>
+<a href="https://github.com/JayBizzle/Crawler-Detect/actions"><img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/JayBizzle/Crawler-Detect/test.yml?branch=master&style=flat-square"></a>
 <a href="https://packagist.org/packages/jaybizzle/crawler-detect"><img src="https://img.shields.io/packagist/dm/JayBizzle/Crawler-Detect.svg?style=flat-square" /></a>
-<a href="https://scrutinizer-ci.com/g/JayBizzle/Crawler-Detect/?branch=master"><img src="https://img.shields.io/scrutinizer/g/JayBizzle/Crawler-Detect.svg?style=flat-square" /></a>
 <a href="https://github.com/JayBizzle/Crawler-Detect"><img src="https://img.shields.io/badge/license-MIT-ff69b4.svg?style=flat-square" /></a>
 <a href="https://packagist.org/packages/jaybizzle/crawler-detect"><img src="https://img.shields.io/packagist/v/jaybizzle/Crawler-Detect.svg?style=flat-square" /></a>
-<a href="https://styleci.io/repos/32755917"><img src="https://styleci.io/repos/32755917/shield" /></a>
 <a href="https://coveralls.io/github/JayBizzle/Crawler-Detect"><img src="https://img.shields.io/coveralls/JayBizzle/Crawler-Detect/master.svg?style=flat-square" /></a>
 </p>
 
 ## About CrawlerDetect
 
-CrawlerDetect is a PHP class for detecting bots/crawlers/spiders via the user agent and http_from header. Currently able to detect 1,000's of bots/spiders/crawlers.
+CrawlerDetect is a PHP class for detecting bots/crawlers/spiders via the `user agent` and `http_from` header. Currently able to detect 1,000's of bots/spiders/crawlers.
 
 ### Installation
-Run `composer require jaybizzle/crawler-detect 1.*` or add `"jaybizzle/crawler-detect" :"1.*"` to your `composer.json`.
+```
+composer require jaybizzle/crawler-detect
+```
 
 ### Usage
 ```PHP
@@ -46,7 +45,7 @@ If you find a bot/spider/crawler user agent that CrawlerDetect fails to detect,
 Failing that, just create an issue with the user agent you have found, and we'll take it from there :)
 
 ### Laravel Package
-If you would like to use this with Laravel 4/5, please see [Laravel-Crawler-Detect](https://github.com/JayBizzle/Laravel-Crawler-Detect)
+If you would like to use this with Laravel, please see [Laravel-Crawler-Detect](https://github.com/JayBizzle/Laravel-Crawler-Detect)
 
 ### Symfony Bundle
 To use this library with Symfony 2/3/4, check out the [CrawlerDetectBundle](https://github.com/nicolasmure/CrawlerDetectBundle).
@@ -57,16 +56,21 @@ To use this library with the YII2 framework, check out [yii2-crawler-detect](htt
 ### ES6 Library
 To use this library with NodeJS or any ES6 application based, check out [es6-crawler-detect](https://github.com/JefferyHus/es6-crawler-detect).
 
+### Python Library
+To use this library in a Python project, check out [crawlerdetect](https://github.com/moskrc/CrawlerDetect).
+
+### JVM Library (written in Java)
+To use this library in a JVM project (including Java, Scala, Kotlin, etc.), check out [CrawlerDetect](https://github.com/nekosoftllc/crawler-detect).
+
 ### .NET Library
 To use this library in a .net standard (including .net core) based project, check out [NetCrawlerDetect](https://github.com/gplumb/NetCrawlerDetect).
 
-### Nette Extension
-To use this library with the Nette framework, checkout [NetteCrawlerDetect](https://github.com/JanGalek/Crawler-Detect).
-
 ### Ruby Gem
-
 To use this library with Ruby on Rails or any Ruby-based application, check out [crawler_detect](https://github.com/loadkpi/crawler_detect) gem.
 
+### Go Module
+To use this library with Go, check out the [crawlerdetect](https://github.com/x-way/crawlerdetect) module.
+
 _Parts of this class are based on the brilliant [MobileDetect](https://github.com/serbanghita/Mobile-Detect)_
 
 [![Analytics](https://ga-beacon.appspot.com/UA-72430465-1/Crawler-Detect/readme?pixel)](https://github.com/JayBizzle/Crawler-Detect)
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/composer.json b/blockbot/vendor/jaybizzle/crawler-detect/composer.json
index 0c0babe6..4774117e 100755
--- a/blockbot/vendor/jaybizzle/crawler-detect/composer.json
+++ b/blockbot/vendor/jaybizzle/crawler-detect/composer.json
@@ -16,8 +16,7 @@
         "php": ">=5.3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8|^5.5|^6.5",
-        "satooshi/php-coveralls": "1.*"
+        "phpunit/phpunit": "^4.8|^5.5|^6.5|^9.4"
     },
     "autoload": {
         "psr-4": {
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/export.php b/blockbot/vendor/jaybizzle/crawler-detect/export.php
index 4c4b9d5d..6c7459c4 100644
--- a/blockbot/vendor/jaybizzle/crawler-detect/export.php
+++ b/blockbot/vendor/jaybizzle/crawler-detect/export.php
@@ -37,5 +37,5 @@ function outputJson($object)
 function outputTxt($object)
 {
     $className = (new ReflectionClass($object))->getShortName();
-    file_put_contents("raw/$className.txt", implode($object->getAll(), PHP_EOL));
+    file_put_contents("raw/$className.txt", implode(PHP_EOL, $object->getAll()));
 }
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/raw/Crawlers.json b/blockbot/vendor/jaybizzle/crawler-detect/raw/Crawlers.json
index a1e690eb..003b87c8 100644
--- a/blockbot/vendor/jaybizzle/crawler-detect/raw/Crawlers.json
+++ b/blockbot/vendor/jaybizzle/crawler-detect/raw/Crawlers.json
@@ -1 +1 @@
-[".*Java.*outbrain"," YLT","^b0t$","^bluefish ","^Calypso v\\\/","^COMODO DCV","^DangDang","^DavClnt","^FDM ","^git\\\/","^Goose\\\/","^Grabber","^HTTPClient\\\/","^Java\\\/","^Jeode\\\/","^Jetty\\\/","^Mail\\\/","^Mget","^Microsoft URL Control","^NG\\\/[0-9\\.]","^NING\\\/","^PHP\\\/[0-9]","^RMA\\\/","^Ruby|Ruby\\\/[0-9]","^VSE\\\/[0-9]","^WordPress\\.com","^XRL\\\/[0-9]","^ZmEu","008\\\/","13TABS","192\\.comAgent","2ip\\.ru","404enemy","7Siters","80legs","a\\.pr-cy\\.ru","a3logics\\.in","A6-Indexer","Abonti","Aboundex","aboutthedomain","Accoona-AI-Agent","acoon","acrylicapps\\.com\\\/pulp","Acunetix","AdAuth\\\/","adbeat","AddThis","ADmantX","AdminLabs","adressendeutschland","adscanner","Adstxtaggregator","agentslug","AHC","aihit","aiohttp\\\/","Airmail","akka-http\\\/","akula\\\/","alertra","alexa site audit","Alibaba\\.Security\\.Heimdall","Alligator","allloadin","AllSubmitter","alyze\\.info","amagit","Anarchie","AndroidDownloadManager","Anemone","AngleSharp","annotate_google","Ant\\.com","Anturis Agent","AnyEvent-HTTP\\\/","Apache Droid","Apache OpenOffice","Apache-HttpAsyncClient","Apache-HttpClient","ApacheBench","Apexoo","APIs-Google","AportWorm\\\/","AppBeat\\\/","AppEngine-Google","AppStoreScraperZ","Aprc\\\/[0-9]","Arachmo","arachnode","Arachnophilia","aria2","Arukereso","asafaweb","AskQuickly","Ask Jeeves","ASPSeek","Asterias","Astute","asynchttp","Attach","autocite","Autonomy","axios\\\/","B-l-i-t-z-B-O-T","Backlink-Ceck","backlink-check","BacklinkHttpStatus","BackStreet","BackWeb","Bad-Neighborhood","Badass","baidu\\.com","Bandit","basicstate","BatchFTP","Battleztar Bazinga","baypup\\\/","BazQux","BBBike","BCKLINKS","BDFetch","BegunAdvertising","Bidtellect","BigBozz","Bigfoot","biglotron","BingLocalSearch","BingPreview","binlar","biNu image cacher","Bitacle","biz_Directory","Black Hole","Blackboard Safeassign","BlackWidow","BlockNote\\.Net","Bloglines","Bloglovin","BlogPulseLive","BlogSearch","Blogtrottr","BlowFish","boitho\\.com-dc","BPImageWalker","Braintree-Webhooks","Branch Metrics API","Branch-Passthrough","Brandprotect","BrandVerity","Brandwatch","Brodie\\\/","Browsershots","BUbiNG","Buck\\\/","Buddy","BuiltWith","Bullseye","BunnySlippers","Burf Search","Butterfly\\\/","BuzzSumo","CAAM\\\/[0-9]","CakePHP","Calculon","Canary%20Mail","CaretNail","catexplorador","CC Metadata Scaper","Cegbfeieh","censys","Cerberian Drtrs","CERT\\.at-Statistics-Survey","cg-eye","changedetection","ChangesMeter","Charlotte","CheckHost","checkprivacy","CherryPicker","ChinaClaw","Chirp\\\/","chkme\\.com","Chlooe","Chromaxa","CirrusExplorer","CISPA Vulnerability Notification","Citoid","CJNetworkQuality","Clarsentia","clips\\.ua\\.ac\\.be","Cloud mapping","CloudEndure","CloudFlare-AlwaysOnline","Cloudinary","cmcm\\.com","coccoc","cognitiveseo","colly -","CommaFeed","Commons-HttpClient","commonscan","contactbigdatafr","contentkingapp","convera","CookieReports","copyright sheriff","CopyRightCheck","Copyscape","Cosmos4j\\.feedback","Covario-IDS","Crescent","Crowsnest","Criteo","CSHttp","curb","Curious George","curl","cuwhois\\\/","cybo\\.com","DAP\\\/NetHTTP","DareBoost","DatabaseDriverMysqli","DataCha0s","Datafeedwatch","Datanyze","DataparkSearch","dataprovider","DataXu","Daum(oa)?[ \\\/][0-9]","Demon","DeuSu","developers\\.google\\.com\\\/\\+\\\/web\\\/snippet\\\/","Devil","Digg","Digincore","DigitalPebble","Dirbuster","Discourse Forum Onebox","Disqus\\\/","Dispatch\\\/","DittoSpyder","dlvr","DMBrowser","DNSPod-reporting","docoloc","Dolphin http client","DomainAppender","Donuts Content Explorer","dotMailer content retrieval","dotSemantic","downforeveryoneorjustme","Download Wonder","downnotifier","DowntimeDetector","Drip","drupact","Drupal \\(\\+http:\\\/\\\/drupal\\.org\\\/\\)","DTS Agent","dubaiindex","EARTHCOM","Easy-Thumb","EasyDL","Ebingbong","ec2linkfinder","eCairn-Grabber","eCatch","ECCP","eContext\\\/","Ecxi","EirGrabber","ElectricMonk","elefent","EMail Exractor","EMail Wolf","EmailWolf","Embarcadero","Embed PHP Library","Embedly","endo\\\/","europarchive\\.org","evc-batch","EventMachine HttpClient","Everwall Link Expander","Evidon","Evrinid","ExactSearch","ExaleadCloudview","Excel\\\/","exif","Exploratodo","Express WebPictures","Extreme Picture Finder","EyeNetIE","ezooms","facebookexternalhit","facebookplatform","fairshare","Faraday v","fasthttp","Faveeo","Favicon downloader","faviconkit","faviconarchive","FavOrg","Feed Wrangler","Feedable\\\/","Feedbin","FeedBooster","FeedBucket","FeedBunch\\\/","FeedBurner","feeder","Feedly","FeedshowOnline","Feedspot","Feedwind\\\/","FeedZcollector","feeltiptop","Fetch API","Fetch\\\/[0-9]","Fever\\\/[0-9]","FHscan","Fimap","findlink","findthatfile","FlashGet","FlipboardBrowserProxy","FlipboardProxy","FlipboardRSS","Flock\\\/","fluffy","Flunky","flynxapp","forensiq","FoundSeoTool","http:\\\/\\\/www.neomo.de\\\/","free thumbnails","Freeuploader","Funnelback","G-i-g-a-b-o-t","g00g1e\\.net","ganarvisitas","geek-tools","Genieo","GentleSource","GetCode","Getintent","GetLinkInfo","getprismatic","GetRight","getroot","GetURLInfo\\\/","GetWeb","Ghost Inspector","GigablastOpenSource","GIS-LABS","github-camo","github\\.com","Go [\\d\\.]* package http","Go http package","Go-Ahead-Got-It","Go-http-client","Go!Zilla","gobyus","gofetch","GomezAgent","gooblog","Goodzer\\\/","Google AppsViewer","Google Desktop","Google favicon","Google Keyword Suggestion","Google Keyword Tool","Google Page Speed Insights","Google PP Default","Google Search Console","Google Web Preview","Google-Adwords","Google-Apps-Script","Google-Calendar-Importer","Google-HotelAdsVerifier","Google-HTTP-Java-Client","Google-Publisher-Plugin","Google-SearchByImage","Google-Site-Verification","Google-Structured-Data-Testing-Tool","Google-Youtube-Links","google-xrawler","GoogleDocs","GoogleHC\\\/","GoogleProducer","GoogleSites","Google-Transparency-Report","Gookey","GoScraper","GoSpotCheck","gosquared-thumbnailer","Gotit","GoZilla","grabify","GrabNet","Grafula","Grammarly","GrapeFX","GreatNews","Gregarius","GRequests","grokkit","grouphigh","grub-client","gSOAP\\\/","GT::WWW","GTmetrix","GuzzleHttp","gvfs\\\/","HAA(A)?RTLAND http client","Haansoft","hackney\\\/","Hadi Agent","HappyApps-WebCheck","Hatena","Havij","HeadlessChrome","HEADMasterSEO","HeartRails_Capture","help@dataminr\\.com","heritrix","historious","hkedcity","hledejLevne\\.cz","Hloader","HMView","Holmes","HonesoSearchEngine","HootSuite Image proxy","Hootsuite-WebFeed","hosterstats","HostTracker","ht:\\\/\\\/check","htdig","HTMLparser","htmlyse","HTTP Banner Detection","HTTP_Compression_Test","http_request2","http_requester","http-get","HTTP-Header-Abfrage","http-kit","http-request\\\/","HTTP-Tiny","HTTP::Lite","http\\.rb\\\/","http_get","HttpComponents","httphr","HTTPMon","httpRequest","httpscheck","httpssites_power","httpunit","HttpUrlConnection","httrack","huaweisymantec","HubSpot ","Humanlinks","i2kconnect\\\/","Iblog","ichiro","Id-search","IdeelaborPlagiaat","IDG Twitter Links Resolver","IDwhois\\\/","Iframely","igdeSpyder","IlTrovatore","Image Fetch","Image Sucker","ImageEngine\\\/","ImageVisu\\\/","Imagga","imagineeasy","imgsizer","InAGist","inbound\\.li parser","InDesign%20CC","Indy Library","InetURL","infegy","infohelfer","InfoTekies","InfoWizards Reciprocal Link","inpwrd\\.com","instabid","Instapaper","Integrity","integromedb","Intelliseek","InterGET","internet_archive","Internet Ninja","InternetSeer","internetVista monitor","intraVnews","IODC","IOI","iplabel","ips-agent","IPS\\\/[0-9]","IPWorks HTTP\\\/S Component","iqdb\\\/","Iria","Irokez","isitup\\.org","iskanie","isUp\\.li","iThemes Sync\\\/","iZSearch","JAHHO","janforman","Jaunt\\\/","Jbrofuzz","Jersey\\\/","JetCar","Jigsaw","Jobboerse","JobFeed discovery","Jobg8 URL Monitor","jobo","Jobrapido","Jobsearch1\\.5","JoinVision Generic","JolokiaPwn","Joomla","Jorgee","JS-Kit","JustView","Kaspersky Lab CFR link resolver","Kelny\\\/","Kerrigan\\\/","KeyCDN","Keyword Density","Keywords Research","KickFire","KimonoLabs\\\/","Kml-Google","knows\\.is","KOCMOHABT","kouio","kube-probe","kulturarw3","KumKie","L\\.webis","Larbin","Lavf\\\/","LeechFTP","LeechGet","letsencrypt","Lftp","LibVLC","LibWeb","Libwhisker","libwww","Licorne","Liferea\\\/","Lightspeedsystems","Lighthouse","Likse","Link Valet","link_thumbnailer","LinkAlarm\\\/","linkCheck","linkdex","LinkExaminer","linkfluence","linkpeek","LinkPreviewGenerator","LinkScan","LinksManager","LinkTiger","LinkWalker","Lipperhey","Litemage_walker","livedoor ScreenShot","LoadImpactRload","localsearch-web","LongURL API","looksystems\\.net","ltx71","lua-resty-http","lwp-request","lwp-trivial","LWP::Simple","lycos","LYT\\.SR","mabontland","Mag-Net","MagpieRSS","Mail\\.Ru","MailChimp","Majestic12","makecontact\\\/","Mandrill","MapperCmd","marketinggrader","MarkMonitor","MarkWatch","Mass Downloader","masscan\\\/","Mata Hari","Mediapartners-Google","mediawords","MegaIndex\\.ru","MeltwaterNews","Melvil Rawi","MemGator","Metaspinner","MetaURI","MFC_Tear_Sample","Microsearch","Microsoft Office ","Microsoft Outlook","Microsoft Windows Network Diagnostics","Microsoft-WebDAV-MiniRedir","Microsoft Data Access","MIDown tool","MIIxpc","Mindjet","Miniature\\.io","Miniflux","Mister PiX","mixdata dot com","mixed-content-scan","Mixmax-LinkPreview","mixnode","Mnogosearch","mogimogi","Mojeek","Mojolicious \\(Perl\\)","Monit\\\/","monitis","Monitority\\\/","montastic","MonTools","Moreover","Morfeus Fucking Scanner","Morning Paper","MovableType","mowser","Mrcgiguy","MS Web Services Client Protocol","MSFrontPage","mShots","MuckRack\\\/","muhstik-scan","MVAClient","MxToolbox\\\/","nagios","Najdi\\.si","Name Intelligence","Nameprotect","Navroad","NearSite","Needle","Nessus","Net Vampire","NetAnts","NETCRAFT","NetLyzer","NetMechanic","NetNewsWire","Netpursual","netresearch","NetShelter ContentScan","Netsparker","NetTrack","Netvibes","NetZIP","Neustar WPM","NeutrinoAPI","NewRelicPinger","NewsBlur .*Finder","NewsGator","newsme","newspaper\\\/","Nexgate Ruby Client","NG-Search","Nibbler","NICErsPRO","Nikto","nineconnections","NLNZ_IAHarvester","Nmap Scripting Engine","node-superagent","node-urllib","node\\.io","Nodemeter","NodePing","nominet\\.org\\.uk","nominet\\.uk","Norton-Safeweb","Notifixious","notifyninja","nuhk","nutch","Nuzzel","nWormFeedFinder","nyawc\\\/","Nymesis","NYU","Ocelli\\\/","Octopus","oegp","Offline Explorer","Offline Navigator","og-scraper","okhttp","omgili","OMSC","Online Domain Tools","OpenCalaisSemanticProxy","Openfind","OpenLinkProfiler","Openstat\\\/","OpenVAS","Optimizer","Orbiter","OrgProbe\\\/","orion-semantics","Outlook-Express","Outlook-iOS","ow\\.ly","Owler","ownCloud News","OxfordCloudService","Page Valet","page_verifier","page scorer","page2rss","PageGrabber","PagePeeker","PageScorer","Pagespeed\\\/","Panopta","panscient","Papa Foto","parsijoo","Pavuk","PayPal IPN","pcBrowser","Pcore-HTTP","Pearltrees","PECL::HTTP","peerindex","Peew","PeoplePal","Perlu -","PhantomJS Screenshoter","PhantomJS\\\/","Photon\\\/","phpservermon","Pi-Monster","Picscout","Picsearch","PictureFinder","Pimonster","ping\\.blo\\.gs","Pingability","PingAdmin\\.Ru","Pingdom","Pingoscope","PingSpot","pinterest\\.com","Pixray","Pizilla","Plagger\\\/","Ploetz \\+ Zeller","Plukkie","plumanalytics","PocketImageCache","PocketParser","Pockey","POE-Component-Client-HTTP","Polymail\\\/","Pompos","Porkbun","Port Monitor","postano","PostmanRuntime","PostPost","postrank","PowerPoint\\\/","Priceonomics Analysis Engine","PrintFriendly","PritTorrent","Prlog","probethenet","Project 25499","prospectb2b","Protopage","ProWebWalker","proximic","PRTG Network Monitor","pshtt, https scanning","PTST ","PTST\\\/[0-9]+","Pulsepoint XT3 web scraper","Pump","Python-httplib2","python-requests","Python-urllib","Qirina Hurdler","QQDownload","QrafterPro","Qseero","Qualidator","QueryN Metasearch","queuedriver","Quora Link Preview","Qwantify","Radian6","RankActive","RankFlex","RankSonicSiteAuditor","Re-re Studio","ReactorNetty","Readability","RealDownload","RealPlayer%20Downloader","RebelMouse","Recorder","RecurPost\\\/","redback\\\/","ReederForMac","ReGet","RepoMonkey","request\\.js","reqwest\\\/","ResponseCodeTest","RestSharp","Riddler","Rival IQ","Robosourcer","Robozilla","ROI Hunter","RPT-HTTPClient","RSSOwl","safe-agent-scanner","SalesIntelligent","Saleslift","Sendsay\\.Ru","SauceNAO","SBIder","scalaj-http","scan\\.lol","ScanAlert","Scoop","scooter","ScoutJet","ScoutURLMonitor","ScrapeBox Page Scanner","SimpleScraper","Scrapy","Screaming","ScreenShotService","Scrubby","Scrutiny\\\/","search\\.thunderstone","Search37","searchenginepromotionhelp","Searchestate","SearchExpress","SearchSight","Seeker","semanticdiscovery","semanticjuice","Semiocast HTTP client","Semrush","sentry\\\/","SEO Browser","Seo Servis","seo-nastroj\\.cz","seo4ajax","Seobility","SEOCentro","SeoCheck","SEOkicks","Seomoz","SEOprofiler","SEOsearch","seoscanners","seositecheckup","SEOstats","servernfo","sexsearcher","Seznam","Shelob","Shodan","Shoppimon","ShopWiki","ShortLinkTranslate","shrinktheweb","Sideqik","SimplePie","SimplyFast","Siphon","SISTRIX","Site-Shot\\\/","Site Sucker","Site24x7","SiteBar","Sitebeam","Sitebulb\\\/","SiteCondor","SiteExplorer","SiteGuardian","Siteimprove","SiteIndexed","Sitemap(s)? Generator","SitemapGenerator","SiteMonitor","Siteshooter B0t","SiteSnagger","SiteSucker","SiteTruth","Sitevigil","sitexy\\.com","SkypeUriPreview","Slack\\\/","slider\\.com","slurp","SlySearch","SmartDownload","SMRF URL Expander","SMUrlExpander","Snake","Snappy","SnapSearch","Snarfer\\\/","SniffRSS","sniptracker","Snoopy","SnowHaze Search","sogou web","SortSite","Sottopop","sovereign\\.ai","SpaceBison","SpamExperts","Spammen","Spanner","spaziodati","SPDYCheck","Specificfeeds","speedy","SPEng","Spinn3r","spray-can","Sprinklr ","spyonweb","sqlmap","Sqlworm","Sqworm","SSL Labs","ssl-tools","StackRambler","Statastico\\\/","StatusCake","Steeler","Stratagems Kumo","Stroke\\.cz","StudioFACA","StumbleUpon","suchen","Sucuri","summify","SuperHTTP","Surphace Scout","Suzuran","SwiteScraper","Symfony BrowserKit","Symfony2 BrowserKit","SynHttpClient-Built","Sysomos","sysscan","Szukacz","T0PHackTeam","tAkeOut","Tarantula\\\/","Taringa UGC","TarmotGezgin","Teleport","Telesoft","Telesphoreo","Telesphorep","Tenon\\.io","teoma","terrainformatica","Test Certificate Info","testuri","Tetrahedron","The Drop Reaper","The Expert HTML Source Viewer","The Knowledge AI","The Intraformant","theinternetrules","TheNomad","Thinklab","Thumbshots","ThumbSniper","timewe\\.net","TinEye","Tiny Tiny RSS","TLSProbe\\\/","Toata","topster","touche\\.com","Traackr\\.com","tracemyfile","Trackuity","TrapitAgent","Trendiction","Trendsmap","trendspottr","truwoGPS","TryJsoup","TulipChain","Turingos","Turnitin","tweetedtimes","Tweetminster","Tweezler\\\/","twibble","Twice","Twikle","Twingly","Twisted PageGetter","Typhoeus","ubermetrics-technologies","uclassify","UdmSearch","unchaos","unirest-java","UniversalFeedParser","Unshorten\\.It","Untiny","UnwindFetchor","updated","updown\\.io daemon","Upflow","Uptimia","Urlcheckr","URL Verifier","URLitor","urlresolver","Urlstat","URLTester","UrlTrends Ranking Updater","URLy Warning","URLy\\.Warning","Vacuum","Vagabondo","VB Project","vBSEO","VCI","via ggpht\\.com GoogleImageProxy","VidibleScraper","Virusdie","visionutils","vkShare","VoidEYE","Voil","voltron","voyager\\\/","VSAgent\\\/","VSB-TUO\\\/","Vulnbusters Meter","VYU2","w3af\\.org","W3C_Unicorn","W3C-checklink","W3C-mobileOK","WAC-OFU","Wallpapers\\\/[0-9]+","WallpapersHD","wangling","Wappalyzer","WatchMouse","WbSrch\\\/","WDT\\.io","web-capture\\.net","Web-sniffer","Web Auto","Web Collage","Web Enhancer","Web Fetch","Web Fuck","Web Pix","Web Sauger","Web Sucker","Webalta","Webauskunft","WebAuto","WebCapture","WebClient\\\/","webcollage","WebCookies","WebCopier","WebCorp","WebDataStats","WebDoc","WebEnhancer","WebFetch","WebFuck","WebGazer","WebGo IS","WebImageCollector","WebImages","WebIndex","webkit2png","WebLeacher","webmastercoffee","webmon ","WebPix","WebReaper","WebSauger","webscreenie","Webshag","Webshot","Website Quester","websitepulse agent","WebsiteQuester","Websnapr","WebSniffer","Webster","WebStripper","WebSucker","Webthumb\\\/","WebThumbnail","WebWhacker","WebZIP","WeLikeLinks","WEPA","WeSEE","wf84","Wfuzz\\\/","wget","WhatsApp","WhatsMyIP","WhatWeb","WhereGoes\\?","Whibse","WhoRunsCoinHive","Whynder Magnet","Windows-RSS-Platform","WinPodder","wkhtmlto","wmtips","Woko","woorankreview","Word\\\/","WordPress\\\/","WordupinfoSearch","wotbox","WP Engine Install Performance API","wpif","wprecon\\.com survey","WPScan","wscheck","Wtrace","WWW-Collector-E","WWW-Mechanize","WWW::Document","WWW::Mechanize","www\\.monitor\\.us","WWWOFFLE","x09Mozilla","x22Mozilla","XaxisSemanticsClassifier","Xenu Link Sleuth","XING-contenttabreceiver","xpymep([0-9]?)\\.exe","Y!J-(ASR|BSC)","Y\\!J-BRW","Yaanb","yacy","Yahoo Link Preview","YahooCacheSystem","YahooYSMcm","YandeG","Yandex(?!Search)","yanga","yeti","Yo-yo","Yoleo Consumer","yoogliFetchAgent","YottaaMonitor","Your-Website-Sucks","yourls\\.org","YoYs\\.net","YP\\.PL","Zabbix","Zade","Zao","Zauba","Zemanta Aggregator","Zend_Http_Client","Zend\\\\Http\\\\Client","Zermelo","Zeus ","zgrab","ZnajdzFoto","Zombie\\.js","Zoom\\.Mac","ZyBorg","[a-z0-9\\-_]*(bot|crawl|archiver|transcoder|spider|uptime|validator|fetcher|cron|checker|reader|extractor|monitoring|analyzer)"]
\ No newline at end of file
+[" YLT","^Aether","^Amazon Simple Notification Service Agent$","^Amazon-Route53-Health-Check-Service","^b0t$","^bluefish ","^Calypso v\\\/","^COMODO DCV","^Corax","^DangDang","^DavClnt","^DHSH","^docker\\\/[0-9]","^Expanse","^FDM ","^git\\\/","^Goose\\\/","^Grabber","^Gradle\\\/","^HTTPClient\\\/","^HTTPing","^Java\\\/","^Jeode\\\/","^Jetty\\\/","^Mail\\\/","^Mget","^Microsoft URL Control","^Mikrotik\\\/","^Netlab360","^NG\\\/[0-9\\.]","^NING\\\/","^npm\\\/","^Nuclei","^PHP-AYMAPI\\\/","^PHP\\\/","^pip\\\/","^pnpm\\\/","^RMA\\\/","^Ruby|Ruby\\\/[0-9]","^Swurl ","^TLS tester ","^twine\\\/","^ureq","^VSE\\\/[0-9]","^WordPress\\.com","^XRL\\\/[0-9]","^ZmEu","008\\\/","13TABS","192\\.comAgent","2GDPR\\\/","2ip\\.ru","404enemy","7Siters","80legs","a3logics\\.in","A6-Indexer","Abonti","Aboundex","aboutthedomain","Accoona-AI-Agent","acebookexternalhit\\\/","acoon","acrylicapps\\.com\\\/pulp","Acunetix","AdAuth\\\/","adbeat","AddThis","ADmantX","AdminLabs","adressendeutschland","adreview\\\/","adscanner","adstxt-worker","Adstxtaggregator","adstxt\\.com","Adyen HttpClient","AffiliateLabz\\\/","affilimate-puppeteer","agentslug","AHC","aihit","aiohttp\\\/","Airmail","akka-http\\\/","akula\\\/","alertra","alexa site audit","Alibaba\\.Security\\.Heimdall","Alligator","allloadin","AllSubmitter","alyze\\.info","amagit","Anarchie","AndroidDownloadManager","Anemone","AngleSharp","annotate_google","Anthill","Anturis Agent","Ant\\.com","AnyEvent-HTTP\\\/","Apache Ant\\\/","Apache Droid","Apache OpenOffice","Apache-HttpAsyncClient","Apache-HttpClient","ApacheBench","Apexoo","apimon\\.de","APIs-Google","AportWorm\\\/","AppBeat\\\/","AppEngine-Google","AppleSyndication","Aprc\\\/[0-9]","Arachmo","arachnode","Arachnophilia","aria2","Arukereso","asafaweb","Asana\\\/","Ask Jeeves","AskQuickly","ASPSeek","Asterias","Astute","asynchttp","Attach","attohttpc","autocite","AutomaticWPTester","Autonomy","awin\\.com","AWS Security Scanner","axios\\\/","a\\.pr-cy\\.ru","B-l-i-t-z-B-O-T","Backlink-Ceck","backlink-check","BacklinkHttpStatus","BackStreet","BackupLand","BackWeb","Bad-Neighborhood","Badass","baidu\\.com","Bandit","basicstate","BatchFTP","Battleztar Bazinga","baypup\\\/","BazQux","BBBike","BCKLINKS","BDFetch","BegunAdvertising","Bewica-security-scan","Bidtellect","BigBozz","Bigfoot","biglotron","BingLocalSearch","BingPreview","binlar","biNu image cacher","Bitacle","Bitrix link preview","biz_Directory","BKCTwitterUnshortener\\\/","Black Hole","Blackboard Safeassign","BlackWidow","BlockNote\\.Net","BlogBridge","Bloglines","Bloglovin","BlogPulseLive","BlogSearch","Blogtrottr","BlowFish","boitho\\.com-dc","Boost\\.Beast","BPImageWalker","Braintree-Webhooks","Branch Metrics API","Branch-Passthrough","Brandprotect","BrandVerity","Brandwatch","Brodie\\\/","Browsershots","BUbiNG","Buck\\\/","Buddy","BuiltWith","Bullseye","BunnySlippers","Burf Search","Butterfly\\\/","BuzzSumo","CAAM\\\/[0-9]","CakePHP","Calculon","Canary%20Mail","CaretNail","catexplorador","CC Metadata Scaper","Cegbfeieh","censys","centuryb.o.t9[at]gmail.com","Cerberian Drtrs","CERT\\.at-Statistics-Survey","cf-facebook","cg-eye","changedetection","ChangesMeter","Charlotte","chatterino-api-cache","CheckHost","checkprivacy","CherryPicker","ChinaClaw","Chirp\\\/","chkme\\.com","Chlooe","Chromaxa","CirrusExplorer","CISPA Vulnerability Notification","CISPA Web Analyser","Citoid","CJNetworkQuality","Clarsentia","clips\\.ua\\.ac\\.be","Cloud mapping","CloudEndure","CloudFlare-AlwaysOnline","Cloudflare-Healthchecks","Cloudinary","cmcm\\.com","coccoc","cognitiveseo","ColdFusion","colly -","CommaFeed","Commons-HttpClient","commonscan","contactbigdatafr","contentkingapp","Contextual Code Sites Explorer","convera","CookieReports","copyright sheriff","CopyRightCheck","Copyscape","cortex\\\/","Cosmos4j\\.feedback","Covario-IDS","Craw\\\/","Crescent","Criteo","Crowsnest","CSHttp","CSSCheck","Cula\\\/","curb","Curious George","curl","cuwhois\\\/","cybo\\.com","DAP\\\/NetHTTP","DareBoost","DatabaseDriverMysqli","DataCha0s","DatadogSynthetics","Datafeedwatch","Datanyze","DataparkSearch","dataprovider","DataXu","Daum(oa)?[ \\\/][0-9]","dBpoweramp","ddline","deeris","delve\\.ai","Demon","DeuSu","developers\\.google\\.com\\\/\\+\\\/web\\\/snippet\\\/","Devil","Digg","Digincore","DigitalPebble","Dirbuster","Discourse Forum Onebox","Dispatch\\\/","Disqus\\\/","DittoSpyder","dlvr","DMBrowser","DNSPod-reporting","docoloc","Dolphin http client","DomainAppender","DomainLabz","Domains Project\\\/","Donuts Content Explorer","dotMailer content retrieval","dotSemantic","downforeveryoneorjustme","Download Wonder","downnotifier","DowntimeDetector","Drip","drupact","Drupal \\(\\+http:\\\/\\\/drupal\\.org\\\/\\)","DTS Agent","dubaiindex","DuplexWeb-Google","DynatraceSynthetic","EARTHCOM","Easy-Thumb","EasyDL","Ebingbong","ec2linkfinder","eCairn-Grabber","eCatch","ECCP","eContext\\\/","Ecxi","EirGrabber","ElectricMonk","elefent","EMail Exractor","EMail Wolf","EmailWolf","Embarcadero","Embed PHP Library","Embedly","endo\\\/","europarchive\\.org","evc-batch","EventMachine HttpClient","Everwall Link Expander","Evidon","Evrinid","ExactSearch","ExaleadCloudview","Excel\\\/","exif","ExoRank","Exploratodo","Express WebPictures","Extreme Picture Finder","EyeNetIE","ezooms","facebookexternalhit","facebookexternalua","facebookplatform","fairshare","Faraday v","fasthttp","Faveeo","Favicon downloader","faviconarchive","faviconkit","FavOrg","Feed Wrangler","Feedable\\\/","Feedbin","FeedBooster","FeedBucket","FeedBunch\\\/","FeedBurner","feeder","Feedly","FeedshowOnline","Feedshow\\\/","Feedspot","FeedViewer\\\/","Feedwind\\\/","FeedZcollector","feeltiptop","Fetch API","Fetch\\\/[0-9]","Fever\\\/[0-9]","FHscan","Fiery%20Feeds","Filestack","Fimap","findlink","findthatfile","FlashGet","FlipboardBrowserProxy","FlipboardProxy","FlipboardRSS","Flock\\\/","Florienzh\\\/","fluffy","Flunky","flynxapp","forensiq","ForusP","FoundSeoTool","fragFINN\\.de","free thumbnails","Freeuploader","FreshRSS","frontman","Funnelback","Fuzz Faster U Fool","G-i-g-a-b-o-t","g00g1e\\.net","ganarvisitas","gdnplus\\.com","geek-tools","Genieo","GentleSource","GetCode","Getintent","GetLinkInfo","getprismatic","GetRight","getroot","GetURLInfo\\\/","GetWeb","Geziyor","Ghost Inspector","GigablastOpenSource","GIS-LABS","github-camo","GitHub-Hookshot","github\\.com","Go http package","Go [\\d\\.]* package http","Go!Zilla","Go-Ahead-Got-It","Go-http-client","go-mtasts\\\/","gobuster","gobyus","Gofeed","gofetch","Goldfire Server","GomezAgent","gooblog","Goodzer\\\/","Google AppsViewer","Google Desktop","Google favicon","Google Keyword Suggestion","Google Keyword Tool","Google Page Speed Insights","Google PP Default","Google Search Console","Google Web Preview","Google-Ads-Creatives-Assistant","Google-Ads-Overview","Google-Adwords","Google-Apps-Script","Google-Calendar-Importer","Google-HotelAdsVerifier","Google-HTTP-Java-Client","Google-InspectionTool","Google-Podcast","Google-Publisher-Plugin","Google-Read-Aloud","Google-SearchByImage","Google-Site-Verification","Google-SMTP-STS","Google-speakr","Google-Structured-Data-Testing-Tool","Google-Transparency-Report","google-xrawler","Google-Youtube-Links","GoogleDocs","GoogleHC\\\/","GoogleProber","GoogleProducer","GoogleSites","Gookey","GoSpotCheck","gosquared-thumbnailer","Gotit","GoZilla","grabify","GrabNet","Grafula","Grammarly","GrapeFX","GreatNews","Gregarius","GRequests","grokkit","grouphigh","grub-client","gSOAP\\\/","GT::WWW","GTmetrix","GuzzleHttp","gvfs\\\/","HAA(A)?RTLAND http client","Haansoft","hackney\\\/","Hadi Agent","HappyApps-WebCheck","Hardenize","Hatena","Havij","HaxerMen","HeadlessChrome","HEADMasterSEO","HeartRails_Capture","help@dataminr\\.com","heritrix","Hexometer","historious","hkedcity","hledejLevne\\.cz","Hloader","HMView","Holmes","HonesoSearchEngine","HootSuite Image proxy","Hootsuite-WebFeed","hosterstats","HostTracker","ht:\\\/\\\/check","htdig","HTMLparser","htmlyse","HTTP Banner Detection","http-get","HTTP-Header-Abfrage","http-kit","http-request\\\/","HTTP-Tiny","HTTP::Lite","http:\\\/\\\/www.neomo.de\\\/","HttpComponents","httphr","HTTPie","HTTPMon","httpRequest","httpscheck","httpssites_power","httpunit","HttpUrlConnection","http\\.rb\\\/","HTTP_Compression_Test","http_get","http_request2","http_requester","httrack","huaweisymantec","HubSpot ","HubSpot-Link-Resolver","Humanlinks","i2kconnect\\\/","Iblog","ichiro","Id-search","IdeelaborPlagiaat","IDG Twitter Links Resolver","IDwhois\\\/","Iframely","igdeSpyder","iGooglePortal","IlTrovatore","Image Fetch","Image Sucker","ImageEngine\\\/","ImageVisu\\\/","Imagga","imagineeasy","imgsizer","InAGist","inbound\\.li parser","InDesign%20CC","Indy Library","InetURL","infegy","infohelfer","InfoTekies","InfoWizards Reciprocal Link","inpwrd\\.com","instabid","Instapaper","Integrity","integromedb","Intelliseek","InterGET","Internet Ninja","InternetSeer","internetVista monitor","internetwache","internet_archive","intraVnews","IODC","IOI","Inboxb0t","iplabel","ips-agent","IPS\\\/[0-9]","IPWorks HTTP\\\/S Component","iqdb\\\/","Iria","Irokez","isitup\\.org","iskanie","isUp\\.li","iThemes Sync\\\/","IZaBEE","iZSearch","JAHHO","janforman","Jaunt\\\/","Java.*outbrain","javelin\\.io","Jbrofuzz","Jersey\\\/","JetCar","Jigsaw","Jobboerse","JobFeed discovery","Jobg8 URL Monitor","jobo","Jobrapido","Jobsearch1\\.5","JoinVision Generic","JolokiaPwn","Joomla","Jorgee","JS-Kit","JungleKeyThumbnail","JustView","Kaspersky Lab CFR link resolver","Kelny\\\/","Kerrigan\\\/","KeyCDN","Keyword Density","Keywords Research","khttp\\\/","KickFire","KimonoLabs\\\/","Kml-Google","knows\\.is","KOCMOHABT","kouio","kube-probe","kubectl","kulturarw3","KumKie","Larbin","Lavf\\\/","leakix\\.net","LeechFTP","LeechGet","letsencrypt","Lftp","LibVLC","LibWeb","Libwhisker","libwww","Licorne","Liferea\\\/","Lighthouse","Lightspeedsystems","Likse","limber\\.io","Link Valet","LinkAlarm\\\/","LinkAnalyser","linkCheck","linkdex","LinkExaminer","linkfluence","linkpeek","LinkPreview","LinkScan","LinksManager","LinkTiger","LinkWalker","link_thumbnailer","Lipperhey","Litemage_walker","livedoor ScreenShot","LoadImpactRload","localsearch-web","LongURL API","longurl-r-package","looid\\.com","looksystems\\.net","ltx71","lua-resty-http","Lucee \\(CFML Engine\\)","Lush Http Client","lwp-request","lwp-trivial","LWP::Simple","lycos","LYT\\.SR","L\\.webis","mabontland","MacOutlook\\\/","Mag-Net","MagpieRSS","Mail::STS","MailChimp","Mail\\.Ru","Majestic12","makecontact\\\/","Mandrill","MapperCmd","marketinggrader","MarkMonitor","MarkWatch","Mass Downloader","masscan\\\/","Mata Hari","mattermost","Mediametric","Mediapartners-Google","mediawords","MegaIndex\\.ru","MeltwaterNews","Melvil Rawi","MemGator","Metaspinner","MetaURI","MFC_Tear_Sample","Microsearch","Microsoft Data Access","Microsoft Office","Microsoft Outlook","Microsoft Windows Network Diagnostics","Microsoft-WebDAV-MiniRedir","Microsoft\\.Data\\.Mashup","MIDown tool","MIIxpc","Mindjet","Miniature\\.io","Miniflux","mio_httpc","Miro-HttpClient","Mister PiX","mixdata dot com","mixed-content-scan","mixnode","Mnogosearch","mogimogi","Mojeek","Mojolicious \\(Perl\\)","Mollie","monitis","Monitority\\\/","Monit\\\/","montastic","MonTools","Moreover","Morfeus Fucking Scanner","Morning Paper","MovableType","mowser","Mrcgiguy","Mr\\.4x3 Powered","MS Web Services Client Protocol","MSFrontPage","mShots","MuckRack\\\/","muhstik-scan","MVAClient","MxToolbox\\\/","myseosnapshot","nagios","Najdi\\.si","Name Intelligence","NameFo\\.com","Nameprotect","nationalarchives","Navroad","NearSite","Needle","Nessus","Net Vampire","NetAnts","NETCRAFT","NetLyzer","NetMechanic","NetNewsWire","Netpursual","netresearch","NetShelter ContentScan","Netsparker","NetSystemsResearch","nettle","NetTrack","Netvibes","NetZIP","Neustar WPM","NeutrinoAPI","NewRelicPinger","NewsBlur .*Finder","NewsGator","newsme","newspaper\\\/","Nexgate Ruby Client","NG-Search","nghttp2","Nibbler","NICErsPRO","NihilScio","Nikto","nineconnections","NLNZ_IAHarvester","Nmap Scripting Engine","node-fetch","node-superagent","node-urllib","Nodemeter","NodePing","node\\.io","nominet\\.org\\.uk","nominet\\.uk","Norton-Safeweb","Notifixious","notifyninja","NotionEmbedder","nuhk","nutch","Nuzzel","nWormFeedFinder","nyawc\\\/","Nymesis","NYU","Observatory\\\/","Ocelli\\\/","Octopus","oegp","Offline Explorer","Offline Navigator","OgScrper","okhttp","omgili","OMSC","Online Domain Tools","Open Source RSS","OpenCalaisSemanticProxy","Openfind","OpenLinkProfiler","Openstat\\\/","OpenVAS","OPPO A33","Optimizer","Orbiter","OrgProbe\\\/","orion-semantics","Outlook-Express","Outlook-iOS","Owler","Owlin","ownCloud News","ow\\.ly","OxfordCloudService","page scorer","Page Valet","page2rss","PageFreezer","PageGrabber","PagePeeker","PageScorer","Pagespeed\\\/","PageThing","page_verifier","Panopta","panscient","Papa Foto","parsijoo","Pavuk","PayPal IPN","pcBrowser","Pcore-HTTP","PDF24 URL To PDF","Pearltrees","PECL::HTTP","peerindex","Peew","PeoplePal","Perlu -","PhantomJS Screenshoter","PhantomJS\\\/","Photon\\\/","php-requests","phpservermon","Pi-Monster","Picscout","Picsearch","PictureFinder","Pimonster","Pingability","PingAdmin\\.Ru","Pingdom","Pingoscope","PingSpot","ping\\.blo\\.gs","pinterest\\.com","Pixray","Pizilla","Plagger\\\/","Pleroma ","Ploetz \\+ Zeller","Plukkie","plumanalytics","PocketImageCache","PocketParser","Pockey","PodcastAddict\\\/","POE-Component-Client-HTTP","Polymail\\\/","Pompos","Porkbun","Port Monitor","postano","postfix-mta-sts-resolver","PostmanRuntime","postplanner\\.com","PostPost","postrank","PowerPoint\\\/","Prebid","Prerender","Priceonomics Analysis Engine","PrintFriendly","PritTorrent","Prlog","probethenet","Project ?25499","Project-Resonance","prospectb2b","Protopage","ProWebWalker","proximic","PRTG Network Monitor","pshtt, https scanning","PTST ","PTST\\\/[0-9]+","Pump","Python-httplib2","python-httpx","python-requests","Python-urllib","Qirina Hurdler","QQDownload","QrafterPro","Qseero","Qualidator","QueryN Metasearch","queuedriver","quic-go-HTTP\\\/","QuiteRSS","Quora Link Preview","Qwantify","Radian6","RadioPublicImageResizer","Railgun\\\/","RankActive","RankFlex","RankSonicSiteAuditor","RapidLoad\\\/","Re-re Studio","ReactorNetty","Readability","RealDownload","RealPlayer%20Downloader","RebelMouse","Recorder","RecurPost\\\/","redback\\\/","ReederForMac","Reeder\\\/","ReGet","RepoMonkey","request\\.js","reqwest\\\/","ResponseCodeTest","RestSharp","Riddler","Rival IQ","Robosourcer","Robozilla","ROI Hunter","RPT-HTTPClient","RSSMix\\\/","RSSOwl","RyowlEngine","safe-agent-scanner","SalesIntelligent","Saleslift","SAP NetWeaver Application Server","SauceNAO","SBIder","sc-downloader","scalaj-http","Scamadviser-Frontend","ScanAlert","scan\\.lol","Scoop","scooter","ScopeContentAG-HTTP-Client","ScoutJet","ScoutURLMonitor","ScrapeBox Page Scanner","Scrapy","Screaming","ScreenShotService","Scrubby","Scrutiny\\\/","Search37","searchenginepromotionhelp","Searchestate","SearchExpress","SearchSight","SearchWP","search\\.thunderstone","Seeker","semanticdiscovery","semanticjuice","Semiocast HTTP client","Semrush","Sendsay\\.Ru","sentry\\\/","SEO Browser","Seo Servis","seo-nastroj\\.cz","seo4ajax","Seobility","SEOCentro","SeoCheck","seocompany","SEOkicks","SEOlizer","Seomoz","SEOprofiler","seoscanners","SEOsearch","seositecheckup","SEOstats","servernfo","sexsearcher","Seznam","Shelob","Shodan","Shoppimon","ShopWiki","ShortLinkTranslate","shortURL lengthener","shrinktheweb","Sideqik","Siege","SimplePie","SimplyFast","Siphon","SISTRIX","Site Sucker","Site-Shot\\\/","Site24x7","SiteBar","Sitebeam","Sitebulb\\\/","SiteCondor","SiteExplorer","SiteGuardian","Siteimprove","SiteIndexed","Sitemap(s)? Generator","SitemapGenerator","SiteMonitor","Siteshooter B0t","SiteSnagger","SiteSucker","SiteTruth","Sitevigil","sitexy\\.com","SkypeUriPreview","Slack\\\/","sli-systems\\.com","slider\\.com","slurp","SlySearch","SmartDownload","SMRF URL Expander","SMUrlExpander","Snake","Snappy","SnapSearch","Snarfer\\\/","SniffRSS","sniptracker","Snoopy","SnowHaze Search","sogou web","SortSite","Sottopop","sovereign\\.ai","SpaceBison","SpamExperts","Spammen","Spanner","Spawning-AI","spaziodati","SPDYCheck","Specificfeeds","SpeedKit","speedy","SPEng","Spinn3r","spray-can","Sprinklr ","spyonweb","sqlmap","Sqlworm","Sqworm","SSL Labs","ssl-tools","StackRambler","Statastico\\\/","Statically-","StatusCake","Steeler","Stratagems Kumo","Stripe\\\/","Stroke\\.cz","StudioFACA","StumbleUpon","suchen","Sucuri","summify","SuperHTTP","Surphace Scout","Suzuran","swcd ","Symfony BrowserKit","Symfony2 BrowserKit","Synapse\\\/","Syndirella\\\/","SynHttpClient-Built","Sysomos","sysscan","Szukacz","T0PHackTeam","tAkeOut","Tarantula\\\/","Taringa UGC","TarmotGezgin","tchelebi\\.io","techiaith\\.cymru","Teleport","Telesoft","Telesphoreo","Telesphorep","Tenon\\.io","teoma","terrainformatica","Test Certificate Info","testuri","Tetrahedron","TextRazor Downloader","The Drop Reaper","The Expert HTML Source Viewer","The Intraformant","The Knowledge AI","theinternetrules","TheNomad","Thinklab","Thumbor","Thumbshots","ThumbSniper","timewe\\.net","TinEye","Tiny Tiny RSS","TLSProbe\\\/","Toata","topster","touche\\.com","Traackr\\.com","tracemyfile","Trackuity","TrapitAgent","Trendiction","Trendsmap","trendspottr","truwoGPS","TryJsoup","TulipChain","Turingos","Turnitin","tweetedtimes","Tweetminster","Tweezler\\\/","twibble","Twice","Twikle","Twingly","Twisted PageGetter","Typhoeus","ubermetrics-technologies","uclassify","UdmSearch","ultimate_sitemap_parser","unchaos","unirest-java","UniversalFeedParser","unshortenit","Unshorten\\.It","Untiny","UnwindFetchor","updated","updown\\.io daemon","Upflow","Uptimia","URL Verifier","Urlcheckr","URLitor","urlresolver","Urlstat","URLTester","UrlTrends Ranking Updater","URLy Warning","URLy\\.Warning","URL\\\/Emacs","Vacuum","Vagabondo","VB Project","vBSEO","VCI","via ggpht\\.com GoogleImageProxy","Virusdie","visionutils","Visual Rights Group","vkShare","VoidEYE","Voil","voltron","voyager\\\/","VSAgent\\\/","VSB-TUO\\\/","Vulnbusters Meter","VYU2","w3af\\.org","W3C-checklink","W3C-mobileOK","W3C_Unicorn","WAC-OFU","WakeletLinkExpander","WallpapersHD","Wallpapers\\\/[0-9]+","wangling","Wappalyzer","WatchMouse","WbSrch\\\/","WDT\\.io","Web Auto","Web Collage","Web Enhancer","Web Fetch","Web Fuck","Web Pix","Web Sauger","Web spyder","Web Sucker","web-capture\\.net","Web-sniffer","Webalta","Webauskunft","WebAuto","WebCapture","WebClient\\\/","webcollage","WebCookies","WebCopier","WebCorp","WebDataStats","WebDoc","WebEnhancer","WebFetch","WebFuck","WebGazer","WebGo IS","WebImageCollector","WebImages","WebIndex","webkit2png","WebLeacher","webmastercoffee","webmon ","WebPix","WebReaper","WebSauger","webscreenie","Webshag","Webshot","Website Quester","websitepulse agent","WebsiteQuester","Websnapr","WebSniffer","Webster","WebStripper","WebSucker","webtech\\\/","WebThumbnail","Webthumb\\\/","WebWhacker","WebZIP","WeLikeLinks","WEPA","WeSEE","wf84","Wfuzz\\\/","wget","WhatCMS","WhatsApp","WhatsMyIP","WhatWeb","WhereGoes\\?","Whibse","WhoAPI\\\/","WhoRunsCoinHive","Whynder Magnet","Windows-RSS-Platform","WinHttp-Autoproxy-Service","WinHTTP\\\/","WinPodder","wkhtmlto","wmtips","Woko","Wolfram HTTPClient","woorankreview","WordPress\\\/","WordupinfoSearch","Word\\\/","worldping-api","wotbox","WP Engine Install Performance API","WP Rocket","wpif","wprecon\\.com survey","WPScan","wscheck","Wtrace","WWW-Collector-E","WWW-Mechanize","WWW::Document","WWW::Mechanize","WWWOFFLE","www\\.monitor\\.us","x09Mozilla","x22Mozilla","XaxisSemanticsClassifier","XenForo\\\/","Xenu Link Sleuth","XING-contenttabreceiver","xpymep([0-9]?)\\.exe","Y!J-[A-Z][A-Z][A-Z]","Yaanb","yacy","Yahoo Link Preview","YahooCacheSystem","YahooMailProxy","YahooYSMcm","YandeG","Yandex(?!Search)","yanga","yeti","Yo-yo","Yoleo Consumer","yomins\\.com","yoogliFetchAgent","YottaaMonitor","Your-Website-Sucks","yourls\\.org","YoYs\\.net","YP\\.PL","Zabbix","Zade","Zao","Zauba","Zemanta Aggregator","Zend\\\\Http\\\\Client","Zend_Http_Client","Zermelo","Zeus ","zgrab","ZnajdzFoto","ZnHTTP","Zombie\\.js","Zoom\\.Mac","ZoteroTranslationServer","ZyBorg","[a-z0-9\\-_]*(bot|crawl|archiver|transcoder|spider|uptime|validator|fetcher|cron|checker|reader|extractor|monitoring|analyzer|scraper)"]
\ No newline at end of file
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/raw/Crawlers.txt b/blockbot/vendor/jaybizzle/crawler-detect/raw/Crawlers.txt
index 1522796e..791d08bb 100644
--- a/blockbot/vendor/jaybizzle/crawler-detect/raw/Crawlers.txt
+++ b/blockbot/vendor/jaybizzle/crawler-detect/raw/Crawlers.txt
@@ -1,27 +1,46 @@
-.*Java.*outbrain
  YLT
+^Aether
+^Amazon Simple Notification Service Agent$
+^Amazon-Route53-Health-Check-Service
 ^b0t$
 ^bluefish 
 ^Calypso v\/
 ^COMODO DCV
+^Corax
 ^DangDang
 ^DavClnt
+^DHSH
+^docker\/[0-9]
+^Expanse
 ^FDM 
 ^git\/
 ^Goose\/
 ^Grabber
+^Gradle\/
 ^HTTPClient\/
+^HTTPing
 ^Java\/
 ^Jeode\/
 ^Jetty\/
 ^Mail\/
 ^Mget
 ^Microsoft URL Control
+^Mikrotik\/
+^Netlab360
 ^NG\/[0-9\.]
 ^NING\/
-^PHP\/[0-9]
+^npm\/
+^Nuclei
+^PHP-AYMAPI\/
+^PHP\/
+^pip\/
+^pnpm\/
 ^RMA\/
 ^Ruby|Ruby\/[0-9]
+^Swurl 
+^TLS tester 
+^twine\/
+^ureq
 ^VSE\/[0-9]
 ^WordPress\.com
 ^XRL\/[0-9]
@@ -29,17 +48,18 @@
 008\/
 13TABS
 192\.comAgent
+2GDPR\/
 2ip\.ru
 404enemy
 7Siters
 80legs
-a\.pr-cy\.ru
 a3logics\.in
 A6-Indexer
 Abonti
 Aboundex
 aboutthedomain
 Accoona-AI-Agent
+acebookexternalhit\/
 acoon
 acrylicapps\.com\/pulp
 Acunetix
@@ -49,8 +69,14 @@ AddThis
 ADmantX
 AdminLabs
 adressendeutschland
+adreview\/
 adscanner
+adstxt-worker
 Adstxtaggregator
+adstxt\.com
+Adyen HttpClient
+AffiliateLabz\/
+affilimate-puppeteer
 agentslug
 AHC
 aihit
@@ -71,20 +97,23 @@ AndroidDownloadManager
 Anemone
 AngleSharp
 annotate_google
-Ant\.com
+Anthill
 Anturis Agent
+Ant\.com
 AnyEvent-HTTP\/
+Apache Ant\/
 Apache Droid
 Apache OpenOffice
 Apache-HttpAsyncClient
 Apache-HttpClient
 ApacheBench
 Apexoo
+apimon\.de
 APIs-Google
 AportWorm\/
 AppBeat\/
 AppEngine-Google
-AppStoreScraperZ
+AppleSyndication
 Aprc\/[0-9]
 Arachmo
 arachnode
@@ -92,21 +121,28 @@ Arachnophilia
 aria2
 Arukereso
 asafaweb
-AskQuickly
+Asana\/
 Ask Jeeves
+AskQuickly
 ASPSeek
 Asterias
 Astute
 asynchttp
 Attach
+attohttpc
 autocite
+AutomaticWPTester
 Autonomy
+awin\.com
+AWS Security Scanner
 axios\/
+a\.pr-cy\.ru
 B-l-i-t-z-B-O-T
 Backlink-Ceck
 backlink-check
 BacklinkHttpStatus
 BackStreet
+BackupLand
 BackWeb
 Bad-Neighborhood
 Badass
@@ -121,6 +157,7 @@ BBBike
 BCKLINKS
 BDFetch
 BegunAdvertising
+Bewica-security-scan
 Bidtellect
 BigBozz
 Bigfoot
@@ -130,11 +167,14 @@ BingPreview
 binlar
 biNu image cacher
 Bitacle
+Bitrix link preview
 biz_Directory
+BKCTwitterUnshortener\/
 Black Hole
 Blackboard Safeassign
 BlackWidow
 BlockNote\.Net
+BlogBridge
 Bloglines
 Bloglovin
 BlogPulseLive
@@ -142,6 +182,7 @@ BlogSearch
 Blogtrottr
 BlowFish
 boitho\.com-dc
+Boost\.Beast
 BPImageWalker
 Braintree-Webhooks
 Branch Metrics API
@@ -169,12 +210,15 @@ catexplorador
 CC Metadata Scaper
 Cegbfeieh
 censys
+centuryb.o.t9[at]gmail.com
 Cerberian Drtrs
 CERT\.at-Statistics-Survey
+cf-facebook
 cg-eye
 changedetection
 ChangesMeter
 Charlotte
+chatterino-api-cache
 CheckHost
 checkprivacy
 CherryPicker
@@ -185,6 +229,7 @@ Chlooe
 Chromaxa
 CirrusExplorer
 CISPA Vulnerability Notification
+CISPA Web Analyser
 Citoid
 CJNetworkQuality
 Clarsentia
@@ -192,27 +237,34 @@ clips\.ua\.ac\.be
 Cloud mapping
 CloudEndure
 CloudFlare-AlwaysOnline
+Cloudflare-Healthchecks
 Cloudinary
 cmcm\.com
 coccoc
 cognitiveseo
+ColdFusion
 colly -
 CommaFeed
 Commons-HttpClient
 commonscan
 contactbigdatafr
 contentkingapp
+Contextual Code Sites Explorer
 convera
 CookieReports
 copyright sheriff
 CopyRightCheck
 Copyscape
+cortex\/
 Cosmos4j\.feedback
 Covario-IDS
+Craw\/
 Crescent
-Crowsnest
 Criteo
+Crowsnest
 CSHttp
+CSSCheck
+Cula\/
 curb
 Curious George
 curl
@@ -222,12 +274,17 @@ DAP\/NetHTTP
 DareBoost
 DatabaseDriverMysqli
 DataCha0s
+DatadogSynthetics
 Datafeedwatch
 Datanyze
 DataparkSearch
 dataprovider
 DataXu
 Daum(oa)?[ \/][0-9]
+dBpoweramp
+ddline
+deeris
+delve\.ai
 Demon
 DeuSu
 developers\.google\.com\/\+\/web\/snippet\/
@@ -237,8 +294,8 @@ Digincore
 DigitalPebble
 Dirbuster
 Discourse Forum Onebox
-Disqus\/
 Dispatch\/
+Disqus\/
 DittoSpyder
 dlvr
 DMBrowser
@@ -246,6 +303,8 @@ DNSPod-reporting
 docoloc
 Dolphin http client
 DomainAppender
+DomainLabz
+Domains Project\/
 Donuts Content Explorer
 dotMailer content retrieval
 dotSemantic
@@ -258,6 +317,8 @@ drupact
 Drupal \(\+http:\/\/drupal\.org\/\)
 DTS Agent
 dubaiindex
+DuplexWeb-Google
+DynatraceSynthetic
 EARTHCOM
 Easy-Thumb
 EasyDL
@@ -288,20 +349,22 @@ ExactSearch
 ExaleadCloudview
 Excel\/
 exif
+ExoRank
 Exploratodo
 Express WebPictures
 Extreme Picture Finder
 EyeNetIE
 ezooms
 facebookexternalhit
+facebookexternalua
 facebookplatform
 fairshare
 Faraday v
 fasthttp
 Faveeo
 Favicon downloader
-faviconkit
 faviconarchive
+faviconkit
 FavOrg
 Feed Wrangler
 Feedable\/
@@ -313,7 +376,9 @@ FeedBurner
 feeder
 Feedly
 FeedshowOnline
+Feedshow\/
 Feedspot
+FeedViewer\/
 Feedwind\/
 FeedZcollector
 feeltiptop
@@ -321,6 +386,8 @@ Fetch API
 Fetch\/[0-9]
 Fever\/[0-9]
 FHscan
+Fiery%20Feeds
+Filestack
 Fimap
 findlink
 findthatfile
@@ -329,18 +396,24 @@ FlipboardBrowserProxy
 FlipboardProxy
 FlipboardRSS
 Flock\/
+Florienzh\/
 fluffy
 Flunky
 flynxapp
 forensiq
+ForusP
 FoundSeoTool
-http:\/\/www.neomo.de\/
+fragFINN\.de
 free thumbnails
 Freeuploader
+FreshRSS
+frontman
 Funnelback
+Fuzz Faster U Fool
 G-i-g-a-b-o-t
 g00g1e\.net
 ganarvisitas
+gdnplus\.com
 geek-tools
 Genieo
 GentleSource
@@ -352,18 +425,24 @@ GetRight
 getroot
 GetURLInfo\/
 GetWeb
+Geziyor
 Ghost Inspector
 GigablastOpenSource
 GIS-LABS
 github-camo
+GitHub-Hookshot
 github\.com
-Go [\d\.]* package http
 Go http package
+Go [\d\.]* package http
+Go!Zilla
 Go-Ahead-Got-It
 Go-http-client
-Go!Zilla
+go-mtasts\/
+gobuster
 gobyus
+Gofeed
 gofetch
+Goldfire Server
 GomezAgent
 gooblog
 Goodzer\/
@@ -376,24 +455,31 @@ Google Page Speed Insights
 Google PP Default
 Google Search Console
 Google Web Preview
+Google-Ads-Creatives-Assistant
+Google-Ads-Overview
 Google-Adwords
 Google-Apps-Script
 Google-Calendar-Importer
 Google-HotelAdsVerifier
 Google-HTTP-Java-Client
+Google-InspectionTool
+Google-Podcast
 Google-Publisher-Plugin
+Google-Read-Aloud
 Google-SearchByImage
 Google-Site-Verification
+Google-SMTP-STS
+Google-speakr
 Google-Structured-Data-Testing-Tool
-Google-Youtube-Links
+Google-Transparency-Report
 google-xrawler
+Google-Youtube-Links
 GoogleDocs
 GoogleHC\/
+GoogleProber
 GoogleProducer
 GoogleSites
-Google-Transparency-Report
 Gookey
-GoScraper
 GoSpotCheck
 gosquared-thumbnailer
 Gotit
@@ -419,13 +505,16 @@ Haansoft
 hackney\/
 Hadi Agent
 HappyApps-WebCheck
+Hardenize
 Hatena
 Havij
+HaxerMen
 HeadlessChrome
 HEADMasterSEO
 HeartRails_Capture
 help@dataminr\.com
 heritrix
+Hexometer
 historious
 hkedcity
 hledejLevne\.cz
@@ -442,28 +531,31 @@ htdig
 HTMLparser
 htmlyse
 HTTP Banner Detection
-HTTP_Compression_Test
-http_request2
-http_requester
 http-get
 HTTP-Header-Abfrage
 http-kit
 http-request\/
 HTTP-Tiny
 HTTP::Lite
-http\.rb\/
-http_get
+http:\/\/www.neomo.de\/
 HttpComponents
 httphr
+HTTPie
 HTTPMon
 httpRequest
 httpscheck
 httpssites_power
 httpunit
 HttpUrlConnection
+http\.rb\/
+HTTP_Compression_Test
+http_get
+http_request2
+http_requester
 httrack
 huaweisymantec
 HubSpot 
+HubSpot-Link-Resolver
 Humanlinks
 i2kconnect\/
 Iblog
@@ -474,6 +566,7 @@ IDG Twitter Links Resolver
 IDwhois\/
 Iframely
 igdeSpyder
+iGooglePortal
 IlTrovatore
 Image Fetch
 Image Sucker
@@ -498,13 +591,15 @@ Integrity
 integromedb
 Intelliseek
 InterGET
-internet_archive
 Internet Ninja
 InternetSeer
 internetVista monitor
+internetwache
+internet_archive
 intraVnews
 IODC
 IOI
+Inboxb0t
 iplabel
 ips-agent
 IPS\/[0-9]
@@ -516,10 +611,13 @@ isitup\.org
 iskanie
 isUp\.li
 iThemes Sync\/
+IZaBEE
 iZSearch
 JAHHO
 janforman
 Jaunt\/
+Java.*outbrain
+javelin\.io
 Jbrofuzz
 Jersey\/
 JetCar
@@ -535,6 +633,7 @@ JolokiaPwn
 Joomla
 Jorgee
 JS-Kit
+JungleKeyThumbnail
 JustView
 Kaspersky Lab CFR link resolver
 Kelny\/
@@ -542,6 +641,7 @@ Kerrigan\/
 KeyCDN
 Keyword Density
 Keywords Research
+khttp\/
 KickFire
 KimonoLabs\/
 Kml-Google
@@ -549,11 +649,12 @@ knows\.is
 KOCMOHABT
 kouio
 kube-probe
+kubectl
 kulturarw3
 KumKie
-L\.webis
 Larbin
 Lavf\/
+leakix\.net
 LeechFTP
 LeechGet
 letsencrypt
@@ -564,41 +665,50 @@ Libwhisker
 libwww
 Licorne
 Liferea\/
-Lightspeedsystems
 Lighthouse
+Lightspeedsystems
 Likse
+limber\.io
 Link Valet
-link_thumbnailer
 LinkAlarm\/
+LinkAnalyser
 linkCheck
 linkdex
 LinkExaminer
 linkfluence
 linkpeek
-LinkPreviewGenerator
+LinkPreview
 LinkScan
 LinksManager
 LinkTiger
 LinkWalker
+link_thumbnailer
 Lipperhey
 Litemage_walker
 livedoor ScreenShot
 LoadImpactRload
 localsearch-web
 LongURL API
+longurl-r-package
+looid\.com
 looksystems\.net
 ltx71
 lua-resty-http
+Lucee \(CFML Engine\)
+Lush Http Client
 lwp-request
 lwp-trivial
 LWP::Simple
 lycos
 LYT\.SR
+L\.webis
 mabontland
+MacOutlook\/
 Mag-Net
 MagpieRSS
-Mail\.Ru
+Mail::STS
 MailChimp
+Mail\.Ru
 Majestic12
 makecontact\/
 Mandrill
@@ -609,6 +719,8 @@ MarkWatch
 Mass Downloader
 masscan\/
 Mata Hari
+mattermost
+Mediametric
 Mediapartners-Google
 mediawords
 MegaIndex\.ru
@@ -619,28 +731,31 @@ Metaspinner
 MetaURI
 MFC_Tear_Sample
 Microsearch
-Microsoft Office 
+Microsoft Data Access
+Microsoft Office
 Microsoft Outlook
 Microsoft Windows Network Diagnostics
 Microsoft-WebDAV-MiniRedir
-Microsoft Data Access
+Microsoft\.Data\.Mashup
 MIDown tool
 MIIxpc
 Mindjet
 Miniature\.io
 Miniflux
+mio_httpc
+Miro-HttpClient
 Mister PiX
 mixdata dot com
 mixed-content-scan
-Mixmax-LinkPreview
 mixnode
 Mnogosearch
 mogimogi
 Mojeek
 Mojolicious \(Perl\)
-Monit\/
+Mollie
 monitis
 Monitority\/
+Monit\/
 montastic
 MonTools
 Moreover
@@ -649,6 +764,7 @@ Morning Paper
 MovableType
 mowser
 Mrcgiguy
+Mr\.4x3 Powered
 MS Web Services Client Protocol
 MSFrontPage
 mShots
@@ -656,10 +772,13 @@ MuckRack\/
 muhstik-scan
 MVAClient
 MxToolbox\/
+myseosnapshot
 nagios
 Najdi\.si
 Name Intelligence
+NameFo\.com
 Nameprotect
+nationalarchives
 Navroad
 NearSite
 Needle
@@ -674,6 +793,8 @@ Netpursual
 netresearch
 NetShelter ContentScan
 Netsparker
+NetSystemsResearch
+nettle
 NetTrack
 Netvibes
 NetZIP
@@ -686,22 +807,26 @@ newsme
 newspaper\/
 Nexgate Ruby Client
 NG-Search
+nghttp2
 Nibbler
 NICErsPRO
+NihilScio
 Nikto
 nineconnections
 NLNZ_IAHarvester
 Nmap Scripting Engine
+node-fetch
 node-superagent
 node-urllib
-node\.io
 Nodemeter
 NodePing
+node\.io
 nominet\.org\.uk
 nominet\.uk
 Norton-Safeweb
 Notifixious
 notifyninja
+NotionEmbedder
 nuhk
 nutch
 Nuzzel
@@ -709,39 +834,45 @@ nWormFeedFinder
 nyawc\/
 Nymesis
 NYU
+Observatory\/
 Ocelli\/
 Octopus
 oegp
 Offline Explorer
 Offline Navigator
-og-scraper
+OgScrper
 okhttp
 omgili
 OMSC
 Online Domain Tools
+Open Source RSS
 OpenCalaisSemanticProxy
 Openfind
 OpenLinkProfiler
 Openstat\/
 OpenVAS
+OPPO A33
 Optimizer
 Orbiter
 OrgProbe\/
 orion-semantics
 Outlook-Express
 Outlook-iOS
-ow\.ly
 Owler
+Owlin
 ownCloud News
+ow\.ly
 OxfordCloudService
-Page Valet
-page_verifier
 page scorer
+Page Valet
 page2rss
+PageFreezer
 PageGrabber
 PagePeeker
 PageScorer
 Pagespeed\/
+PageThing
+page_verifier
 Panopta
 panscient
 Papa Foto
@@ -750,6 +881,7 @@ Pavuk
 PayPal IPN
 pcBrowser
 Pcore-HTTP
+PDF24 URL To PDF
 Pearltrees
 PECL::HTTP
 peerindex
@@ -759,44 +891,52 @@ Perlu -
 PhantomJS Screenshoter
 PhantomJS\/
 Photon\/
+php-requests
 phpservermon
 Pi-Monster
 Picscout
 Picsearch
 PictureFinder
 Pimonster
-ping\.blo\.gs
 Pingability
 PingAdmin\.Ru
 Pingdom
 Pingoscope
 PingSpot
+ping\.blo\.gs
 pinterest\.com
 Pixray
 Pizilla
 Plagger\/
+Pleroma 
 Ploetz \+ Zeller
 Plukkie
 plumanalytics
 PocketImageCache
 PocketParser
 Pockey
+PodcastAddict\/
 POE-Component-Client-HTTP
 Polymail\/
 Pompos
 Porkbun
 Port Monitor
 postano
+postfix-mta-sts-resolver
 PostmanRuntime
+postplanner\.com
 PostPost
 postrank
 PowerPoint\/
+Prebid
+Prerender
 Priceonomics Analysis Engine
 PrintFriendly
 PritTorrent
 Prlog
 probethenet
-Project 25499
+Project ?25499
+Project-Resonance
 prospectb2b
 Protopage
 ProWebWalker
@@ -805,9 +945,9 @@ PRTG Network Monitor
 pshtt, https scanning
 PTST 
 PTST\/[0-9]+
-Pulsepoint XT3 web scraper
 Pump
 Python-httplib2
+python-httpx
 python-requests
 Python-urllib
 Qirina Hurdler
@@ -817,12 +957,17 @@ Qseero
 Qualidator
 QueryN Metasearch
 queuedriver
+quic-go-HTTP\/
+QuiteRSS
 Quora Link Preview
 Qwantify
 Radian6
+RadioPublicImageResizer
+Railgun\/
 RankActive
 RankFlex
 RankSonicSiteAuditor
+RapidLoad\/
 Re-re Studio
 ReactorNetty
 Readability
@@ -833,6 +978,7 @@ Recorder
 RecurPost\/
 redback\/
 ReederForMac
+Reeder\/
 ReGet
 RepoMonkey
 request\.js
@@ -845,38 +991,44 @@ Robosourcer
 Robozilla
 ROI Hunter
 RPT-HTTPClient
+RSSMix\/
 RSSOwl
+RyowlEngine
 safe-agent-scanner
 SalesIntelligent
 Saleslift
-Sendsay\.Ru
+SAP NetWeaver Application Server
 SauceNAO
 SBIder
+sc-downloader
 scalaj-http
-scan\.lol
+Scamadviser-Frontend
 ScanAlert
+scan\.lol
 Scoop
 scooter
+ScopeContentAG-HTTP-Client
 ScoutJet
 ScoutURLMonitor
 ScrapeBox Page Scanner
-SimpleScraper
 Scrapy
 Screaming
 ScreenShotService
 Scrubby
 Scrutiny\/
-search\.thunderstone
 Search37
 searchenginepromotionhelp
 Searchestate
 SearchExpress
 SearchSight
+SearchWP
+search\.thunderstone
 Seeker
 semanticdiscovery
 semanticjuice
 Semiocast HTTP client
 Semrush
+Sendsay\.Ru
 sentry\/
 SEO Browser
 Seo Servis
@@ -885,11 +1037,13 @@ seo4ajax
 Seobility
 SEOCentro
 SeoCheck
+seocompany
 SEOkicks
+SEOlizer
 Seomoz
 SEOprofiler
-SEOsearch
 seoscanners
+SEOsearch
 seositecheckup
 SEOstats
 servernfo
@@ -900,14 +1054,16 @@ Shodan
 Shoppimon
 ShopWiki
 ShortLinkTranslate
+shortURL lengthener
 shrinktheweb
 Sideqik
+Siege
 SimplePie
 SimplyFast
 Siphon
 SISTRIX
-Site-Shot\/
 Site Sucker
+Site-Shot\/
 Site24x7
 SiteBar
 Sitebeam
@@ -928,6 +1084,7 @@ Sitevigil
 sitexy\.com
 SkypeUriPreview
 Slack\/
+sli-systems\.com
 slider\.com
 slurp
 SlySearch
@@ -950,9 +1107,11 @@ SpaceBison
 SpamExperts
 Spammen
 Spanner
+Spawning-AI
 spaziodati
 SPDYCheck
 Specificfeeds
+SpeedKit
 speedy
 SPEng
 Spinn3r
@@ -966,9 +1125,11 @@ SSL Labs
 ssl-tools
 StackRambler
 Statastico\/
+Statically-
 StatusCake
 Steeler
 Stratagems Kumo
+Stripe\/
 Stroke\.cz
 StudioFACA
 StumbleUpon
@@ -978,9 +1139,11 @@ summify
 SuperHTTP
 Surphace Scout
 Suzuran
-SwiteScraper
+swcd 
 Symfony BrowserKit
 Symfony2 BrowserKit
+Synapse\/
+Syndirella\/
 SynHttpClient-Built
 Sysomos
 sysscan
@@ -990,6 +1153,8 @@ tAkeOut
 Tarantula\/
 Taringa UGC
 TarmotGezgin
+tchelebi\.io
+techiaith\.cymru
 Teleport
 Telesoft
 Telesphoreo
@@ -1000,13 +1165,15 @@ terrainformatica
 Test Certificate Info
 testuri
 Tetrahedron
+TextRazor Downloader
 The Drop Reaper
 The Expert HTML Source Viewer
-The Knowledge AI
 The Intraformant
+The Knowledge AI
 theinternetrules
 TheNomad
 Thinklab
+Thumbor
 Thumbshots
 ThumbSniper
 timewe\.net
@@ -1040,9 +1207,11 @@ Typhoeus
 ubermetrics-technologies
 uclassify
 UdmSearch
+ultimate_sitemap_parser
 unchaos
 unirest-java
 UniversalFeedParser
+unshortenit
 Unshorten\.It
 Untiny
 UnwindFetchor
@@ -1050,8 +1219,8 @@ updated
 updown\.io daemon
 Upflow
 Uptimia
-Urlcheckr
 URL Verifier
+Urlcheckr
 URLitor
 urlresolver
 Urlstat
@@ -1059,15 +1228,16 @@ URLTester
 UrlTrends Ranking Updater
 URLy Warning
 URLy\.Warning
+URL\/Emacs
 Vacuum
 Vagabondo
 VB Project
 vBSEO
 VCI
 via ggpht\.com GoogleImageProxy
-VidibleScraper
 Virusdie
 visionutils
+Visual Rights Group
 vkShare
 VoidEYE
 Voil
@@ -1078,19 +1248,18 @@ VSB-TUO\/
 Vulnbusters Meter
 VYU2
 w3af\.org
-W3C_Unicorn
 W3C-checklink
 W3C-mobileOK
+W3C_Unicorn
 WAC-OFU
-Wallpapers\/[0-9]+
+WakeletLinkExpander
 WallpapersHD
+Wallpapers\/[0-9]+
 wangling
 Wappalyzer
 WatchMouse
 WbSrch\/
 WDT\.io
-web-capture\.net
-Web-sniffer
 Web Auto
 Web Collage
 Web Enhancer
@@ -1098,7 +1267,10 @@ Web Fetch
 Web Fuck
 Web Pix
 Web Sauger
+Web spyder
 Web Sucker
+web-capture\.net
+Web-sniffer
 Webalta
 Webauskunft
 WebAuto
@@ -1136,8 +1308,9 @@ WebSniffer
 Webster
 WebStripper
 WebSucker
-Webthumb\/
+webtech\/
 WebThumbnail
+Webthumb\/
 WebWhacker
 WebZIP
 WeLikeLinks
@@ -1146,24 +1319,31 @@ WeSEE
 wf84
 Wfuzz\/
 wget
+WhatCMS
 WhatsApp
 WhatsMyIP
 WhatWeb
 WhereGoes\?
 Whibse
+WhoAPI\/
 WhoRunsCoinHive
 Whynder Magnet
 Windows-RSS-Platform
+WinHttp-Autoproxy-Service
+WinHTTP\/
 WinPodder
 wkhtmlto
 wmtips
 Woko
+Wolfram HTTPClient
 woorankreview
-Word\/
 WordPress\/
 WordupinfoSearch
+Word\/
+worldping-api
 wotbox
 WP Engine Install Performance API
+WP Rocket
 wpif
 wprecon\.com survey
 WPScan
@@ -1173,20 +1353,21 @@ WWW-Collector-E
 WWW-Mechanize
 WWW::Document
 WWW::Mechanize
-www\.monitor\.us
 WWWOFFLE
+www\.monitor\.us
 x09Mozilla
 x22Mozilla
 XaxisSemanticsClassifier
+XenForo\/
 Xenu Link Sleuth
 XING-contenttabreceiver
 xpymep([0-9]?)\.exe
-Y!J-(ASR|BSC)
-Y\!J-BRW
+Y!J-[A-Z][A-Z][A-Z]
 Yaanb
 yacy
 Yahoo Link Preview
 YahooCacheSystem
+YahooMailProxy
 YahooYSMcm
 YandeG
 Yandex(?!Search)
@@ -1194,6 +1375,7 @@ yanga
 yeti
 Yo-yo
 Yoleo Consumer
+yomins\.com
 yoogliFetchAgent
 YottaaMonitor
 Your-Website-Sucks
@@ -1205,13 +1387,15 @@ Zade
 Zao
 Zauba
 Zemanta Aggregator
-Zend_Http_Client
 Zend\\Http\\Client
+Zend_Http_Client
 Zermelo
 Zeus 
 zgrab
 ZnajdzFoto
+ZnHTTP
 Zombie\.js
 Zoom\.Mac
+ZoteroTranslationServer
 ZyBorg
-[a-z0-9\-_]*(bot|crawl|archiver|transcoder|spider|uptime|validator|fetcher|cron|checker|reader|extractor|monitoring|analyzer)
\ No newline at end of file
+[a-z0-9\-_]*(bot|crawl|archiver|transcoder|spider|uptime|validator|fetcher|cron|checker|reader|extractor|monitoring|analyzer|scraper)
\ No newline at end of file
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/raw/Exclusions.json b/blockbot/vendor/jaybizzle/crawler-detect/raw/Exclusions.json
index a18eb985..e7e01416 100644
--- a/blockbot/vendor/jaybizzle/crawler-detect/raw/Exclusions.json
+++ b/blockbot/vendor/jaybizzle/crawler-detect/raw/Exclusions.json
@@ -1 +1 @@
-["Safari.[\\d\\.]*","Firefox.[\\d\\.]*"," Chrome.[\\d\\.]*","Chromium.[\\d\\.]*","MSIE.[\\d\\.]","Opera\\\/[\\d\\.]*","Mozilla.[\\d\\.]*","AppleWebKit.[\\d\\.]*","Trident.[\\d\\.]*","Windows NT.[\\d\\.]*","Android [\\d\\.]*","Macintosh.","Ubuntu","Linux","[ ]Intel","Mac OS X [\\d_]*","(like )?Gecko(.[\\d\\.]*)?","KHTML,","CriOS.[\\d\\.]*","CPU iPhone OS ([0-9_])* like Mac OS X","CPU OS ([0-9_])* like Mac OS X","iPod","compatible","x86_..","i686","x64","X11","rv:[\\d\\.]*","Version.[\\d\\.]*","WOW64","Win64","Dalvik.[\\d\\.]*"," \\.NET CLR [\\d\\.]*","Presto.[\\d\\.]*","Media Center PC","BlackBerry","Build","Opera Mini\\\/\\d{1,2}\\.\\d{1,2}\\.[\\d\\.]*\\\/\\d{1,2}\\.","Opera"," \\.NET[\\d\\.]*","cubot","; M bot","; CRONO","; B bot","; IDbot","; ID bot","; POWER BOT",";"]
\ No newline at end of file
+["Safari.[\\d\\.]*","Firefox.[\\d\\.]*"," Chrome.[\\d\\.]*","Chromium.[\\d\\.]*","MSIE.[\\d\\.]","Opera\\\/[\\d\\.]*","Mozilla.[\\d\\.]*","AppleWebKit.[\\d\\.]*","Trident.[\\d\\.]*","Windows NT.[\\d\\.]*","Android [\\d\\.]*","Macintosh.","Ubuntu","Linux","[ ]Intel","Mac OS X [\\d_]*","(like )?Gecko(.[\\d\\.]*)?","KHTML,","CriOS.[\\d\\.]*","CPU iPhone OS ([0-9_])* like Mac OS X","CPU OS ([0-9_])* like Mac OS X","iPod","compatible","x86_..","i686","x64","X11","rv:[\\d\\.]*","Version.[\\d\\.]*","WOW64","Win64","Dalvik.[\\d\\.]*"," \\.NET CLR [\\d\\.]*","Presto.[\\d\\.]*","Media Center PC","BlackBerry","Build","Opera Mini\\\/\\d{1,2}\\.\\d{1,2}\\.[\\d\\.]*\\\/\\d{1,2}\\.","Opera"," \\.NET[\\d\\.]*","cubot","; M bot","; CRONO","; B bot","; IDbot","; ID bot","; POWER BOT","OCTOPUS-CORE","htc_botdugls","super\\\/\\d+\\\/Android\\\/\\d+"]
\ No newline at end of file
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/raw/Exclusions.txt b/blockbot/vendor/jaybizzle/crawler-detect/raw/Exclusions.txt
index da56db9b..a44a99cb 100644
--- a/blockbot/vendor/jaybizzle/crawler-detect/raw/Exclusions.txt
+++ b/blockbot/vendor/jaybizzle/crawler-detect/raw/Exclusions.txt
@@ -45,4 +45,6 @@ cubot
 ; IDbot
 ; ID bot
 ; POWER BOT
-;
\ No newline at end of file
+OCTOPUS-CORE
+htc_botdugls
+super\/\d+\/Android\/\d+
\ No newline at end of file
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/src/CrawlerDetect.php b/blockbot/vendor/jaybizzle/crawler-detect/src/CrawlerDetect.php
index 1067976b..3ea284a7 100644
--- a/blockbot/vendor/jaybizzle/crawler-detect/src/CrawlerDetect.php
+++ b/blockbot/vendor/jaybizzle/crawler-detect/src/CrawlerDetect.php
@@ -20,9 +20,9 @@ class CrawlerDetect
     /**
      * The user agent.
      *
-     * @var null
+     * @var string|null
      */
-    protected $userAgent = null;
+    protected $userAgent;
 
     /**
      * Headers that contain a user agent.
@@ -93,7 +93,7 @@ class CrawlerDetect
      * Compile the regex patterns into one regex string.
      *
      * @param array
-     * 
+     *
      * @return string
      */
     public function compileRegex($patterns)
@@ -138,7 +138,7 @@ class CrawlerDetect
     /**
      * Set the user agent.
      *
-     * @param string $userAgent
+     * @param string|null $userAgent
      */
     public function setUserAgent($userAgent)
     {
@@ -165,20 +165,14 @@ class CrawlerDetect
         $agent = trim(preg_replace(
             "/{$this->compiledExclusions}/i",
             '',
-            $userAgent ?: $this->userAgent
+            $userAgent ?: $this->userAgent ?: ''
         ));
 
-        if ($agent == '') {
+        if ($agent === '') {
             return false;
         }
 
-        $result = preg_match("/{$this->compiledRegex}/i", $agent, $matches);
-
-        if ($matches) {
-            $this->matches = $matches;
-        }
-
-        return (bool) $result;
+        return (bool) preg_match("/{$this->compiledRegex}/i", $agent, $this->matches);
     }
 
     /**
@@ -190,4 +184,13 @@ class CrawlerDetect
     {
         return isset($this->matches[0]) ? $this->matches[0] : null;
     }
+
+
+    /**
+     * @return string|null
+     */
+    public function getUserAgent()
+    {
+        return $this->userAgent;
+    }
 }
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/src/Fixtures/AbstractProvider.php b/blockbot/vendor/jaybizzle/crawler-detect/src/Fixtures/AbstractProvider.php
index 26ea8e5f..ffe10f51 100644
--- a/blockbot/vendor/jaybizzle/crawler-detect/src/Fixtures/AbstractProvider.php
+++ b/blockbot/vendor/jaybizzle/crawler-detect/src/Fixtures/AbstractProvider.php
@@ -15,14 +15,14 @@ abstract class AbstractProvider
 {
     /**
      * The data set.
-     * 
+     *
      * @var array
      */
     protected $data;
 
     /**
      * Return the data set.
-     * 
+     *
      * @return array
      */
     public function getAll()
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/src/Fixtures/Crawlers.php b/blockbot/vendor/jaybizzle/crawler-detect/src/Fixtures/Crawlers.php
index a9070565..a44edd23 100644
--- a/blockbot/vendor/jaybizzle/crawler-detect/src/Fixtures/Crawlers.php
+++ b/blockbot/vendor/jaybizzle/crawler-detect/src/Fixtures/Crawlers.php
@@ -19,30 +19,49 @@ class Crawlers extends AbstractProvider
      * @var array
      */
     protected $data = array(
-        '.*Java.*outbrain',
         ' YLT',
+        '^Aether',
+        '^Amazon Simple Notification Service Agent$',
+        '^Amazon-Route53-Health-Check-Service',
         '^b0t$',
         '^bluefish ',
         '^Calypso v\/',
         '^COMODO DCV',
+        '^Corax',
         '^DangDang',
         '^DavClnt',
+        '^DHSH',
+        '^docker\/[0-9]',
+        '^Expanse',
         '^FDM ',
         '^git\/',
         '^Goose\/',
         '^Grabber',
+        '^Gradle\/',
         '^HTTPClient\/',
+        '^HTTPing',
         '^Java\/',
         '^Jeode\/',
         '^Jetty\/',
         '^Mail\/',
         '^Mget',
         '^Microsoft URL Control',
+        '^Mikrotik\/',
+        '^Netlab360',
         '^NG\/[0-9\.]',
         '^NING\/',
-        '^PHP\/[0-9]',
+        '^npm\/',
+        '^Nuclei',
+        '^PHP-AYMAPI\/',
+        '^PHP\/',
+        '^pip\/',
+        '^pnpm\/',
         '^RMA\/',
         '^Ruby|Ruby\/[0-9]',
+        '^Swurl ',
+        '^TLS tester ',
+        '^twine\/',
+        '^ureq',
         '^VSE\/[0-9]',
         '^WordPress\.com',
         '^XRL\/[0-9]',
@@ -50,17 +69,18 @@ class Crawlers extends AbstractProvider
         '008\/',
         '13TABS',
         '192\.comAgent',
+        '2GDPR\/',
         '2ip\.ru',
         '404enemy',
         '7Siters',
         '80legs',
-        'a\.pr-cy\.ru',
         'a3logics\.in',
         'A6-Indexer',
         'Abonti',
         'Aboundex',
         'aboutthedomain',
         'Accoona-AI-Agent',
+        'acebookexternalhit\/',
         'acoon',
         'acrylicapps\.com\/pulp',
         'Acunetix',
@@ -70,8 +90,14 @@ class Crawlers extends AbstractProvider
         'ADmantX',
         'AdminLabs',
         'adressendeutschland',
+        'adreview\/',
         'adscanner',
+        'adstxt-worker',
         'Adstxtaggregator',
+        'adstxt\.com',
+        'Adyen HttpClient',
+        'AffiliateLabz\/',
+        'affilimate-puppeteer',
         'agentslug',
         'AHC',
         'aihit',
@@ -92,20 +118,23 @@ class Crawlers extends AbstractProvider
         'Anemone',
         'AngleSharp',
         'annotate_google',
-        'Ant\.com',
+        'Anthill',
         'Anturis Agent',
+        'Ant\.com',
         'AnyEvent-HTTP\/',
+        'Apache Ant\/',
         'Apache Droid',
         'Apache OpenOffice',
         'Apache-HttpAsyncClient',
         'Apache-HttpClient',
         'ApacheBench',
         'Apexoo',
+        'apimon\.de',
         'APIs-Google',
         'AportWorm\/',
         'AppBeat\/',
         'AppEngine-Google',
-        'AppStoreScraperZ',
+        'AppleSyndication',
         'Aprc\/[0-9]',
         'Arachmo',
         'arachnode',
@@ -113,21 +142,28 @@ class Crawlers extends AbstractProvider
         'aria2',
         'Arukereso',
         'asafaweb',
-        'AskQuickly',
+        'Asana\/',
         'Ask Jeeves',
+        'AskQuickly',
         'ASPSeek',
         'Asterias',
         'Astute',
         'asynchttp',
         'Attach',
+        'attohttpc',
         'autocite',
+        'AutomaticWPTester',
         'Autonomy',
+        'awin\.com',
+        'AWS Security Scanner',
         'axios\/',
+        'a\.pr-cy\.ru',
         'B-l-i-t-z-B-O-T',
         'Backlink-Ceck',
         'backlink-check',
         'BacklinkHttpStatus',
         'BackStreet',
+        'BackupLand',
         'BackWeb',
         'Bad-Neighborhood',
         'Badass',
@@ -142,6 +178,7 @@ class Crawlers extends AbstractProvider
         'BCKLINKS',
         'BDFetch',
         'BegunAdvertising',
+        'Bewica-security-scan',
         'Bidtellect',
         'BigBozz',
         'Bigfoot',
@@ -151,11 +188,14 @@ class Crawlers extends AbstractProvider
         'binlar',
         'biNu image cacher',
         'Bitacle',
+        'Bitrix link preview',
         'biz_Directory',
+        'BKCTwitterUnshortener\/',
         'Black Hole',
         'Blackboard Safeassign',
         'BlackWidow',
         'BlockNote\.Net',
+        'BlogBridge',
         'Bloglines',
         'Bloglovin',
         'BlogPulseLive',
@@ -163,6 +203,7 @@ class Crawlers extends AbstractProvider
         'Blogtrottr',
         'BlowFish',
         'boitho\.com-dc',
+        'Boost\.Beast',
         'BPImageWalker',
         'Braintree-Webhooks',
         'Branch Metrics API',
@@ -190,12 +231,15 @@ class Crawlers extends AbstractProvider
         'CC Metadata Scaper',
         'Cegbfeieh',
         'censys',
+        'centuryb.o.t9[at]gmail.com',
         'Cerberian Drtrs',
         'CERT\.at-Statistics-Survey',
+        'cf-facebook',
         'cg-eye',
         'changedetection',
         'ChangesMeter',
         'Charlotte',
+        'chatterino-api-cache',
         'CheckHost',
         'checkprivacy',
         'CherryPicker',
@@ -206,6 +250,7 @@ class Crawlers extends AbstractProvider
         'Chromaxa',
         'CirrusExplorer',
         'CISPA Vulnerability Notification',
+        'CISPA Web Analyser',
         'Citoid',
         'CJNetworkQuality',
         'Clarsentia',
@@ -213,27 +258,34 @@ class Crawlers extends AbstractProvider
         'Cloud mapping',
         'CloudEndure',
         'CloudFlare-AlwaysOnline',
+        'Cloudflare-Healthchecks',
         'Cloudinary',
         'cmcm\.com',
         'coccoc',
         'cognitiveseo',
+        'ColdFusion',
         'colly -',
         'CommaFeed',
         'Commons-HttpClient',
         'commonscan',
         'contactbigdatafr',
         'contentkingapp',
+        'Contextual Code Sites Explorer',
         'convera',
         'CookieReports',
         'copyright sheriff',
         'CopyRightCheck',
         'Copyscape',
+        'cortex\/',
         'Cosmos4j\.feedback',
         'Covario-IDS',
+        'Craw\/',
         'Crescent',
-        'Crowsnest',
         'Criteo',
+        'Crowsnest',
         'CSHttp',
+        'CSSCheck',
+        'Cula\/',
         'curb',
         'Curious George',
         'curl',
@@ -243,12 +295,17 @@ class Crawlers extends AbstractProvider
         'DareBoost',
         'DatabaseDriverMysqli',
         'DataCha0s',
+        'DatadogSynthetics',
         'Datafeedwatch',
         'Datanyze',
         'DataparkSearch',
         'dataprovider',
         'DataXu',
         'Daum(oa)?[ \/][0-9]',
+        'dBpoweramp',
+        'ddline',
+        'deeris',
+        'delve\.ai',
         'Demon',
         'DeuSu',
         'developers\.google\.com\/\+\/web\/snippet\/',
@@ -258,8 +315,8 @@ class Crawlers extends AbstractProvider
         'DigitalPebble',
         'Dirbuster',
         'Discourse Forum Onebox',
-        'Disqus\/',
         'Dispatch\/',
+        'Disqus\/',
         'DittoSpyder',
         'dlvr',
         'DMBrowser',
@@ -267,6 +324,8 @@ class Crawlers extends AbstractProvider
         'docoloc',
         'Dolphin http client',
         'DomainAppender',
+        'DomainLabz',
+        'Domains Project\/',
         'Donuts Content Explorer',
         'dotMailer content retrieval',
         'dotSemantic',
@@ -279,6 +338,8 @@ class Crawlers extends AbstractProvider
         'Drupal \(\+http:\/\/drupal\.org\/\)',
         'DTS Agent',
         'dubaiindex',
+        'DuplexWeb-Google',
+        'DynatraceSynthetic',
         'EARTHCOM',
         'Easy-Thumb',
         'EasyDL',
@@ -309,20 +370,22 @@ class Crawlers extends AbstractProvider
         'ExaleadCloudview',
         'Excel\/',
         'exif',
+        'ExoRank',
         'Exploratodo',
         'Express WebPictures',
         'Extreme Picture Finder',
         'EyeNetIE',
         'ezooms',
         'facebookexternalhit',
+        'facebookexternalua',
         'facebookplatform',
         'fairshare',
         'Faraday v',
         'fasthttp',
         'Faveeo',
         'Favicon downloader',
-        'faviconkit',
         'faviconarchive',
+        'faviconkit',
         'FavOrg',
         'Feed Wrangler',
         'Feedable\/',
@@ -334,7 +397,9 @@ class Crawlers extends AbstractProvider
         'feeder',
         'Feedly',
         'FeedshowOnline',
+        'Feedshow\/',
         'Feedspot',
+        'FeedViewer\/',
         'Feedwind\/',
         'FeedZcollector',
         'feeltiptop',
@@ -342,6 +407,8 @@ class Crawlers extends AbstractProvider
         'Fetch\/[0-9]',
         'Fever\/[0-9]',
         'FHscan',
+        'Fiery%20Feeds',
+        'Filestack',
         'Fimap',
         'findlink',
         'findthatfile',
@@ -350,18 +417,24 @@ class Crawlers extends AbstractProvider
         'FlipboardProxy',
         'FlipboardRSS',
         'Flock\/',
+        'Florienzh\/',
         'fluffy',
         'Flunky',
         'flynxapp',
         'forensiq',
+        'ForusP',
         'FoundSeoTool',
-        'http:\/\/www.neomo.de\/', //'Francis [Bot]'
+        'fragFINN\.de',
         'free thumbnails',
         'Freeuploader',
+        'FreshRSS',
+        'frontman',
         'Funnelback',
+        'Fuzz Faster U Fool',
         'G-i-g-a-b-o-t',
         'g00g1e\.net',
         'ganarvisitas',
+        'gdnplus\.com',
         'geek-tools',
         'Genieo',
         'GentleSource',
@@ -373,18 +446,24 @@ class Crawlers extends AbstractProvider
         'getroot',
         'GetURLInfo\/',
         'GetWeb',
+        'Geziyor',
         'Ghost Inspector',
         'GigablastOpenSource',
         'GIS-LABS',
         'github-camo',
+        'GitHub-Hookshot',
         'github\.com',
-        'Go [\d\.]* package http',
         'Go http package',
+        'Go [\d\.]* package http',
+        'Go!Zilla',
         'Go-Ahead-Got-It',
         'Go-http-client',
-        'Go!Zilla',
+        'go-mtasts\/',
+        'gobuster',
         'gobyus',
+        'Gofeed',
         'gofetch',
+        'Goldfire Server',
         'GomezAgent',
         'gooblog',
         'Goodzer\/',
@@ -397,24 +476,31 @@ class Crawlers extends AbstractProvider
         'Google PP Default',
         'Google Search Console',
         'Google Web Preview',
+        'Google-Ads-Creatives-Assistant',
+        'Google-Ads-Overview',
         'Google-Adwords',
         'Google-Apps-Script',
         'Google-Calendar-Importer',
         'Google-HotelAdsVerifier',
         'Google-HTTP-Java-Client',
+        'Google-InspectionTool',
+        'Google-Podcast',
         'Google-Publisher-Plugin',
+        'Google-Read-Aloud',
         'Google-SearchByImage',
         'Google-Site-Verification',
+        'Google-SMTP-STS',
+        'Google-speakr',
         'Google-Structured-Data-Testing-Tool',
-        'Google-Youtube-Links',
+        'Google-Transparency-Report',
         'google-xrawler',
+        'Google-Youtube-Links',
         'GoogleDocs',
         'GoogleHC\/',
+        'GoogleProber',
         'GoogleProducer',
         'GoogleSites',
-        'Google-Transparency-Report',
         'Gookey',
-        'GoScraper',
         'GoSpotCheck',
         'gosquared-thumbnailer',
         'Gotit',
@@ -440,13 +526,16 @@ class Crawlers extends AbstractProvider
         'hackney\/',
         'Hadi Agent',
         'HappyApps-WebCheck',
+        'Hardenize',
         'Hatena',
         'Havij',
+        'HaxerMen',
         'HeadlessChrome',
         'HEADMasterSEO',
         'HeartRails_Capture',
         'help@dataminr\.com',
         'heritrix',
+        'Hexometer',
         'historious',
         'hkedcity',
         'hledejLevne\.cz',
@@ -463,28 +552,31 @@ class Crawlers extends AbstractProvider
         'HTMLparser',
         'htmlyse',
         'HTTP Banner Detection',
-        'HTTP_Compression_Test',
-        'http_request2',
-        'http_requester',
         'http-get',
         'HTTP-Header-Abfrage',
         'http-kit',
         'http-request\/',
         'HTTP-Tiny',
         'HTTP::Lite',
-        'http\.rb\/',
-        'http_get',
+        'http:\/\/www.neomo.de\/', //'Francis [Bot]'
         'HttpComponents',
         'httphr',
+        'HTTPie',
         'HTTPMon',
         'httpRequest',
         'httpscheck',
         'httpssites_power',
         'httpunit',
         'HttpUrlConnection',
+        'http\.rb\/',
+        'HTTP_Compression_Test',
+        'http_get',
+        'http_request2',
+        'http_requester',
         'httrack',
         'huaweisymantec',
         'HubSpot ',
+        'HubSpot-Link-Resolver',
         'Humanlinks',
         'i2kconnect\/',
         'Iblog',
@@ -495,6 +587,7 @@ class Crawlers extends AbstractProvider
         'IDwhois\/',
         'Iframely',
         'igdeSpyder',
+        'iGooglePortal',
         'IlTrovatore',
         'Image Fetch',
         'Image Sucker',
@@ -519,13 +612,15 @@ class Crawlers extends AbstractProvider
         'integromedb',
         'Intelliseek',
         'InterGET',
-        'internet_archive',
         'Internet Ninja',
         'InternetSeer',
         'internetVista monitor',
+        'internetwache',
+        'internet_archive',
         'intraVnews',
         'IODC',
         'IOI',
+        'Inboxb0t',
         'iplabel',
         'ips-agent',
         'IPS\/[0-9]',
@@ -537,10 +632,13 @@ class Crawlers extends AbstractProvider
         'iskanie',
         'isUp\.li',
         'iThemes Sync\/',
+        'IZaBEE',
         'iZSearch',
         'JAHHO',
         'janforman',
         'Jaunt\/',
+        'Java.*outbrain',
+        'javelin\.io',
         'Jbrofuzz',
         'Jersey\/',
         'JetCar',
@@ -556,6 +654,7 @@ class Crawlers extends AbstractProvider
         'Joomla',
         'Jorgee',
         'JS-Kit',
+        'JungleKeyThumbnail',
         'JustView',
         'Kaspersky Lab CFR link resolver',
         'Kelny\/',
@@ -563,6 +662,7 @@ class Crawlers extends AbstractProvider
         'KeyCDN',
         'Keyword Density',
         'Keywords Research',
+        'khttp\/',
         'KickFire',
         'KimonoLabs\/',
         'Kml-Google',
@@ -570,11 +670,12 @@ class Crawlers extends AbstractProvider
         'KOCMOHABT',
         'kouio',
         'kube-probe',
+        'kubectl',
         'kulturarw3',
         'KumKie',
-        'L\.webis',
         'Larbin',
         'Lavf\/',
+        'leakix\.net',
         'LeechFTP',
         'LeechGet',
         'letsencrypt',
@@ -585,41 +686,50 @@ class Crawlers extends AbstractProvider
         'libwww',
         'Licorne',
         'Liferea\/',
-        'Lightspeedsystems',
         'Lighthouse',
+        'Lightspeedsystems',
         'Likse',
+        'limber\.io',
         'Link Valet',
-        'link_thumbnailer',
         'LinkAlarm\/',
+        'LinkAnalyser',
         'linkCheck',
         'linkdex',
         'LinkExaminer',
         'linkfluence',
         'linkpeek',
-        'LinkPreviewGenerator',
+        'LinkPreview',
         'LinkScan',
         'LinksManager',
         'LinkTiger',
         'LinkWalker',
+        'link_thumbnailer',
         'Lipperhey',
         'Litemage_walker',
         'livedoor ScreenShot',
         'LoadImpactRload',
         'localsearch-web',
         'LongURL API',
+        'longurl-r-package',
+        'looid\.com',
         'looksystems\.net',
         'ltx71',
         'lua-resty-http',
+        'Lucee \(CFML Engine\)',
+        'Lush Http Client',
         'lwp-request',
         'lwp-trivial',
         'LWP::Simple',
         'lycos',
         'LYT\.SR',
+        'L\.webis',
         'mabontland',
+        'MacOutlook\/',
         'Mag-Net',
         'MagpieRSS',
-        'Mail\.Ru',
+        'Mail::STS',
         'MailChimp',
+        'Mail\.Ru',
         'Majestic12',
         'makecontact\/',
         'Mandrill',
@@ -630,6 +740,8 @@ class Crawlers extends AbstractProvider
         'Mass Downloader',
         'masscan\/',
         'Mata Hari',
+        'mattermost',
+        'Mediametric',
         'Mediapartners-Google',
         'mediawords',
         'MegaIndex\.ru',
@@ -640,28 +752,31 @@ class Crawlers extends AbstractProvider
         'MetaURI',
         'MFC_Tear_Sample',
         'Microsearch',
-        'Microsoft Office ',
+        'Microsoft Data Access',
+        'Microsoft Office',
         'Microsoft Outlook',
         'Microsoft Windows Network Diagnostics',
         'Microsoft-WebDAV-MiniRedir',
-        'Microsoft Data Access',
+        'Microsoft\.Data\.Mashup',
         'MIDown tool',
         'MIIxpc',
         'Mindjet',
         'Miniature\.io',
         'Miniflux',
+        'mio_httpc',
+        'Miro-HttpClient',
         'Mister PiX',
         'mixdata dot com',
         'mixed-content-scan',
-        'Mixmax-LinkPreview',
         'mixnode',
         'Mnogosearch',
         'mogimogi',
         'Mojeek',
         'Mojolicious \(Perl\)',
-        'Monit\/',
+        'Mollie',
         'monitis',
         'Monitority\/',
+        'Monit\/',
         'montastic',
         'MonTools',
         'Moreover',
@@ -670,6 +785,7 @@ class Crawlers extends AbstractProvider
         'MovableType',
         'mowser',
         'Mrcgiguy',
+        'Mr\.4x3 Powered',
         'MS Web Services Client Protocol',
         'MSFrontPage',
         'mShots',
@@ -677,10 +793,13 @@ class Crawlers extends AbstractProvider
         'muhstik-scan',
         'MVAClient',
         'MxToolbox\/',
+        'myseosnapshot',
         'nagios',
         'Najdi\.si',
         'Name Intelligence',
+        'NameFo\.com',
         'Nameprotect',
+        'nationalarchives',
         'Navroad',
         'NearSite',
         'Needle',
@@ -695,6 +814,8 @@ class Crawlers extends AbstractProvider
         'netresearch',
         'NetShelter ContentScan',
         'Netsparker',
+        'NetSystemsResearch',
+        'nettle',
         'NetTrack',
         'Netvibes',
         'NetZIP',
@@ -707,22 +828,26 @@ class Crawlers extends AbstractProvider
         'newspaper\/',
         'Nexgate Ruby Client',
         'NG-Search',
+        'nghttp2',
         'Nibbler',
         'NICErsPRO',
+        'NihilScio',
         'Nikto',
         'nineconnections',
         'NLNZ_IAHarvester',
         'Nmap Scripting Engine',
+        'node-fetch',
         'node-superagent',
         'node-urllib',
-        'node\.io',
         'Nodemeter',
         'NodePing',
+        'node\.io',
         'nominet\.org\.uk',
         'nominet\.uk',
         'Norton-Safeweb',
         'Notifixious',
         'notifyninja',
+        'NotionEmbedder',
         'nuhk',
         'nutch',
         'Nuzzel',
@@ -730,39 +855,45 @@ class Crawlers extends AbstractProvider
         'nyawc\/',
         'Nymesis',
         'NYU',
+        'Observatory\/',
         'Ocelli\/',
         'Octopus',
         'oegp',
         'Offline Explorer',
         'Offline Navigator',
-        'og-scraper',
+        'OgScrper',
         'okhttp',
         'omgili',
         'OMSC',
         'Online Domain Tools',
+        'Open Source RSS',
         'OpenCalaisSemanticProxy',
         'Openfind',
         'OpenLinkProfiler',
         'Openstat\/',
         'OpenVAS',
+        'OPPO A33',
         'Optimizer',
         'Orbiter',
         'OrgProbe\/',
         'orion-semantics',
         'Outlook-Express',
         'Outlook-iOS',
-        'ow\.ly',
         'Owler',
+        'Owlin',
         'ownCloud News',
+        'ow\.ly',
         'OxfordCloudService',
-        'Page Valet',
-        'page_verifier',
         'page scorer',
+        'Page Valet',
         'page2rss',
+        'PageFreezer',
         'PageGrabber',
         'PagePeeker',
         'PageScorer',
         'Pagespeed\/',
+        'PageThing',
+        'page_verifier',
         'Panopta',
         'panscient',
         'Papa Foto',
@@ -771,6 +902,7 @@ class Crawlers extends AbstractProvider
         'PayPal IPN',
         'pcBrowser',
         'Pcore-HTTP',
+        'PDF24 URL To PDF',
         'Pearltrees',
         'PECL::HTTP',
         'peerindex',
@@ -780,44 +912,52 @@ class Crawlers extends AbstractProvider
         'PhantomJS Screenshoter',
         'PhantomJS\/',
         'Photon\/',
+        'php-requests',
         'phpservermon',
         'Pi-Monster',
         'Picscout',
         'Picsearch',
         'PictureFinder',
         'Pimonster',
-        'ping\.blo\.gs',
         'Pingability',
         'PingAdmin\.Ru',
         'Pingdom',
         'Pingoscope',
         'PingSpot',
+        'ping\.blo\.gs',
         'pinterest\.com',
         'Pixray',
         'Pizilla',
         'Plagger\/',
+        'Pleroma ',
         'Ploetz \+ Zeller',
         'Plukkie',
         'plumanalytics',
         'PocketImageCache',
         'PocketParser',
         'Pockey',
+        'PodcastAddict\/',
         'POE-Component-Client-HTTP',
         'Polymail\/',
         'Pompos',
         'Porkbun',
         'Port Monitor',
         'postano',
+        'postfix-mta-sts-resolver',
         'PostmanRuntime',
+        'postplanner\.com',
         'PostPost',
         'postrank',
         'PowerPoint\/',
+        'Prebid',
+        'Prerender',
         'Priceonomics Analysis Engine',
         'PrintFriendly',
         'PritTorrent',
         'Prlog',
         'probethenet',
-        'Project 25499',
+        'Project ?25499',
+        'Project-Resonance',
         'prospectb2b',
         'Protopage',
         'ProWebWalker',
@@ -826,9 +966,9 @@ class Crawlers extends AbstractProvider
         'pshtt, https scanning',
         'PTST ',
         'PTST\/[0-9]+',
-        'Pulsepoint XT3 web scraper',
         'Pump',
         'Python-httplib2',
+        'python-httpx',
         'python-requests',
         'Python-urllib',
         'Qirina Hurdler',
@@ -838,12 +978,17 @@ class Crawlers extends AbstractProvider
         'Qualidator',
         'QueryN Metasearch',
         'queuedriver',
+        'quic-go-HTTP\/',
+        'QuiteRSS',
         'Quora Link Preview',
         'Qwantify',
         'Radian6',
+        'RadioPublicImageResizer',
+        'Railgun\/',
         'RankActive',
         'RankFlex',
         'RankSonicSiteAuditor',
+        'RapidLoad\/',
         'Re-re Studio',
         'ReactorNetty',
         'Readability',
@@ -854,6 +999,7 @@ class Crawlers extends AbstractProvider
         'RecurPost\/',
         'redback\/',
         'ReederForMac',
+        'Reeder\/',
         'ReGet',
         'RepoMonkey',
         'request\.js',
@@ -866,38 +1012,44 @@ class Crawlers extends AbstractProvider
         'Robozilla',
         'ROI Hunter',
         'RPT-HTTPClient',
+        'RSSMix\/',
         'RSSOwl',
+        'RyowlEngine',
         'safe-agent-scanner',
         'SalesIntelligent',
         'Saleslift',
-        'Sendsay\.Ru',
+        'SAP NetWeaver Application Server',
         'SauceNAO',
         'SBIder',
+        'sc-downloader',
         'scalaj-http',
-        'scan\.lol',
+        'Scamadviser-Frontend',
         'ScanAlert',
+        'scan\.lol',
         'Scoop',
         'scooter',
+        'ScopeContentAG-HTTP-Client',
         'ScoutJet',
         'ScoutURLMonitor',
         'ScrapeBox Page Scanner',
-        'SimpleScraper',
         'Scrapy',
         'Screaming',
         'ScreenShotService',
         'Scrubby',
         'Scrutiny\/',
-        'search\.thunderstone',
         'Search37',
         'searchenginepromotionhelp',
         'Searchestate',
         'SearchExpress',
         'SearchSight',
+        'SearchWP',
+        'search\.thunderstone',
         'Seeker',
         'semanticdiscovery',
         'semanticjuice',
         'Semiocast HTTP client',
         'Semrush',
+        'Sendsay\.Ru',
         'sentry\/',
         'SEO Browser',
         'Seo Servis',
@@ -906,11 +1058,13 @@ class Crawlers extends AbstractProvider
         'Seobility',
         'SEOCentro',
         'SeoCheck',
+        'seocompany',
         'SEOkicks',
+        'SEOlizer',
         'Seomoz',
         'SEOprofiler',
-        'SEOsearch',
         'seoscanners',
+        'SEOsearch',
         'seositecheckup',
         'SEOstats',
         'servernfo',
@@ -921,14 +1075,16 @@ class Crawlers extends AbstractProvider
         'Shoppimon',
         'ShopWiki',
         'ShortLinkTranslate',
+        'shortURL lengthener',
         'shrinktheweb',
         'Sideqik',
+        'Siege',
         'SimplePie',
         'SimplyFast',
         'Siphon',
         'SISTRIX',
-        'Site-Shot\/',
         'Site Sucker',
+        'Site-Shot\/',
         'Site24x7',
         'SiteBar',
         'Sitebeam',
@@ -949,6 +1105,7 @@ class Crawlers extends AbstractProvider
         'sitexy\.com',
         'SkypeUriPreview',
         'Slack\/',
+        'sli-systems\.com',
         'slider\.com',
         'slurp',
         'SlySearch',
@@ -971,9 +1128,11 @@ class Crawlers extends AbstractProvider
         'SpamExperts',
         'Spammen',
         'Spanner',
+        'Spawning-AI',
         'spaziodati',
         'SPDYCheck',
         'Specificfeeds',
+        'SpeedKit',
         'speedy',
         'SPEng',
         'Spinn3r',
@@ -987,9 +1146,11 @@ class Crawlers extends AbstractProvider
         'ssl-tools',
         'StackRambler',
         'Statastico\/',
+        'Statically-',
         'StatusCake',
         'Steeler',
         'Stratagems Kumo',
+        'Stripe\/',
         'Stroke\.cz',
         'StudioFACA',
         'StumbleUpon',
@@ -999,9 +1160,11 @@ class Crawlers extends AbstractProvider
         'SuperHTTP',
         'Surphace Scout',
         'Suzuran',
-        'SwiteScraper',
+        'swcd ',
         'Symfony BrowserKit',
         'Symfony2 BrowserKit',
+        'Synapse\/',
+        'Syndirella\/',
         'SynHttpClient-Built',
         'Sysomos',
         'sysscan',
@@ -1011,6 +1174,8 @@ class Crawlers extends AbstractProvider
         'Tarantula\/',
         'Taringa UGC',
         'TarmotGezgin',
+        'tchelebi\.io',
+        'techiaith\.cymru',
         'Teleport',
         'Telesoft',
         'Telesphoreo',
@@ -1021,13 +1186,15 @@ class Crawlers extends AbstractProvider
         'Test Certificate Info',
         'testuri',
         'Tetrahedron',
+        'TextRazor Downloader',
         'The Drop Reaper',
         'The Expert HTML Source Viewer',
-        'The Knowledge AI',
         'The Intraformant',
+        'The Knowledge AI',
         'theinternetrules',
         'TheNomad',
         'Thinklab',
+        'Thumbor',
         'Thumbshots',
         'ThumbSniper',
         'timewe\.net',
@@ -1061,9 +1228,11 @@ class Crawlers extends AbstractProvider
         'ubermetrics-technologies',
         'uclassify',
         'UdmSearch',
+        'ultimate_sitemap_parser',
         'unchaos',
         'unirest-java',
         'UniversalFeedParser',
+        'unshortenit',
         'Unshorten\.It',
         'Untiny',
         'UnwindFetchor',
@@ -1071,8 +1240,8 @@ class Crawlers extends AbstractProvider
         'updown\.io daemon',
         'Upflow',
         'Uptimia',
-        'Urlcheckr',
         'URL Verifier',
+        'Urlcheckr',
         'URLitor',
         'urlresolver',
         'Urlstat',
@@ -1080,15 +1249,16 @@ class Crawlers extends AbstractProvider
         'UrlTrends Ranking Updater',
         'URLy Warning',
         'URLy\.Warning',
+        'URL\/Emacs',
         'Vacuum',
         'Vagabondo',
         'VB Project',
         'vBSEO',
         'VCI',
         'via ggpht\.com GoogleImageProxy',
-        'VidibleScraper',
         'Virusdie',
         'visionutils',
+        'Visual Rights Group',
         'vkShare',
         'VoidEYE',
         'Voil',
@@ -1099,19 +1269,18 @@ class Crawlers extends AbstractProvider
         'Vulnbusters Meter',
         'VYU2',
         'w3af\.org',
-        'W3C_Unicorn',
         'W3C-checklink',
         'W3C-mobileOK',
+        'W3C_Unicorn',
         'WAC-OFU',
-        'Wallpapers\/[0-9]+',
+        'WakeletLinkExpander',
         'WallpapersHD',
+        'Wallpapers\/[0-9]+',
         'wangling',
         'Wappalyzer',
         'WatchMouse',
         'WbSrch\/',
         'WDT\.io',
-        'web-capture\.net',
-        'Web-sniffer',
         'Web Auto',
         'Web Collage',
         'Web Enhancer',
@@ -1119,7 +1288,10 @@ class Crawlers extends AbstractProvider
         'Web Fuck',
         'Web Pix',
         'Web Sauger',
+        'Web spyder',
         'Web Sucker',
+        'web-capture\.net',
+        'Web-sniffer',
         'Webalta',
         'Webauskunft',
         'WebAuto',
@@ -1157,8 +1329,9 @@ class Crawlers extends AbstractProvider
         'Webster',
         'WebStripper',
         'WebSucker',
-        'Webthumb\/',
+        'webtech\/',
         'WebThumbnail',
+        'Webthumb\/',
         'WebWhacker',
         'WebZIP',
         'WeLikeLinks',
@@ -1167,24 +1340,31 @@ class Crawlers extends AbstractProvider
         'wf84',
         'Wfuzz\/',
         'wget',
+        'WhatCMS',
         'WhatsApp',
         'WhatsMyIP',
         'WhatWeb',
         'WhereGoes\?',
         'Whibse',
+        'WhoAPI\/',
         'WhoRunsCoinHive',
         'Whynder Magnet',
         'Windows-RSS-Platform',
+        'WinHttp-Autoproxy-Service',
+        'WinHTTP\/',
         'WinPodder',
         'wkhtmlto',
         'wmtips',
         'Woko',
+        'Wolfram HTTPClient',
         'woorankreview',
-        'Word\/',
         'WordPress\/',
         'WordupinfoSearch',
+        'Word\/',
+        'worldping-api',
         'wotbox',
         'WP Engine Install Performance API',
+        'WP Rocket',
         'wpif',
         'wprecon\.com survey',
         'WPScan',
@@ -1194,20 +1374,21 @@ class Crawlers extends AbstractProvider
         'WWW-Mechanize',
         'WWW::Document',
         'WWW::Mechanize',
-        'www\.monitor\.us',
         'WWWOFFLE',
+        'www\.monitor\.us',
         'x09Mozilla',
         'x22Mozilla',
         'XaxisSemanticsClassifier',
+        'XenForo\/',
         'Xenu Link Sleuth',
         'XING-contenttabreceiver',
         'xpymep([0-9]?)\.exe',
-        'Y!J-(ASR|BSC)',
-        'Y\!J-BRW',
+        'Y!J-[A-Z][A-Z][A-Z]',
         'Yaanb',
         'yacy',
         'Yahoo Link Preview',
         'YahooCacheSystem',
+        'YahooMailProxy',
         'YahooYSMcm',
         'YandeG',
         'Yandex(?!Search)',
@@ -1215,6 +1396,7 @@ class Crawlers extends AbstractProvider
         'yeti',
         'Yo-yo',
         'Yoleo Consumer',
+        'yomins\.com',
         'yoogliFetchAgent',
         'YottaaMonitor',
         'Your-Website-Sucks',
@@ -1226,15 +1408,17 @@ class Crawlers extends AbstractProvider
         'Zao',
         'Zauba',
         'Zemanta Aggregator',
-        'Zend_Http_Client',
         'Zend\\\\Http\\\\Client',
+        'Zend_Http_Client',
         'Zermelo',
         'Zeus ',
         'zgrab',
         'ZnajdzFoto',
+        'ZnHTTP',
         'Zombie\.js',
         'Zoom\.Mac',
+        'ZoteroTranslationServer',
         'ZyBorg',
-        '[a-z0-9\-_]*(bot|crawl|archiver|transcoder|spider|uptime|validator|fetcher|cron|checker|reader|extractor|monitoring|analyzer)',
+        '[a-z0-9\-_]*(bot|crawl|archiver|transcoder|spider|uptime|validator|fetcher|cron|checker|reader|extractor|monitoring|analyzer|scraper)',
     );
 }
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/src/Fixtures/Exclusions.php b/blockbot/vendor/jaybizzle/crawler-detect/src/Fixtures/Exclusions.php
index e6b3ca89..62745572 100644
--- a/blockbot/vendor/jaybizzle/crawler-detect/src/Fixtures/Exclusions.php
+++ b/blockbot/vendor/jaybizzle/crawler-detect/src/Fixtures/Exclusions.php
@@ -67,6 +67,8 @@ class Exclusions extends AbstractProvider
         '; IDbot',
         '; ID bot',
         '; POWER BOT',
-        ';', // Remove the following characters ;
+        'OCTOPUS-CORE',
+        'htc_botdugls',
+        'super\/\d+\/Android\/\d+',
     );
 }

From a020ac4309b9b2400b8abc5a262fbc6c6e2a344b Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Tue, 19 Mar 2024 22:46:48 -0400
Subject: [PATCH 062/294] [monolog] Update Composer dependencies ahead of
 release

- Updating monolog/monolog (2.9.1 => 2.9.2)
---
 monolog/composer.json                         |  45 +++----
 monolog/composer.lock                         |  15 ++-
 monolog/vendor/composer/autoload_classmap.php |  11 --
 monolog/vendor/composer/autoload_static.php   |  11 --
 monolog/vendor/composer/installed.json        |  12 +-
 monolog/vendor/monolog/monolog/CHANGELOG.md   |   6 +
 monolog/vendor/monolog/monolog/UPGRADE.md     |  72 +++++++++++
 .../monolog/src/Monolog/ErrorHandler.php      |   2 +-
 .../src/Monolog/Formatter/LineFormatter.php   |   2 +-
 .../Monolog/Formatter/NormalizerFormatter.php |   3 +
 .../src/Monolog/Handler/StreamHandler.php     |  11 +-
 .../Monolog/Handler/SwiftMailerHandler.php    | 115 ++++++++++++++++++
 12 files changed, 244 insertions(+), 61 deletions(-)
 create mode 100644 monolog/vendor/monolog/monolog/UPGRADE.md
 create mode 100644 monolog/vendor/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php

diff --git a/monolog/composer.json b/monolog/composer.json
index 7bcb4995..9cf42dbe 100644
--- a/monolog/composer.json
+++ b/monolog/composer.json
@@ -1,23 +1,26 @@
 {
-  "name": "friendica-addons/monolog",
-  "description": "Monolog can send your logs to files, sockets, inboxes, database, etc..",
-  "type": "friendica-addon",
-  "authors": [
-	{
-	  "name": "Philipp Holzer",
-	  "email": "admin@philipp.info",
-	  "homepage": "https://blog.philipp.info",
-	  "role": "Developer"
-	}
-  ],
-  "require": {
-    "php": ">=7.3",
-    "monolog/monolog": "^2.9"
-  },
-  "license": "3-clause BSD license",
-  "config": {
-	"optimize-autoloader": true,
-	"autoloader-suffix": "MonologAddon",
-	"preferred-install": "dist"
-  }
+    "name": "friendica-addons/monolog",
+    "description": "Monolog can send your logs to files, sockets, inboxes, database, etc..",
+    "type": "friendica-addon",
+    "authors": [
+        {
+            "name": "Philipp Holzer",
+            "email": "admin@philipp.info",
+            "homepage": "https://blog.philipp.info",
+            "role": "Developer"
+        }
+    ],
+    "require": {
+        "php": ">=7.3",
+        "monolog/monolog": "^2.9"
+    },
+    "license": "3-clause BSD license",
+    "config": {
+        "platform": {
+            "php": "7.4"
+        },
+        "optimize-autoloader": true,
+        "autoloader-suffix": "MonologAddon",
+        "preferred-install": "dist"
+    }
 }
diff --git a/monolog/composer.lock b/monolog/composer.lock
index f73b2ef0..5d1da32f 100644
--- a/monolog/composer.lock
+++ b/monolog/composer.lock
@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6fd294bd163b37ac6cc400e0f8785222",
+    "content-hash": "037f2db47e77c9af2960dde65ebafa8d",
     "packages": [
         {
             "name": "monolog/monolog",
-            "version": "2.9.1",
+            "version": "2.9.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1"
+                "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f259e2b15fb95494c83f52d3caad003bbf5ffaa1",
-                "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f",
+                "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f",
                 "shasum": ""
             },
             "require": {
@@ -102,7 +102,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-06T13:44:46+00:00"
+            "time": "2023-10-27T15:25:26+00:00"
         },
         {
             "name": "psr/log",
@@ -162,5 +162,8 @@
         "php": ">=7.3"
     },
     "platform-dev": [],
+    "platform-overrides": {
+        "php": "7.4"
+    },
     "plugin-api-version": "1.1.0"
 }
diff --git a/monolog/vendor/composer/autoload_classmap.php b/monolog/vendor/composer/autoload_classmap.php
index 3c89f22c..c12d7340 100644
--- a/monolog/vendor/composer/autoload_classmap.php
+++ b/monolog/vendor/composer/autoload_classmap.php
@@ -121,15 +121,4 @@ return array(
     'Monolog\\SignalHandler' => $vendorDir . '/monolog/monolog/src/Monolog/SignalHandler.php',
     'Monolog\\Test\\TestCase' => $vendorDir . '/monolog/monolog/src/Monolog/Test/TestCase.php',
     'Monolog\\Utils' => $vendorDir . '/monolog/monolog/src/Monolog/Utils.php',
-    'Psr\\Log\\AbstractLogger' => $vendorDir . '/psr/log/Psr/Log/AbstractLogger.php',
-    'Psr\\Log\\InvalidArgumentException' => $vendorDir . '/psr/log/Psr/Log/InvalidArgumentException.php',
-    'Psr\\Log\\LogLevel' => $vendorDir . '/psr/log/Psr/Log/LogLevel.php',
-    'Psr\\Log\\LoggerAwareInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareInterface.php',
-    'Psr\\Log\\LoggerAwareTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareTrait.php',
-    'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php',
-    'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php',
-    'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
-    'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/DummyTest.php',
-    'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
-    'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php',
 );
diff --git a/monolog/vendor/composer/autoload_static.php b/monolog/vendor/composer/autoload_static.php
index 95ed9e75..a44984ec 100644
--- a/monolog/vendor/composer/autoload_static.php
+++ b/monolog/vendor/composer/autoload_static.php
@@ -144,17 +144,6 @@ class ComposerStaticInitMonologAddon
         'Monolog\\SignalHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/SignalHandler.php',
         'Monolog\\Test\\TestCase' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Test/TestCase.php',
         'Monolog\\Utils' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Utils.php',
-        'Psr\\Log\\AbstractLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/AbstractLogger.php',
-        'Psr\\Log\\InvalidArgumentException' => __DIR__ . '/..' . '/psr/log/Psr/Log/InvalidArgumentException.php',
-        'Psr\\Log\\LogLevel' => __DIR__ . '/..' . '/psr/log/Psr/Log/LogLevel.php',
-        'Psr\\Log\\LoggerAwareInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerAwareInterface.php',
-        'Psr\\Log\\LoggerAwareTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerAwareTrait.php',
-        'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php',
-        'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php',
-        'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php',
-        'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/DummyTest.php',
-        'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
-        'Psr\\Log\\Test\\TestLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/TestLogger.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
diff --git a/monolog/vendor/composer/installed.json b/monolog/vendor/composer/installed.json
index ea2bb178..2b129417 100644
--- a/monolog/vendor/composer/installed.json
+++ b/monolog/vendor/composer/installed.json
@@ -1,17 +1,17 @@
 [
     {
         "name": "monolog/monolog",
-        "version": "2.9.1",
-        "version_normalized": "2.9.1.0",
+        "version": "2.9.2",
+        "version_normalized": "2.9.2.0",
         "source": {
             "type": "git",
             "url": "https://github.com/Seldaek/monolog.git",
-            "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1"
+            "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f259e2b15fb95494c83f52d3caad003bbf5ffaa1",
-            "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1",
+            "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f",
+            "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f",
             "shasum": ""
         },
         "require": {
@@ -57,7 +57,7 @@
             "rollbar/rollbar": "Allow sending log messages to Rollbar",
             "ruflin/elastica": "Allow sending log messages to an Elastic Search server"
         },
-        "time": "2023-02-06T13:44:46+00:00",
+        "time": "2023-10-27T15:25:26+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
diff --git a/monolog/vendor/monolog/monolog/CHANGELOG.md b/monolog/vendor/monolog/monolog/CHANGELOG.md
index 8a8c6512..aca1bdd0 100644
--- a/monolog/vendor/monolog/monolog/CHANGELOG.md
+++ b/monolog/vendor/monolog/monolog/CHANGELOG.md
@@ -1,3 +1,9 @@
+### 2.9.2 (2023-10-27)
+
+  * Fixed display_errors parsing in ErrorHandler which did not support string values (#1804)
+  * Fixed bug where the previous error handler would not be restored in some cases where StreamHandler fails (#1815)
+  * Fixed normalization error when normalizing incomplete classes (#1833)
+
 ### 2.9.1 (2023-02-06)
 
   * Fixed Logger not being serializable anymore (#1792)
diff --git a/monolog/vendor/monolog/monolog/UPGRADE.md b/monolog/vendor/monolog/monolog/UPGRADE.md
new file mode 100644
index 00000000..84e15e6b
--- /dev/null
+++ b/monolog/vendor/monolog/monolog/UPGRADE.md
@@ -0,0 +1,72 @@
+### 2.0.0
+
+- `Monolog\Logger::API` can be used to distinguish between a Monolog `1` and `2`
+  install of Monolog when writing integration code.
+
+- Removed non-PSR-3 methods to add records, all the `add*` (e.g. `addWarning`)
+  methods as well as `emerg`, `crit`, `err` and `warn`.
+
+- DateTime are now formatted with a timezone and microseconds (unless disabled).
+  Various formatters and log output might be affected, which may mess with log parsing
+  in some cases.
+
+- The `datetime` in every record array is now a DateTimeImmutable, not that you
+  should have been modifying these anyway.
+
+- The timezone is now set per Logger instance and not statically, either
+  via ->setTimezone or passed in the constructor. Calls to Logger::setTimezone
+  should be converted.
+
+- `HandlerInterface` has been split off and two new interfaces now exist for
+  more granular controls: `ProcessableHandlerInterface` and
+  `FormattableHandlerInterface`. Handlers not extending `AbstractHandler`
+  should make sure to implement the relevant interfaces.
+
+- `HandlerInterface` now requires the `close` method to be implemented. This
+  only impacts you if you implement the interface yourself, but you can extend
+  the new `Monolog\Handler\Handler` base class too.
+
+- There is no more default handler configured on empty Logger instances, if
+  you were relying on that you will not get any output anymore, make sure to
+  configure the handler you need.
+
+#### LogglyFormatter
+
+- The records' `datetime` is not sent anymore. Only `timestamp` is sent to Loggly.
+
+#### AmqpHandler
+
+- Log levels are not shortened to 4 characters anymore. e.g. a warning record
+  will be sent using the `warning.channel` routing key instead of `warn.channel`
+  as in 1.x.
+- The exchange name does not default to 'log' anymore, and it is completely ignored
+  now for the AMQP extension users. Only PHPAmqpLib uses it if provided.
+
+#### RotatingFileHandler
+
+- The file name format must now contain `{date}` and the date format must be set
+  to one of the predefined FILE_PER_* constants to avoid issues with file rotation.
+  See `setFilenameFormat`.
+
+#### LogstashFormatter
+
+- Removed Logstash V0 support
+- Context/extra prefix has been removed in favor of letting users configure the exact key being sent
+- Context/extra data are now sent as an object instead of single keys
+
+#### HipChatHandler
+
+- Removed deprecated HipChat handler, migrate to Slack and use SlackWebhookHandler or SlackHandler instead
+
+#### SlackbotHandler
+
+- Removed deprecated SlackbotHandler handler, use SlackWebhookHandler or SlackHandler instead
+
+#### RavenHandler
+
+- Removed deprecated RavenHandler handler, use sentry/sentry 2.x and their Sentry\Monolog\Handler instead
+
+#### ElasticSearchHandler
+
+- As support for the official Elasticsearch library was added, the former ElasticSearchHandler has been
+  renamed to ElasticaHandler and the new one added as ElasticsearchHandler.
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/ErrorHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/ErrorHandler.php
index 576f1713..1406d34e 100644
--- a/monolog/vendor/monolog/monolog/src/Monolog/ErrorHandler.php
+++ b/monolog/vendor/monolog/monolog/src/Monolog/ErrorHandler.php
@@ -198,7 +198,7 @@ class ErrorHandler
             ($this->previousExceptionHandler)($e);
         }
 
-        if (!headers_sent() && !ini_get('display_errors')) {
+        if (!headers_sent() && in_array(strtolower((string) ini_get('display_errors')), ['0', '', 'false', 'off', 'none', 'no'], true)) {
             http_response_code(500);
         }
 
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php b/monolog/vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php
index b31b2971..e6e78983 100644
--- a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php
+++ b/monolog/vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php
@@ -155,7 +155,7 @@ class LineFormatter extends NormalizerFormatter
             do {
                 $depth++;
                 if ($depth > $this->maxNormalizeDepth) {
-                    $str .= '\n[previous exception] Over ' . $this->maxNormalizeDepth . ' levels deep, aborting normalization';
+                    $str .= "\n[previous exception] Over " . $this->maxNormalizeDepth . ' levels deep, aborting normalization';
                     break;
                 }
 
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php b/monolog/vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
index 5441bc0a..f926a842 100644
--- a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
+++ b/monolog/vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
@@ -174,6 +174,9 @@ class NormalizerFormatter implements FormatterInterface
             if ($data instanceof \JsonSerializable) {
                 /** @var null|scalar|array<array|scalar|null> $value */
                 $value = $data->jsonSerialize();
+            } elseif (\get_class($data) === '__PHP_Incomplete_Class') {
+                $accessor = new \ArrayObject($data);
+                $value = (string) $accessor['__PHP_Incomplete_Class_Name'];
             } elseif (method_exists($data, '__toString')) {
                 /** @var string $value */
                 $value = $data->__toString();
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php
index 65183512..82c048e1 100644
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php
+++ b/monolog/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php
@@ -135,11 +135,14 @@ class StreamHandler extends AbstractProcessingHandler
             $this->createDir($url);
             $this->errorMessage = null;
             set_error_handler([$this, 'customErrorHandler']);
-            $stream = fopen($url, 'a');
-            if ($this->filePermission !== null) {
-                @chmod($url, $this->filePermission);
+            try {
+                $stream = fopen($url, 'a');
+                if ($this->filePermission !== null) {
+                    @chmod($url, $this->filePermission);
+                }
+            } finally {
+                restore_error_handler();
             }
-            restore_error_handler();
             if (!is_resource($stream)) {
                 $this->stream = null;
 
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php
new file mode 100644
index 00000000..fae92514
--- /dev/null
+++ b/monolog/vendor/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php
@@ -0,0 +1,115 @@
+<?php declare(strict_types=1);
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Logger;
+use Monolog\Utils;
+use Monolog\Formatter\FormatterInterface;
+use Monolog\Formatter\LineFormatter;
+use Swift_Message;
+use Swift;
+
+/**
+ * SwiftMailerHandler uses Swift_Mailer to send the emails
+ *
+ * @author Gyula Sallai
+ *
+ * @phpstan-import-type Record from \Monolog\Logger
+ * @deprecated Since Monolog 2.6. Use SymfonyMailerHandler instead.
+ */
+class SwiftMailerHandler extends MailHandler
+{
+    /** @var \Swift_Mailer */
+    protected $mailer;
+    /** @var Swift_Message|callable(string, Record[]): Swift_Message */
+    private $messageTemplate;
+
+    /**
+     * @psalm-param Swift_Message|callable(string, Record[]): Swift_Message $message
+     *
+     * @param \Swift_Mailer          $mailer  The mailer to use
+     * @param callable|Swift_Message $message An example message for real messages, only the body will be replaced
+     */
+    public function __construct(\Swift_Mailer $mailer, $message, $level = Logger::ERROR, bool $bubble = true)
+    {
+        parent::__construct($level, $bubble);
+
+        @trigger_error('The SwiftMailerHandler is deprecated since Monolog 2.6. Use SymfonyMailerHandler instead.', E_USER_DEPRECATED);
+
+        $this->mailer = $mailer;
+        $this->messageTemplate = $message;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function send(string $content, array $records): void
+    {
+        $this->mailer->send($this->buildMessage($content, $records));
+    }
+
+    /**
+     * Gets the formatter for the Swift_Message subject.
+     *
+     * @param string|null $format The format of the subject
+     */
+    protected function getSubjectFormatter(?string $format): FormatterInterface
+    {
+        return new LineFormatter($format);
+    }
+
+    /**
+     * Creates instance of Swift_Message to be sent
+     *
+     * @param  string        $content formatted email body to be sent
+     * @param  array         $records Log records that formed the content
+     * @return Swift_Message
+     *
+     * @phpstan-param Record[] $records
+     */
+    protected function buildMessage(string $content, array $records): Swift_Message
+    {
+        $message = null;
+        if ($this->messageTemplate instanceof Swift_Message) {
+            $message = clone $this->messageTemplate;
+            $message->generateId();
+        } elseif (is_callable($this->messageTemplate)) {
+            $message = ($this->messageTemplate)($content, $records);
+        }
+
+        if (!$message instanceof Swift_Message) {
+            $record = reset($records);
+            throw new \InvalidArgumentException('Could not resolve message as instance of Swift_Message or a callable returning it' . ($record ? Utils::getRecordMessageForException($record) : ''));
+        }
+
+        if ($records) {
+            $subjectFormatter = $this->getSubjectFormatter($message->getSubject());
+            $message->setSubject($subjectFormatter->format($this->getHighestRecord($records)));
+        }
+
+        $mime = 'text/plain';
+        if ($this->isHtmlBody($content)) {
+            $mime = 'text/html';
+        }
+
+        $message->setBody($content, $mime);
+        /** @phpstan-ignore-next-line */
+        if (version_compare(Swift::VERSION, '6.0.0', '>=')) {
+            $message->setDate(new \DateTimeImmutable());
+        } else {
+            /** @phpstan-ignore-next-line */
+            $message->setDate(time());
+        }
+
+        return $message;
+    }
+}

From c6b2ed96d780005dd978247ce3b1cdbc2c82fc41 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Tue, 19 Mar 2024 22:39:55 -0400
Subject: [PATCH 063/294] [phpmailer] Update Composer dependency ahead of
 release

- Updating phpmailer/phpmailer (v6.5.0 => v6.9.1)
---
 phpmailer/composer.json                       |  40 +-
 phpmailer/composer.lock                       |  33 +-
 .../vendor/composer/autoload_classmap.php     |   2 +
 phpmailer/vendor/composer/autoload_static.php |   2 +
 phpmailer/vendor/composer/installed.json      |  33 +-
 .../vendor/phpmailer/phpmailer/.editorconfig  |  15 +
 .../vendor/phpmailer/phpmailer/README.md      |  43 +-
 phpmailer/vendor/phpmailer/phpmailer/VERSION  |   2 +-
 .../vendor/phpmailer/phpmailer/composer.json  |  26 +-
 .../phpmailer/phpmailer/get_oauth_token.php   |  64 ++-
 .../phpmailer/language/phpmailer.lang-as.php  |  35 ++
 .../phpmailer/language/phpmailer.lang-bn.php  |  35 ++
 .../phpmailer/language/phpmailer.lang-ch.php  |  27 -
 .../phpmailer/language/phpmailer.lang-da.php  |  11 +-
 .../phpmailer/language/phpmailer.lang-el.php  |  41 +-
 .../phpmailer/language/phpmailer.lang-es.php  |   4 +
 .../phpmailer/language/phpmailer.lang-fi.php  |   1 -
 .../phpmailer/language/phpmailer.lang-fr.php  |  29 +-
 .../phpmailer/language/phpmailer.lang-hi.php  |  12 +-
 .../phpmailer/language/phpmailer.lang-ja.php  |  15 +-
 .../phpmailer/language/phpmailer.lang-mn.php  |  27 +
 .../phpmailer/language/phpmailer.lang-nb.php  |  45 +-
 .../phpmailer/language/phpmailer.lang-nl.php  |   7 +-
 .../phpmailer/language/phpmailer.lang-pl.php  |  22 +-
 .../language/phpmailer.lang-pt_br.php         |  10 +-
 .../phpmailer/language/phpmailer.lang-ro.php  |  10 +-
 .../phpmailer/language/phpmailer.lang-si.php  |  34 ++
 .../phpmailer/language/phpmailer.lang-sl.php  |   7 +-
 .../language/phpmailer.lang-zh_cn.php         |  11 +-
 .../phpmailer/phpmailer/phpunit.xml.dist      |  35 --
 .../phpmailer/src/DSNConfigurator.php         | 245 +++++++++
 .../phpmailer/phpmailer/src/Exception.php     |   2 +-
 .../vendor/phpmailer/phpmailer/src/OAuth.php  |   2 +-
 .../phpmailer/src/OAuthTokenProvider.php      |  44 ++
 .../phpmailer/phpmailer/src/PHPMailer.php     | 482 ++++++++++++++----
 .../vendor/phpmailer/phpmailer/src/POP3.php   |  23 +-
 .../vendor/phpmailer/phpmailer/src/SMTP.php   |  63 ++-
 37 files changed, 1197 insertions(+), 342 deletions(-)
 create mode 100644 phpmailer/vendor/phpmailer/phpmailer/.editorconfig
 create mode 100644 phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-as.php
 create mode 100644 phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-bn.php
 delete mode 100644 phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php
 create mode 100644 phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-mn.php
 create mode 100644 phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-si.php
 delete mode 100644 phpmailer/vendor/phpmailer/phpmailer/phpunit.xml.dist
 create mode 100644 phpmailer/vendor/phpmailer/phpmailer/src/DSNConfigurator.php
 create mode 100644 phpmailer/vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php

diff --git a/phpmailer/composer.json b/phpmailer/composer.json
index 5779773a..84d18543 100644
--- a/phpmailer/composer.json
+++ b/phpmailer/composer.json
@@ -1,22 +1,22 @@
 {
-  "name": "friendica-addons/phpmailer",
-  "description": "Replaces the default `mail()` function by the `PHPMailer` library",
-  "type": "friendica-addon",
-  "authors": [
-	{
-	  "name": "Marcus Mueller",
-	  "role": "Developer"
-	}
-  ],
-  "require": {
-	"php": ">=7.0",
-	"phpmailer/phpmailer": "^6.1"
-  },
-  "license": "3-clause BSD license",
-  "minimum-stability": "stable",
-  "config": {
-	"optimize-autoloader": true,
-	"autoloader-suffix": "PhpMailerAddon",
-	"preferred-install": "dist"
-  }
+    "name": "friendica-addons/phpmailer",
+    "description": "Replaces the default `mail()` function by the `PHPMailer` library",
+    "type": "friendica-addon",
+    "authors": [
+        {
+            "name": "Marcus Mueller",
+            "role": "Developer"
+        }
+    ],
+    "require": {
+        "php": ">=7.0",
+        "phpmailer/phpmailer": "^6.1"
+    },
+    "license": "3-clause BSD license",
+    "minimum-stability": "stable",
+    "config": {
+        "optimize-autoloader": true,
+        "autoloader-suffix": "PhpMailerAddon",
+        "preferred-install": "dist"
+    }
 }
diff --git a/phpmailer/composer.lock b/phpmailer/composer.lock
index b1f2a5d9..b2144482 100644
--- a/phpmailer/composer.lock
+++ b/phpmailer/composer.lock
@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "phpmailer/phpmailer",
-            "version": "v6.5.0",
+            "version": "v6.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPMailer/PHPMailer.git",
-                "reference": "a5b5c43e50b7fba655f793ad27303cd74c57363c"
+                "reference": "039de174cd9c17a8389754d3b877a2ed22743e18"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/a5b5c43e50b7fba655f793ad27303cd74c57363c",
-                "reference": "a5b5c43e50b7fba655f793ad27303cd74c57363c",
+                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/039de174cd9c17a8389754d3b877a2ed22743e18",
+                "reference": "039de174cd9c17a8389754d3b877a2ed22743e18",
                 "shasum": ""
             },
             "require": {
@@ -27,20 +27,25 @@
                 "php": ">=5.5.0"
             },
             "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-                "doctrine/annotations": "^1.2",
+                "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
+                "doctrine/annotations": "^1.2.6 || ^1.13.3",
+                "php-parallel-lint/php-console-highlighter": "^1.0.0",
+                "php-parallel-lint/php-parallel-lint": "^1.3.2",
                 "phpcompatibility/php-compatibility": "^9.3.5",
                 "roave/security-advisories": "dev-latest",
-                "squizlabs/php_codesniffer": "^3.5.6",
-                "yoast/phpunit-polyfills": "^0.2.0"
+                "squizlabs/php_codesniffer": "^3.7.2",
+                "yoast/phpunit-polyfills": "^1.0.4"
             },
             "suggest": {
+                "decomplexity/SendOauth2": "Adapter for using XOAUTH2 authentication",
                 "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses",
+                "ext-openssl": "Needed for secure SMTP sending and DKIM signing",
+                "greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication",
                 "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
                 "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
                 "psr/log": "For optional PSR-3 debug logging",
-                "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
-                "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
+                "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)",
+                "thenetworg/oauth2-azure": "Needed for Microsoft XOAUTH2 authentication"
             },
             "type": "library",
             "autoload": {
@@ -70,17 +75,13 @@
                 }
             ],
             "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
-            "support": {
-                "issues": "https://github.com/PHPMailer/PHPMailer/issues",
-                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.5.0"
-            },
             "funding": [
                 {
                     "url": "https://github.com/Synchro",
                     "type": "github"
                 }
             ],
-            "time": "2021-06-16T14:33:43+00:00"
+            "time": "2023-11-25T22:23:28+00:00"
         }
     ],
     "packages-dev": [],
@@ -93,5 +94,5 @@
         "php": ">=7.0"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "1.1.0"
 }
diff --git a/phpmailer/vendor/composer/autoload_classmap.php b/phpmailer/vendor/composer/autoload_classmap.php
index 6000382d..31c59aff 100644
--- a/phpmailer/vendor/composer/autoload_classmap.php
+++ b/phpmailer/vendor/composer/autoload_classmap.php
@@ -6,8 +6,10 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
+    'PHPMailer\\PHPMailer\\DSNConfigurator' => $vendorDir . '/phpmailer/phpmailer/src/DSNConfigurator.php',
     'PHPMailer\\PHPMailer\\Exception' => $vendorDir . '/phpmailer/phpmailer/src/Exception.php',
     'PHPMailer\\PHPMailer\\OAuth' => $vendorDir . '/phpmailer/phpmailer/src/OAuth.php',
+    'PHPMailer\\PHPMailer\\OAuthTokenProvider' => $vendorDir . '/phpmailer/phpmailer/src/OAuthTokenProvider.php',
     'PHPMailer\\PHPMailer\\PHPMailer' => $vendorDir . '/phpmailer/phpmailer/src/PHPMailer.php',
     'PHPMailer\\PHPMailer\\POP3' => $vendorDir . '/phpmailer/phpmailer/src/POP3.php',
     'PHPMailer\\PHPMailer\\SMTP' => $vendorDir . '/phpmailer/phpmailer/src/SMTP.php',
diff --git a/phpmailer/vendor/composer/autoload_static.php b/phpmailer/vendor/composer/autoload_static.php
index 20cd9684..d07c239a 100644
--- a/phpmailer/vendor/composer/autoload_static.php
+++ b/phpmailer/vendor/composer/autoload_static.php
@@ -21,8 +21,10 @@ class ComposerStaticInitPhpMailerAddon
     );
 
     public static $classMap = array (
+        'PHPMailer\\PHPMailer\\DSNConfigurator' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/DSNConfigurator.php',
         'PHPMailer\\PHPMailer\\Exception' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/Exception.php',
         'PHPMailer\\PHPMailer\\OAuth' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/OAuth.php',
+        'PHPMailer\\PHPMailer\\OAuthTokenProvider' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/OAuthTokenProvider.php',
         'PHPMailer\\PHPMailer\\PHPMailer' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/PHPMailer.php',
         'PHPMailer\\PHPMailer\\POP3' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/POP3.php',
         'PHPMailer\\PHPMailer\\SMTP' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/SMTP.php',
diff --git a/phpmailer/vendor/composer/installed.json b/phpmailer/vendor/composer/installed.json
index 20714abc..99511ee9 100644
--- a/phpmailer/vendor/composer/installed.json
+++ b/phpmailer/vendor/composer/installed.json
@@ -1,17 +1,17 @@
 [
     {
         "name": "phpmailer/phpmailer",
-        "version": "v6.5.0",
-        "version_normalized": "6.5.0.0",
+        "version": "v6.9.1",
+        "version_normalized": "6.9.1.0",
         "source": {
             "type": "git",
             "url": "https://github.com/PHPMailer/PHPMailer.git",
-            "reference": "a5b5c43e50b7fba655f793ad27303cd74c57363c"
+            "reference": "039de174cd9c17a8389754d3b877a2ed22743e18"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/a5b5c43e50b7fba655f793ad27303cd74c57363c",
-            "reference": "a5b5c43e50b7fba655f793ad27303cd74c57363c",
+            "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/039de174cd9c17a8389754d3b877a2ed22743e18",
+            "reference": "039de174cd9c17a8389754d3b877a2ed22743e18",
             "shasum": ""
         },
         "require": {
@@ -21,22 +21,27 @@
             "php": ">=5.5.0"
         },
         "require-dev": {
-            "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-            "doctrine/annotations": "^1.2",
+            "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
+            "doctrine/annotations": "^1.2.6 || ^1.13.3",
+            "php-parallel-lint/php-console-highlighter": "^1.0.0",
+            "php-parallel-lint/php-parallel-lint": "^1.3.2",
             "phpcompatibility/php-compatibility": "^9.3.5",
             "roave/security-advisories": "dev-latest",
-            "squizlabs/php_codesniffer": "^3.5.6",
-            "yoast/phpunit-polyfills": "^0.2.0"
+            "squizlabs/php_codesniffer": "^3.7.2",
+            "yoast/phpunit-polyfills": "^1.0.4"
         },
         "suggest": {
+            "decomplexity/SendOauth2": "Adapter for using XOAUTH2 authentication",
             "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses",
+            "ext-openssl": "Needed for secure SMTP sending and DKIM signing",
+            "greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication",
             "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
             "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
             "psr/log": "For optional PSR-3 debug logging",
-            "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
-            "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
+            "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)",
+            "thenetworg/oauth2-azure": "Needed for Microsoft XOAUTH2 authentication"
         },
-        "time": "2021-06-16T14:33:43+00:00",
+        "time": "2023-11-25T22:23:28+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -66,10 +71,6 @@
             }
         ],
         "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
-        "support": {
-            "issues": "https://github.com/PHPMailer/PHPMailer/issues",
-            "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.5.0"
-        },
         "funding": [
             {
                 "url": "https://github.com/Synchro",
diff --git a/phpmailer/vendor/phpmailer/phpmailer/.editorconfig b/phpmailer/vendor/phpmailer/phpmailer/.editorconfig
new file mode 100644
index 00000000..a7c44ddb
--- /dev/null
+++ b/phpmailer/vendor/phpmailer/phpmailer/.editorconfig
@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = space
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
+indent_size = 2
diff --git a/phpmailer/vendor/phpmailer/phpmailer/README.md b/phpmailer/vendor/phpmailer/phpmailer/README.md
index fa27d2f6..e3e4ecff 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/README.md
+++ b/phpmailer/vendor/phpmailer/phpmailer/README.md
@@ -1,14 +1,22 @@
+[![SWUbanner](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://supportukrainenow.org/)
+
 ![PHPMailer](https://raw.github.com/PHPMailer/PHPMailer/master/examples/images/phpmailer.png)
 
 # PHPMailer – A full-featured email creation and transfer class for PHP
 
-[![Test status](https://github.com/PHPMailer/PHPMailer/workflows/Tests/badge.svg)](https://github.com/PHPMailer/PHPMailer/actions) [![Latest Stable Version](https://poser.pugx.org/phpmailer/phpmailer/v/stable.svg)](https://packagist.org/packages/phpmailer/phpmailer) [![Total Downloads](https://poser.pugx.org/phpmailer/phpmailer/downloads)](https://packagist.org/packages/phpmailer/phpmailer) [![License](https://poser.pugx.org/phpmailer/phpmailer/license.svg)](https://packagist.org/packages/phpmailer/phpmailer) [![API Docs](https://github.com/phpmailer/phpmailer/workflows/Docs/badge.svg)](https://phpmailer.github.io/PHPMailer/)
+[![Test status](https://github.com/PHPMailer/PHPMailer/workflows/Tests/badge.svg)](https://github.com/PHPMailer/PHPMailer/actions)
+[![codecov.io](https://codecov.io/gh/PHPMailer/PHPMailer/branch/master/graph/badge.svg?token=iORZpwmYmM)](https://codecov.io/gh/PHPMailer/PHPMailer)
+[![Latest Stable Version](https://poser.pugx.org/phpmailer/phpmailer/v/stable.svg)](https://packagist.org/packages/phpmailer/phpmailer)
+[![Total Downloads](https://poser.pugx.org/phpmailer/phpmailer/downloads)](https://packagist.org/packages/phpmailer/phpmailer)
+[![License](https://poser.pugx.org/phpmailer/phpmailer/license.svg)](https://packagist.org/packages/phpmailer/phpmailer)
+[![API Docs](https://github.com/phpmailer/phpmailer/workflows/Docs/badge.svg)](https://phpmailer.github.io/PHPMailer/)
+[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/PHPMailer/PHPMailer/badge)](https://api.securityscorecards.dev/projects/github.com/PHPMailer/PHPMailer)
 
 ## Features
 - Probably the world's most popular code for sending email from PHP!
 - Used by many open-source projects: WordPress, Drupal, 1CRM, SugarCRM, Yii, Joomla! and many more
 - Integrated SMTP support – send without a local mail server
-- Send emails with multiple To, CC, BCC and Reply-to addresses
+- Send emails with multiple To, CC, BCC, and Reply-to addresses
 - Multipart/alternative emails for mail clients that do not read HTML email
 - Add attachments, including inline
 - Support for UTF-8 content and 8bit, base64, binary, and quoted-printable encodings
@@ -17,7 +25,7 @@
 - Protects against header injection attacks
 - Error messages in over 50 languages!
 - DKIM and S/MIME signing support
-- Compatible with PHP 5.5 and later, including PHP 8.0
+- Compatible with PHP 5.5 and later, including PHP 8.2
 - Namespaced to prevent name clashes
 - Much more!
 
@@ -30,7 +38,7 @@ The PHP `mail()` function usually sends via a local mail server, typically front
 
 *Please* don't be tempted to do it yourself – if you don't use PHPMailer, there are many other excellent libraries that
 you should look at before rolling your own. Try [SwiftMailer](https://swiftmailer.symfony.com/)
-, [Laminas/Mail](https://docs.laminas.dev/laminas-mail/), [ZetaComponents](https://github.com/zetacomponents/Mail) etc.
+, [Laminas/Mail](https://docs.laminas.dev/laminas-mail/), [ZetaComponents](https://github.com/zetacomponents/Mail), etc.
 
 ## License
 This software is distributed under the [LGPL 2.1](http://www.gnu.org/licenses/lgpl-2.1.html) license, along with the [GPL Cooperation Commitment](https://gplcc.github.io/gplcc/). Please read [LICENSE](https://github.com/PHPMailer/PHPMailer/blob/master/LICENSE) for information on the software availability and distribution.
@@ -39,7 +47,7 @@ This software is distributed under the [LGPL 2.1](http://www.gnu.org/licenses/lg
 PHPMailer is available on [Packagist](https://packagist.org/packages/phpmailer/phpmailer) (using semantic versioning), and installation via [Composer](https://getcomposer.org) is the recommended way to install PHPMailer. Just add this line to your `composer.json` file:
 
 ```json
-"phpmailer/phpmailer": "^6.2"
+"phpmailer/phpmailer": "^6.9.1"
 ```
 
 or run
@@ -50,7 +58,8 @@ composer require phpmailer/phpmailer
 
 Note that the `vendor` folder and the `vendor/autoload.php` script are generated by Composer; they are not part of PHPMailer.
 
-If you want to use the Gmail XOAUTH2 authentication class, you will also need to add a dependency on the `league/oauth2-client` package in your `composer.json`.
+If you want to use XOAUTH2 authentication, you will also need to add a dependency on the `league/oauth2-client` and appropriate service adapters package in your `composer.json`, or take a look at
+by @decomplexity's [SendOauth2 wrapper](https://github.com/decomplexity/SendOauth2), especially if you're using Microsoft services.
 
 Alternatively, if you're not using Composer, you
 can [download PHPMailer as a zip file](https://github.com/PHPMailer/PHPMailer/archive/master.zip), (note that docs and examples are not included in the zip file), then copy the contents of the PHPMailer folder into one of the `include_path` directories specified in your PHP configuration and load each class file manually:
@@ -89,7 +98,7 @@ use PHPMailer\PHPMailer\Exception;
 //Load Composer's autoloader
 require 'vendor/autoload.php';
 
-//Instantiation and passing `true` enables exceptions
+//Create an instance; passing `true` enables exceptions
 $mail = new PHPMailer(true);
 
 try {
@@ -100,8 +109,8 @@ try {
     $mail->SMTPAuth   = true;                                   //Enable SMTP authentication
     $mail->Username   = 'user@example.com';                     //SMTP username
     $mail->Password   = 'secret';                               //SMTP password
-    $mail->SMTPSecure = PHPMailer::ENCRYPTION_STARTTLS;         //Enable TLS encryption; `PHPMailer::ENCRYPTION_SMTPS` encouraged
-    $mail->Port       = 587;                                    //TCP port to connect to, use 465 for `PHPMailer::ENCRYPTION_SMTPS` above
+    $mail->SMTPSecure = PHPMailer::ENCRYPTION_SMTPS;            //Enable implicit TLS encryption
+    $mail->Port       = 465;                                    //TCP port to connect to; use 587 if you have set `SMTPSecure = PHPMailer::ENCRYPTION_STARTTLS`
 
     //Recipients
     $mail->setFrom('from@example.com', 'Mailer');
@@ -128,21 +137,21 @@ try {
 }
 ```
 
-You'll find plenty to play with in the [examples](https://github.com/PHPMailer/PHPMailer/tree/master/examples) folder, which covers many common scenarios including sending through gmail, building contact forms, sending to mailing lists, and more.
+You'll find plenty to play with in the [examples](https://github.com/PHPMailer/PHPMailer/tree/master/examples) folder, which covers many common scenarios including sending through Gmail, building contact forms, sending to mailing lists, and more.
 
 If you are re-using the instance (e.g. when sending to a mailing list), you may need to clear the recipient list to avoid sending duplicate messages. See [the mailing list example](https://github.com/PHPMailer/PHPMailer/blob/master/examples/mailing_list.phps) for further guidance.
 
 That's it. You should now be ready to use PHPMailer!
 
 ## Localization
-PHPMailer defaults to English, but in the [language](https://github.com/PHPMailer/PHPMailer/tree/master/language/) folder you'll find many translations for PHPMailer error messages that you may encounter. Their filenames contain [ISO 639-1](http://en.wikipedia.org/wiki/ISO_639-1) language code for the translations, for example `fr` for French. To specify a language, you need to tell PHPMailer which one to use, like this:
+PHPMailer defaults to English, but in the [language](https://github.com/PHPMailer/PHPMailer/tree/master/language/) folder, you'll find many translations for PHPMailer error messages that you may encounter. Their filenames contain [ISO 639-1](http://en.wikipedia.org/wiki/ISO_639-1) language code for the translations, for example `fr` for French. To specify a language, you need to tell PHPMailer which one to use, like this:
 
 ```php
 //To load the French version
 $mail->setLanguage('fr', '/optional/path/to/language/directory/');
 ```
 
-We welcome corrections and new languages – if you're looking for corrections, run the [PHPMailerLangTest.php](https://github.com/PHPMailer/PHPMailer/tree/master/test/PHPMailerLangTest.php) script in the tests folder and it will show any missing translations.
+We welcome corrections and new languages – if you're looking for corrections, run the [Language/TranslationCompletenessTest.php](https://github.com/PHPMailer/PHPMailer/blob/master/test/Language/TranslationCompletenessTest.php) script in the tests folder and it will show any missing translations.
 
 ## Documentation
 Start reading at the [GitHub wiki](https://github.com/PHPMailer/PHPMailer/wiki). If you're having trouble, head for [the troubleshooting guide](https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting) as it's frequently updated.
@@ -170,9 +179,9 @@ Please disclose any vulnerabilities found responsibly – report security issues
 See [SECURITY](https://github.com/PHPMailer/PHPMailer/tree/master/SECURITY.md) and [PHPMailer's security advisories on GitHub](https://github.com/PHPMailer/PHPMailer/security). 
 
 ## Contributing
-Please submit bug reports, suggestions and pull requests to the [GitHub issue tracker](https://github.com/PHPMailer/PHPMailer/issues).
+Please submit bug reports, suggestions, and pull requests to the [GitHub issue tracker](https://github.com/PHPMailer/PHPMailer/issues).
 
-We're particularly interested in fixing edge-cases, expanding test coverage and updating translations.
+We're particularly interested in fixing edge cases, expanding test coverage, and updating translations.
 
 If you found a mistake in the docs, or want to add something, go ahead and amend the wiki – anyone can edit it.
 
@@ -196,7 +205,7 @@ Donations are very welcome, whether in beer 🍺, T-shirts 👕, or cold, hard c
 Available as part of the Tidelift Subscription.
 
 The maintainers of PHPMailer and thousands of other packages are working with Tidelift to deliver commercial
-support and maintenance for the open source packages you use to build your applications. Save time, reduce risk, and
+support and maintenance for the open-source packages you use to build your applications. Save time, reduce risk, and
 improve code health, while paying the maintainers of the exact packages you
 use. [Learn more.](https://tidelift.com/subscription/pkg/packagist-phpmailer-phpmailer?utm_source=packagist-phpmailer-phpmailer&utm_medium=referral&utm_campaign=enterprise&utm_term=repo)
 
@@ -214,9 +223,9 @@ See [changelog](changelog.md).
 ### What's changed since moving from SourceForge?
 - Official successor to the SourceForge and Google Code projects.
 - Test suite.
-- Continuous integration with Github Actions.
+- Continuous integration with GitHub Actions.
 - Composer support.
 - Public development.
 - Additional languages and language strings.
 - CRAM-MD5 authentication support.
-- Preserves full repo history of authors, commits and branches from the original SourceForge project.
+- Preserves full repo history of authors, commits, and branches from the original SourceForge project.
diff --git a/phpmailer/vendor/phpmailer/phpmailer/VERSION b/phpmailer/vendor/phpmailer/phpmailer/VERSION
index 4be2c727..dc3829f5 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/VERSION
+++ b/phpmailer/vendor/phpmailer/phpmailer/VERSION
@@ -1 +1 @@
-6.5.0
\ No newline at end of file
+6.9.1
diff --git a/phpmailer/vendor/phpmailer/phpmailer/composer.json b/phpmailer/vendor/phpmailer/phpmailer/composer.json
index 58393b2c..fa170a0b 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/composer.json
+++ b/phpmailer/vendor/phpmailer/phpmailer/composer.json
@@ -25,6 +25,11 @@
             "type": "github"
         }
     ],
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
+    },
     "require": {
         "php": ">=5.5.0",
         "ext-ctype": "*",
@@ -32,19 +37,24 @@
         "ext-hash": "*"
     },
     "require-dev": {
-        "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-        "doctrine/annotations": "^1.2",
+        "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
+        "doctrine/annotations": "^1.2.6 || ^1.13.3",
+        "php-parallel-lint/php-console-highlighter": "^1.0.0",
+        "php-parallel-lint/php-parallel-lint": "^1.3.2",
         "phpcompatibility/php-compatibility": "^9.3.5",
         "roave/security-advisories": "dev-latest",
-        "squizlabs/php_codesniffer": "^3.5.6",
-        "yoast/phpunit-polyfills": "^0.2.0"
+        "squizlabs/php_codesniffer": "^3.7.2",
+        "yoast/phpunit-polyfills": "^1.0.4"
     },
     "suggest": {
+        "decomplexity/SendOauth2": "Adapter for using XOAUTH2 authentication",
         "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses",
+        "ext-openssl": "Needed for secure SMTP sending and DKIM signing",
+        "greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication",
         "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
         "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
         "psr/log": "For optional PSR-3 debug logging",
-        "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
+        "thenetworg/oauth2-azure": "Needed for Microsoft XOAUTH2 authentication",
         "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
     },
     "autoload": {
@@ -60,6 +70,10 @@
     "license": "LGPL-2.1-only",
     "scripts": {
         "check": "./vendor/bin/phpcs",
-        "test": "./vendor/bin/phpunit"
+        "test": "./vendor/bin/phpunit --no-coverage",
+        "coverage": "./vendor/bin/phpunit",
+        "lint": [
+            "@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . --show-deprecated -e php,phps --exclude vendor --exclude .git --exclude build"
+        ]
     }
 }
diff --git a/phpmailer/vendor/phpmailer/phpmailer/get_oauth_token.php b/phpmailer/vendor/phpmailer/phpmailer/get_oauth_token.php
index befdc34a..cda0445c 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/get_oauth_token.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/get_oauth_token.php
@@ -44,14 +44,31 @@ use League\OAuth2\Client\Provider\Google;
 use Hayageek\OAuth2\Client\Provider\Yahoo;
 //@see https://github.com/stevenmaguire/oauth2-microsoft
 use Stevenmaguire\OAuth2\Client\Provider\Microsoft;
+//@see https://github.com/greew/oauth2-azure-provider
+use Greew\OAuth2\Client\Provider\Azure;
 
-if (!isset($_GET['code']) && !isset($_GET['provider'])) {
+if (!isset($_GET['code']) && !isset($_POST['provider'])) {
     ?>
 <html>
-<body>Select Provider:<br>
-<a href='?provider=Google'>Google</a><br>
-<a href='?provider=Yahoo'>Yahoo</a><br>
-<a href='?provider=Microsoft'>Microsoft/Outlook/Hotmail/Live/Office365</a><br>
+<body>
+<form method="post">
+    <h1>Select Provider</h1>
+    <input type="radio" name="provider" value="Google" id="providerGoogle">
+    <label for="providerGoogle">Google</label><br>
+    <input type="radio" name="provider" value="Yahoo" id="providerYahoo">
+    <label for="providerYahoo">Yahoo</label><br>
+    <input type="radio" name="provider" value="Microsoft" id="providerMicrosoft">
+    <label for="providerMicrosoft">Microsoft</label><br>
+    <input type="radio" name="provider" value="Azure" id="providerAzure">
+    <label for="providerAzure">Azure</label><br>
+    <h1>Enter id and secret</h1>
+    <p>These details are obtained by setting up an app in your provider's developer console.
+    </p>
+    <p>ClientId: <input type="text" name="clientId"><p>
+    <p>ClientSecret: <input type="text" name="clientSecret"></p>
+    <p>TenantID (only relevant for Azure): <input type="text" name="tenantId"></p>
+    <input type="submit" value="Continue">
+</form>
 </body>
 </html>
     <?php
@@ -63,21 +80,29 @@ require 'vendor/autoload.php';
 session_start();
 
 $providerName = '';
+$clientId = '';
+$clientSecret = '';
+$tenantId = '';
 
-if (array_key_exists('provider', $_GET)) {
-    $providerName = $_GET['provider'];
+if (array_key_exists('provider', $_POST)) {
+    $providerName = $_POST['provider'];
+    $clientId = $_POST['clientId'];
+    $clientSecret = $_POST['clientSecret'];
+    $tenantId = $_POST['tenantId'];
     $_SESSION['provider'] = $providerName;
+    $_SESSION['clientId'] = $clientId;
+    $_SESSION['clientSecret'] = $clientSecret;
+    $_SESSION['tenantId'] = $tenantId;
 } elseif (array_key_exists('provider', $_SESSION)) {
     $providerName = $_SESSION['provider'];
-}
-if (!in_array($providerName, ['Google', 'Microsoft', 'Yahoo'])) {
-    exit('Only Google, Microsoft and Yahoo OAuth2 providers are currently supported in this script.');
+    $clientId = $_SESSION['clientId'];
+    $clientSecret = $_SESSION['clientSecret'];
+    $tenantId = $_SESSION['tenantId'];
 }
 
-//These details are obtained by setting up an app in the Google developer console,
-//or whichever provider you're using.
-$clientId = 'RANDOMCHARS-----duv1n2.apps.googleusercontent.com';
-$clientSecret = 'RANDOMCHARS-----lGyjPcRtvP';
+//If you don't want to use the built-in form, set your client id and secret here
+//$clientId = 'RANDOMCHARS-----duv1n2.apps.googleusercontent.com';
+//$clientSecret = 'RANDOMCHARS-----lGyjPcRtvP';
 
 //If this automatic URL doesn't work, set it yourself manually to the URL of this script
 $redirectUri = (isset($_SERVER['HTTPS']) ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'];
@@ -114,6 +139,17 @@ switch ($providerName) {
             ]
         ];
         break;
+    case 'Azure':
+        $params['tenantId'] = $tenantId;
+
+        $provider = new Azure($params);
+        $options = [
+            'scope' => [
+                'https://outlook.office.com/SMTP.Send',
+                'offline_access'
+            ]
+        ];
+        break;
 }
 
 if (null === $provider) {
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-as.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-as.php
new file mode 100644
index 00000000..327dfbaf
--- /dev/null
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-as.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Assamese PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Manish Sarkar <manish.n.manish@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP ত্ৰুটি: প্ৰমাণীকৰণ কৰিব নোৱাৰি';
+$PHPMAILER_LANG['buggy_php']            = 'আপোনাৰ PHP সংস্কৰণ এটা বাগৰ দ্বাৰা প্ৰভাৱিত হয় যাৰ ফলত নষ্ট বাৰ্তা হব পাৰে । ইয়াক সমাধান কৰিবলে, প্ৰেৰণ কৰিবলে SMTP ব্যৱহাৰ কৰক, আপোনাৰ php.ini ত mail.add_x_header বিকল্প নিষ্ক্ৰিয় কৰক, MacOS বা Linux লৈ সলনি কৰক, বা আপোনাৰ PHP সংস্কৰণ 7.0.17+ বা 7.1.3+ লৈ সলনি কৰক ।';
+$PHPMAILER_LANG['connect_host']         = 'SMTP ত্ৰুটি: SMTP চাৰ্ভাৰৰ সৈতে সংযোগ কৰিবলে অক্ষম';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP ত্ৰুটি: তথ্য গ্ৰহণ কৰা হোৱা নাই';
+$PHPMAILER_LANG['empty_message']        = 'বাৰ্তাৰ মূখ্য অংশ খালী।';
+$PHPMAILER_LANG['encoding']             = 'অজ্ঞাত এনকোডিং: ';
+$PHPMAILER_LANG['execute']              = 'এক্সিকিউট কৰিব নোৱাৰি: ';
+$PHPMAILER_LANG['extension_missing']    = 'সম্প্ৰসাৰণ নোহোৱা হৈছে: ';
+$PHPMAILER_LANG['file_access']          = 'ফাইল অভিগম কৰিবলে অক্ষম: ';
+$PHPMAILER_LANG['file_open']            = 'ফাইল ত্ৰুটি: ফাইল খোলিবলৈ অক্ষম: ';
+$PHPMAILER_LANG['from_failed']          = 'নিম্নলিখিত প্ৰেৰকৰ ঠিকনা(সমূহ) ব্যৰ্থ: ';
+$PHPMAILER_LANG['instantiate']          = 'মেইল ফাংচনৰ এটা উদাহৰণ সৃষ্টি কৰিবলে অক্ষম';
+$PHPMAILER_LANG['invalid_address']      = 'প্ৰেৰণ কৰিব নোৱাৰি: অবৈধ ইমেইল ঠিকনা: ';
+$PHPMAILER_LANG['invalid_header']       = 'অবৈধ হেডাৰৰ নাম বা মান';
+$PHPMAILER_LANG['invalid_hostentry']    = 'অবৈধ হোষ্টেন্ট্ৰি: ';
+$PHPMAILER_LANG['invalid_host']         = 'অবৈধ হস্ট:';
+$PHPMAILER_LANG['mailer_not_supported'] = 'মেইলাৰ সমৰ্থিত নহয়।';
+$PHPMAILER_LANG['provide_address']      = 'আপুনি অন্ততঃ এটা গন্তব্য ইমেইল ঠিকনা দিব লাগিব';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP ত্ৰুটি: নিম্নলিখিত গন্তব্যস্থানসমূহ ব্যৰ্থ: ';
+$PHPMAILER_LANG['signing']              = 'স্বাক্ষৰ কৰাত ব্যৰ্থ: ';
+$PHPMAILER_LANG['smtp_code']            = 'SMTP কড: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'অতিৰিক্ত SMTP তথ্য: ';
+$PHPMAILER_LANG['smtp_detail']          = 'বিৱৰণ:';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP সংযোগ() ব্যৰ্থ';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP চাৰ্ভাৰৰ ত্ৰুটি: ';
+$PHPMAILER_LANG['variable_set']         = 'চলক নিৰ্ধাৰণ কৰিব পৰা নগল: ';
+$PHPMAILER_LANG['extension_missing']    = 'অনুপস্থিত সম্প্ৰসাৰণ: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-bn.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-bn.php
new file mode 100644
index 00000000..47365108
--- /dev/null
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-bn.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Bengali PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Manish Sarkar <manish.n.manish@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP ত্রুটি: প্রমাণীকরণ করতে অক্ষম৷';
+$PHPMAILER_LANG['buggy_php']            = 'আপনার PHP সংস্করণ একটি বাগ দ্বারা প্রভাবিত হয় যার ফলে দূষিত বার্তা হতে পারে। এটি ঠিক করতে, পাঠাতে SMTP ব্যবহার করুন, আপনার php.ini এ mail.add_x_header বিকল্পটি নিষ্ক্রিয় করুন, MacOS বা Linux-এ স্যুইচ করুন, অথবা আপনার PHP সংস্করণকে 7.0.17+ বা 7.1.3+ এ পরিবর্তন করুন।';
+$PHPMAILER_LANG['connect_host']         = 'SMTP ত্রুটি: SMTP সার্ভারের সাথে সংযোগ করতে অক্ষম৷';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP ত্রুটি: ডেটা গ্রহণ করা হয়নি৷';
+$PHPMAILER_LANG['empty_message']        = 'বার্তার অংশটি খালি।';
+$PHPMAILER_LANG['encoding']             = 'অজানা এনকোডিং: ';
+$PHPMAILER_LANG['execute']              = 'নির্বাহ করতে অক্ষম: ';
+$PHPMAILER_LANG['extension_missing']    = 'এক্সটেনশন অনুপস্থিত:';
+$PHPMAILER_LANG['file_access']          = 'ফাইল অ্যাক্সেস করতে অক্ষম: ';
+$PHPMAILER_LANG['file_open']            = 'ফাইল ত্রুটি: ফাইল খুলতে অক্ষম: ';
+$PHPMAILER_LANG['from_failed']          = 'নিম্নলিখিত প্রেরকের ঠিকানা(গুলি) ব্যর্থ হয়েছে: ';
+$PHPMAILER_LANG['instantiate']          = 'মেল ফাংশনের একটি উদাহরণ তৈরি করতে অক্ষম৷';
+$PHPMAILER_LANG['invalid_address']      = 'পাঠাতে অক্ষম: অবৈধ ইমেল ঠিকানা: ';
+$PHPMAILER_LANG['invalid_header']       = 'অবৈধ হেডার নাম বা মান';
+$PHPMAILER_LANG['invalid_hostentry']    = 'অবৈধ হোস্টেন্ট্রি: ';
+$PHPMAILER_LANG['invalid_host']         = 'অবৈধ হোস্ট:';
+$PHPMAILER_LANG['mailer_not_supported'] = 'মেইলার সমর্থিত নয়।';
+$PHPMAILER_LANG['provide_address']      = 'আপনাকে অবশ্যই অন্তত একটি গন্তব্য ইমেল ঠিকানা প্রদান করতে হবে৷';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP ত্রুটি: নিম্নলিখিত গন্তব্যগুলি ব্যর্থ হয়েছে: ';
+$PHPMAILER_LANG['signing']              = 'স্বাক্ষর করতে ব্যর্থ হয়েছে: ';
+$PHPMAILER_LANG['smtp_code']            = 'SMTP কোড: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'অতিরিক্ত SMTP তথ্য:';
+$PHPMAILER_LANG['smtp_detail']          = 'বর্ণনা: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP সংযোগ() ব্যর্থ হয়েছে৷';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP সার্ভার ত্রুটি: ';
+$PHPMAILER_LANG['variable_set']         = 'পরিবর্তনশীল সেট করা যায়নি: ';
+$PHPMAILER_LANG['extension_missing']    = 'অনুপস্থিত এক্সটেনশন: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php
deleted file mode 100644
index 500c9526..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Chinese PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * @author LiuXin <http://www.80x86.cn/blog/>
- */
-
-$PHPMAILER_LANG['authenticate']         = 'SMTP 错误：身份验证失败。';
-$PHPMAILER_LANG['connect_host']         = 'SMTP 错误: 不能连接SMTP主机。';
-$PHPMAILER_LANG['data_not_accepted']    = 'SMTP 错误: 数据不可接受。';
-//$PHPMAILER_LANG['empty_message']        = 'Message body empty';
-$PHPMAILER_LANG['encoding']             = '未知编码：';
-$PHPMAILER_LANG['execute']              = '不能执行: ';
-$PHPMAILER_LANG['file_access']          = '不能访问文件：';
-$PHPMAILER_LANG['file_open']            = '文件错误：不能打开文件：';
-$PHPMAILER_LANG['from_failed']          = '下面的发送地址邮件发送失败了： ';
-$PHPMAILER_LANG['instantiate']          = '不能实现mail方法。';
-//$PHPMAILER_LANG['invalid_address']      = 'Invalid address: ';
-$PHPMAILER_LANG['mailer_not_supported'] = ' 您所选择的发送邮件的方法并不支持。';
-$PHPMAILER_LANG['provide_address']      = '您必须提供至少一个 收信人的email地址。';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP 错误： 下面的 收件人失败了： ';
-//$PHPMAILER_LANG['signing']              = 'Signing Error: ';
-//$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
-//$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
-//$PHPMAILER_LANG['variable_set']         = 'Cannot set or reset variable: ';
-//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php
index 1edba1d7..db9a1ef5 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php
@@ -9,21 +9,28 @@
  */
 
 $PHPMAILER_LANG['authenticate']         = 'SMTP fejl: Login mislykkedes.';
+$PHPMAILER_LANG['buggy_php']            = 'Din version af PHP er berørt af en fejl, som gør at dine beskeder muligvis vises forkert. For at rette dette kan du skifte til SMTP, slå mail.add_x_header headeren i din php.ini fil fra, skifte til MacOS eller Linux eller opgradere din version af PHP til 7.0.17+ eller 7.1.3+.';
 $PHPMAILER_LANG['connect_host']         = 'SMTP fejl: Forbindelse til SMTP serveren kunne ikke oprettes.';
 $PHPMAILER_LANG['data_not_accepted']    = 'SMTP fejl: Data blev ikke accepteret.';
 $PHPMAILER_LANG['empty_message']        = 'Meddelelsen er uden indhold';
 $PHPMAILER_LANG['encoding']             = 'Ukendt encode-format: ';
 $PHPMAILER_LANG['execute']              = 'Kunne ikke afvikle: ';
+$PHPMAILER_LANG['extension_missing']    = 'Udvidelse mangler: ';
 $PHPMAILER_LANG['file_access']          = 'Kunne ikke tilgå filen: ';
 $PHPMAILER_LANG['file_open']            = 'Fil fejl: Kunne ikke åbne filen: ';
 $PHPMAILER_LANG['from_failed']          = 'Følgende afsenderadresse er forkert: ';
 $PHPMAILER_LANG['instantiate']          = 'Email funktionen kunne ikke initialiseres.';
 $PHPMAILER_LANG['invalid_address']      = 'Udgyldig adresse: ';
+$PHPMAILER_LANG['invalid_header']       = 'Ugyldig header navn eller værdi';
+$PHPMAILER_LANG['invalid_hostentry']    = 'Ugyldig hostentry: ';
+$PHPMAILER_LANG['invalid_host']         = 'Ugyldig vært: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' mailer understøttes ikke.';
 $PHPMAILER_LANG['provide_address']      = 'Indtast mindst en modtagers email adresse.';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP fejl: Følgende modtagere er forkerte: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP fejl: Følgende modtagere fejlede: ';
 $PHPMAILER_LANG['signing']              = 'Signeringsfejl: ';
+$PHPMAILER_LANG['smtp_code']            = 'SMTP kode: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'Yderligere SMTP info: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() fejlede.';
+$PHPMAILER_LANG['smtp_detail']          = 'Detalje: ';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP server fejl: ';
 $PHPMAILER_LANG['variable_set']         = 'Kunne ikke definere eller nulstille variablen: ';
-$PHPMAILER_LANG['extension_missing']    = 'Udvidelse mangler: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php
index b3d5ca94..339ee575 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php
@@ -5,22 +5,29 @@
  * @package PHPMailer
  */
 
-$PHPMAILER_LANG['authenticate']         = 'SMTP Σφάλμα: Αδυναμία πιστοποίησης (authentication).';
-$PHPMAILER_LANG['connect_host']         = 'SMTP Σφάλμα: Αδυναμία σύνδεσης στον SMTP-Host.';
-$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Σφάλμα: Τα δεδομένα δεν έγιναν αποδεκτά.';
-$PHPMAILER_LANG['empty_message']        = 'Το E-Mail δεν έχει περιεχόμενο .';
-$PHPMAILER_LANG['encoding']             = 'Αγνωστο Encoding-Format: ';
-$PHPMAILER_LANG['execute']              = 'Αδυναμία εκτέλεσης ακόλουθης εντολής: ';
-$PHPMAILER_LANG['file_access']          = 'Αδυναμία προσπέλασης του αρχείου: ';
-$PHPMAILER_LANG['file_open']            = 'Σφάλμα Αρχείου: Δεν είναι δυνατό το άνοιγμα του ακόλουθου αρχείου: ';
-$PHPMAILER_LANG['from_failed']          = 'Η παρακάτω διεύθυνση αποστολέα δεν είναι σωστή: ';
-$PHPMAILER_LANG['instantiate']          = 'Αδυναμία εκκίνησης Mail function.';
-$PHPMAILER_LANG['invalid_address']      = 'Το μήνυμα δεν εστάλη, η διεύθυνση δεν είναι έγκυρη: ';
+$PHPMAILER_LANG['authenticate']         = 'Σφάλμα SMTP: Αδυναμία πιστοποίησης.';
+$PHPMAILER_LANG['buggy_php']            = 'Η έκδοση PHP που χρησιμοποιείτε παρουσιάζει σφάλμα που μπορεί να έχει ως αποτέλεσμα κατεστραμένα μηνύματα. Για να το διορθώσετε, αλλάξτε τον τρόπο αποστολής σε SMTP, απενεργοποιήστε την επιλογή mail.add_x_header στο αρχείο php.ini, αλλάξτε λειτουργικό σε MacOS ή Linux ή αναβαθμίστε την PHP σε έκδοση 7.0.17+ ή 7.1.3+.';
+$PHPMAILER_LANG['connect_host']         = 'Σφάλμα SMTP: Αδυναμία σύνδεσης με τον φιλοξενητή SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Σφάλμα SMTP: Μη αποδεκτά δεδομένα.';
+$PHPMAILER_LANG['empty_message']        = 'Η ηλεκτρονική επιστολή δεν έχει περιεχόμενο.';
+$PHPMAILER_LANG['encoding']             = 'Άγνωστη μορφή κωδικοποίησης: ';
+$PHPMAILER_LANG['execute']              = 'Αδυναμία εκτέλεσης: ';
+$PHPMAILER_LANG['extension_missing']    = 'Απουσία επέκτασης: ';
+$PHPMAILER_LANG['file_access']          = 'Αδυναμία πρόσβασης στο αρχείο: ';
+$PHPMAILER_LANG['file_open']            = 'Σφάλμα Αρχείου: Αδυναμία ανοίγματος αρχείου: ';
+$PHPMAILER_LANG['from_failed']          = 'Η ακόλουθη διεύθυνση αποστολέα δεν είναι σωστή: ';
+$PHPMAILER_LANG['instantiate']          = 'Αδυναμία εκκίνησης συνάρτησης Mail.';
+$PHPMAILER_LANG['invalid_address']      = 'Μη έγκυρη διεύθυνση: ';
+$PHPMAILER_LANG['invalid_header']       = 'Μη έγκυρο όνομα κεφαλίδας ή τιμή';
+$PHPMAILER_LANG['invalid_hostentry']    = 'Μη έγκυρη εισαγωγή φιλοξενητή: ';
+$PHPMAILER_LANG['invalid_host']         = 'Μη έγκυρος φιλοξενητής: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' mailer δεν υποστηρίζεται.';
-$PHPMAILER_LANG['provide_address']      = 'Παρακαλούμε δώστε τουλάχιστον μια e-mail διεύθυνση παραλήπτη.';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP Σφάλμα: Οι παρακάτω διευθύνσεις παραλήπτη δεν είναι έγκυρες: ';
+$PHPMAILER_LANG['provide_address']      = 'Δώστε τουλάχιστον μια ηλεκτρονική διεύθυνση παραλήπτη.';
+$PHPMAILER_LANG['recipients_failed']    = 'Σφάλμα SMTP: Οι παρακάτω διευθύνσεις παραλήπτη δεν είναι έγκυρες: ';
 $PHPMAILER_LANG['signing']              = 'Σφάλμα υπογραφής: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'Αποτυχία σύνδεσης στον SMTP Server.';
-$PHPMAILER_LANG['smtp_error']           = 'Σφάλμα από τον SMTP Server: ';
-$PHPMAILER_LANG['variable_set']         = 'Αδυναμία ορισμού ή αρχικοποίησης μεταβλητής: ';
-//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
+$PHPMAILER_LANG['smtp_code']            = 'Κώδικάς SMTP: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'Πρόσθετες πληροφορίες SMTP: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Αποτυχία σύνδεσης SMTP.';
+$PHPMAILER_LANG['smtp_detail']          = 'Λεπτομέρεια: ';
+$PHPMAILER_LANG['smtp_error']           = 'Σφάλμα με τον διακομιστή SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'Αδυναμία ορισμού ή επαναφοράς μεταβλητής: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php
index 6ba74627..69920418 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php
@@ -4,6 +4,7 @@
  * Spanish PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
  * @author Matt Sturdy <matt.sturdy@gmail.com>
+ * @author Crystopher Glodzienski Cardoso <crystopher.glodzienski@gmail.com>
  */
 
 $PHPMAILER_LANG['authenticate']         = 'Error SMTP: Imposible autentificar.';
@@ -25,3 +26,6 @@ $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() falló.';
 $PHPMAILER_LANG['smtp_error']           = 'Error del servidor SMTP: ';
 $PHPMAILER_LANG['variable_set']         = 'No se pudo configurar la variable: ';
 $PHPMAILER_LANG['extension_missing']    = 'Extensión faltante: ';
+$PHPMAILER_LANG['smtp_code']            = 'Código del servidor SMTP: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'Información adicional del servidor SMTP: ';
+$PHPMAILER_LANG['invalid_header']       = 'Nombre o valor de encabezado no válido';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fi.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fi.php
index 243c0548..6d1e6373 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fi.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fi.php
@@ -20,7 +20,6 @@ $PHPMAILER_LANG['instantiate']          = 'mail-funktion luonti epäonnistui.';
 $PHPMAILER_LANG['mailer_not_supported'] = 'postivälitintyyppiä ei tueta.';
 $PHPMAILER_LANG['provide_address']      = 'Aseta vähintään yksi vastaanottajan sähk&ouml;postiosoite.';
 $PHPMAILER_LANG['recipients_failed']    = 'SMTP-virhe: seuraava vastaanottaja osoite on virheellinen.';
-$PHPMAILER_LANG['encoding']             = 'Tuntematon koodaustyyppi: ';
 //$PHPMAILER_LANG['signing']              = 'Signing Error: ';
 //$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
 //$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php
index b57f0ec6..0d367fcf 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php
@@ -9,24 +9,29 @@
  * @see http://unicode.org/udhr/n/notes_fra.html
  */
 
-$PHPMAILER_LANG['authenticate']         = 'Erreur SMTP : échec de l\'authentification.';
+$PHPMAILER_LANG['authenticate']         = 'Erreur SMTP : échec de l’authentification.';
+$PHPMAILER_LANG['buggy_php']            = 'Votre version de PHP est affectée par un bug qui peut entraîner des messages corrompus. Pour résoudre ce problème, passez à l’envoi par SMTP, désactivez l’option mail.add_x_header dans le fichier php.ini, passez à MacOS ou Linux, ou passez PHP à la version 7.0.17+ ou 7.1.3+.';
 $PHPMAILER_LANG['connect_host']         = 'Erreur SMTP : impossible de se connecter au serveur SMTP.';
 $PHPMAILER_LANG['data_not_accepted']    = 'Erreur SMTP : données incorrectes.';
 $PHPMAILER_LANG['empty_message']        = 'Corps du message vide.';
 $PHPMAILER_LANG['encoding']             = 'Encodage inconnu : ';
-$PHPMAILER_LANG['execute']              = 'Impossible de lancer l\'exécution : ';
-$PHPMAILER_LANG['file_access']          = 'Impossible d\'accéder au fichier : ';
+$PHPMAILER_LANG['execute']              = 'Impossible de lancer l’exécution : ';
+$PHPMAILER_LANG['extension_missing']    = 'Extension manquante : ';
+$PHPMAILER_LANG['file_access']          = 'Impossible d’accéder au fichier : ';
 $PHPMAILER_LANG['file_open']            = 'Ouverture du fichier impossible : ';
-$PHPMAILER_LANG['from_failed']          = 'L\'adresse d\'expéditeur suivante a échoué : ';
-$PHPMAILER_LANG['instantiate']          = 'Impossible d\'instancier la fonction mail.';
-$PHPMAILER_LANG['invalid_address']      = 'L\'adresse courriel n\'est pas valide : ';
-$PHPMAILER_LANG['invalid_hostentry']    = 'L\'entrée hôte n\'est pas valide : ';
-$PHPMAILER_LANG['invalid_host']         = 'L\'hôte n\'est pas valide : ';
+$PHPMAILER_LANG['from_failed']          = 'L’adresse d’expéditeur suivante a échoué : ';
+$PHPMAILER_LANG['instantiate']          = 'Impossible d’instancier la fonction mail.';
+$PHPMAILER_LANG['invalid_address']      = 'Adresse courriel non valide : ';
+$PHPMAILER_LANG['invalid_header']       = 'Nom ou valeur de l’en-tête non valide';
+$PHPMAILER_LANG['invalid_hostentry']    = 'Entrée d’hôte non valide : ';
+$PHPMAILER_LANG['invalid_host']         = 'Hôte non valide : ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' client de messagerie non supporté.';
 $PHPMAILER_LANG['provide_address']      = 'Vous devez fournir au moins une adresse de destinataire.';
-$PHPMAILER_LANG['recipients_failed']    = 'Erreur SMTP : les destinataires suivants sont en erreur : ';
+$PHPMAILER_LANG['recipients_failed']    = 'Erreur SMTP : les destinataires suivants ont échoué : ';
 $PHPMAILER_LANG['signing']              = 'Erreur de signature : ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'Échec de la connexion SMTP.';
+$PHPMAILER_LANG['smtp_code']            = 'Code SMTP : ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'Informations supplémentaires SMTP : ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'La fonction SMTP connect() a échouée.';
+$PHPMAILER_LANG['smtp_detail']          = 'Détails : ';
 $PHPMAILER_LANG['smtp_error']           = 'Erreur du serveur SMTP : ';
-$PHPMAILER_LANG['variable_set']         = 'Impossible d\'initialiser ou de réinitialiser une variable : ';
-$PHPMAILER_LANG['extension_missing']    = 'Extension manquante : ';
+$PHPMAILER_LANG['variable_set']         = 'Impossible d’initialiser ou de réinitialiser une variable : ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-hi.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-hi.php
index d973a359..d2856e05 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-hi.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-hi.php
@@ -4,24 +4,32 @@
  * Hindi PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
  * @author Yash Karanke <mr.karanke@gmail.com>
+ * Rewrite and extension of the work by Jayanti Suthar <suthar.jayanti93@gmail.com>
  */
 
 $PHPMAILER_LANG['authenticate']         = 'SMTP त्रुटि: प्रामाणिकता की जांच नहीं हो सका। ';
+$PHPMAILER_LANG['buggy_php']            = 'PHP का आपका संस्करण एक बग से प्रभावित है जिसके परिणामस्वरूप संदेश दूषित हो सकते हैं. इसे ठीक करने हेतु, भेजने के लिए SMTP का उपयोग करे, अपने php.ini में mail.add_x_header विकल्प को अक्षम करें, MacOS या Linux पर जाए, या अपने PHP संस्करण को 7.0.17+ या 7.1.3+ बदले.';
 $PHPMAILER_LANG['connect_host']         = 'SMTP त्रुटि: SMTP सर्वर से कनेक्ट नहीं हो सका। ';
 $PHPMAILER_LANG['data_not_accepted']    = 'SMTP त्रुटि: डेटा स्वीकार नहीं किया जाता है। ';
 $PHPMAILER_LANG['empty_message']        = 'संदेश खाली है। ';
 $PHPMAILER_LANG['encoding']             = 'अज्ञात एन्कोडिंग प्रकार। ';
 $PHPMAILER_LANG['execute']              = 'आदेश को निष्पादित करने में विफल। ';
+$PHPMAILER_LANG['extension_missing']    = 'एक्सटेन्षन गायब है: ';
 $PHPMAILER_LANG['file_access']          = 'फ़ाइल उपलब्ध नहीं है। ';
 $PHPMAILER_LANG['file_open']            = 'फ़ाइल त्रुटि: फाइल को खोला नहीं जा सका। ';
 $PHPMAILER_LANG['from_failed']          = 'प्रेषक का पता गलत है। ';
 $PHPMAILER_LANG['instantiate']          = 'मेल फ़ंक्शन कॉल नहीं कर सकता है।';
 $PHPMAILER_LANG['invalid_address']      = 'पता गलत है। ';
+$PHPMAILER_LANG['invalid_header']       = 'अमान्य हेडर नाम या मान';
+$PHPMAILER_LANG['invalid_hostentry']    = 'अमान्य hostentry: ';
+$PHPMAILER_LANG['invalid_host']         = 'अमान्य होस्ट: ';
 $PHPMAILER_LANG['mailer_not_supported'] = 'मेल सर्वर के साथ काम नहीं करता है। ';
 $PHPMAILER_LANG['provide_address']      = 'आपको कम से कम एक प्राप्तकर्ता का ई-मेल पता प्रदान करना होगा।';
 $PHPMAILER_LANG['recipients_failed']    = 'SMTP त्रुटि: निम्न प्राप्तकर्ताओं को पते भेजने में विफल। ';
-$PHPMAILER_LANG['signing']              = 'साइनअप त्रुटि:। ';
+$PHPMAILER_LANG['signing']              = 'साइनअप त्रुटि: ';
+$PHPMAILER_LANG['smtp_code']            = 'SMTP कोड: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'अतिरिक्त SMTP जानकारी: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP का connect () फ़ंक्शन विफल हुआ। ';
+$PHPMAILER_LANG['smtp_detail']          = 'विवरण: ';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP सर्वर त्रुटि। ';
 $PHPMAILER_LANG['variable_set']         = 'चर को बना या संशोधित नहीं किया जा सकता। ';
-$PHPMAILER_LANG['extension_missing']    = 'एक्सटेन्षन गायब है: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php
index eee79898..c76f5264 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php
@@ -5,24 +5,25 @@
  * @package PHPMailer
  * @author Mitsuhiro Yoshida <http://mitstek.com/>
  * @author Yoshi Sakai <http://bluemooninc.jp/>
+ * @author Arisophy <https://github.com/arisophy/>
  */
 
 $PHPMAILER_LANG['authenticate']         = 'SMTPエラー: 認証できませんでした。';
 $PHPMAILER_LANG['connect_host']         = 'SMTPエラー: SMTPホストに接続できませんでした。';
 $PHPMAILER_LANG['data_not_accepted']    = 'SMTPエラー: データが受け付けられませんでした。';
-//$PHPMAILER_LANG['empty_message']        = 'Message body empty';
+$PHPMAILER_LANG['empty_message']        = 'メール本文が空です。';
 $PHPMAILER_LANG['encoding']             = '不明なエンコーディング: ';
 $PHPMAILER_LANG['execute']              = '実行できませんでした: ';
 $PHPMAILER_LANG['file_access']          = 'ファイルにアクセスできません: ';
 $PHPMAILER_LANG['file_open']            = 'ファイルエラー: ファイルを開けません: ';
 $PHPMAILER_LANG['from_failed']          = 'Fromアドレスを登録する際にエラーが発生しました: ';
 $PHPMAILER_LANG['instantiate']          = 'メール関数が正常に動作しませんでした。';
-//$PHPMAILER_LANG['invalid_address']      = 'Invalid address: ';
+$PHPMAILER_LANG['invalid_address']      = '不正なメールアドレス: ';
 $PHPMAILER_LANG['provide_address']      = '少なくとも1つメールアドレスを 指定する必要があります。';
 $PHPMAILER_LANG['mailer_not_supported'] = ' メーラーがサポートされていません。';
 $PHPMAILER_LANG['recipients_failed']    = 'SMTPエラー: 次の受信者アドレスに 間違いがあります: ';
-//$PHPMAILER_LANG['signing']              = 'Signing Error: ';
-//$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
-//$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
-//$PHPMAILER_LANG['variable_set']         = 'Cannot set or reset variable: ';
-//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
+$PHPMAILER_LANG['signing']              = '署名エラー: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP接続に失敗しました。';
+$PHPMAILER_LANG['smtp_error']           = 'SMTPサーバーエラー: ';
+$PHPMAILER_LANG['variable_set']         = '変数が存在しません: ';
+$PHPMAILER_LANG['extension_missing']    = '拡張機能が見つかりません: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-mn.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-mn.php
new file mode 100644
index 00000000..04d262c7
--- /dev/null
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-mn.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Mongolian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author @wispas
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Алдаа SMTP: Холбогдож чадсангүй.';
+$PHPMAILER_LANG['connect_host']         = 'Алдаа SMTP: SMTP- сервертэй холбогдож болохгүй байна.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Алдаа SMTP: зөвшөөрөгдсөнгүй.';
+$PHPMAILER_LANG['encoding']             = 'Тодорхойгүй кодчилол: ';
+$PHPMAILER_LANG['execute']              = 'Коммандыг гүйцэтгэх боломжгүй байна: ';
+$PHPMAILER_LANG['file_access']          = 'Файлд хандах боломжгүй байна: ';
+$PHPMAILER_LANG['file_open']            = 'Файлын алдаа: файлыг нээх боломжгүй байна: ';
+$PHPMAILER_LANG['from_failed']          = 'Илгээгчийн хаяг буруу байна: ';
+$PHPMAILER_LANG['instantiate']          = 'Mail () функцийг ажиллуулах боломжгүй байна.';
+$PHPMAILER_LANG['provide_address']      = 'Хүлээн авагчийн имэйл хаягийг оруулна уу.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' — мэйл серверийг дэмжсэнгүй.';
+$PHPMAILER_LANG['recipients_failed']    = 'Алдаа SMTP: ийм хаягийг илгээж чадсангүй: ';
+$PHPMAILER_LANG['empty_message']        = 'Хоосон мессэж';
+$PHPMAILER_LANG['invalid_address']      = 'И-Мэйл буруу форматтай тул илгээх боломжгүй: ';
+$PHPMAILER_LANG['signing']              = 'Гарын үсгийн алдаа: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP сервертэй холбогдоход алдаа гарлаа';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP серверийн алдаа: ';
+$PHPMAILER_LANG['variable_set']         = 'Хувьсагчийг тохируулах эсвэл дахин тохируулах боломжгүй байна: ';
+$PHPMAILER_LANG['extension_missing']    = 'Өргөтгөл байхгүй: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-nb.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-nb.php
index 65793ce2..c9621a16 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-nb.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-nb.php
@@ -5,22 +5,29 @@
  * @package PHPMailer
  */
 
-$PHPMAILER_LANG['authenticate']         = 'SMTP Feil: Kunne ikke autentisere.';
-$PHPMAILER_LANG['connect_host']         = 'SMTP Feil: Kunne ikke koble til SMTP tjener.';
-$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Feil: Datainnhold ikke akseptert.';
-$PHPMAILER_LANG['empty_message']        = 'Meldingsinnhold mangler';
-$PHPMAILER_LANG['encoding']             = 'Ukjent koding: ';
-$PHPMAILER_LANG['execute']              = 'Kunne ikke utføre: ';
-$PHPMAILER_LANG['file_access']          = 'Får ikke tilgang til filen: ';
-$PHPMAILER_LANG['file_open']            = 'Fil Feil: Kunne ikke åpne filen: ';
-$PHPMAILER_LANG['from_failed']          = 'Følgende Frå adresse feilet: ';
-$PHPMAILER_LANG['instantiate']          = 'Kunne ikke initialisere post funksjon.';
-$PHPMAILER_LANG['invalid_address']      = 'Ugyldig adresse: ';
-$PHPMAILER_LANG['mailer_not_supported'] = ' sender er ikke støttet.';
-$PHPMAILER_LANG['provide_address']      = 'Du må opppgi minst en mottakeradresse.';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP Feil: Følgende mottakeradresse feilet: ';
-$PHPMAILER_LANG['signing']              = 'Signering Feil: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP connect() feilet.';
-$PHPMAILER_LANG['smtp_error']           = 'SMTP server feil: ';
-$PHPMAILER_LANG['variable_set']         = 'Kan ikke skrive eller omskrive variabel: ';
-$PHPMAILER_LANG['extension_missing']    = 'Utvidelse mangler: ';
+ $PHPMAILER_LANG['authenticate']         = 'SMTP-feil: Kunne ikke autentiseres.';
+ $PHPMAILER_LANG['buggy_php']            = 'Din versjon av PHP er berørt av en feil som kan føre til ødelagte meldinger. For å løse problemet kan du bytte til SMTP, deaktivere alternativet mail.add_x_header i php.ini, bytte til MacOS eller Linux eller oppgradere PHP til versjon 7.0.17+ eller 7.1.3+.';
+ $PHPMAILER_LANG['connect_host']         = 'SMTP-feil: Kunne ikke koble til SMTP-vert.';
+ $PHPMAILER_LANG['data_not_accepted']    = 'SMTP-feil: data ikke akseptert.';
+ $PHPMAILER_LANG['empty_message']        = 'Meldingstekst mangler';
+ $PHPMAILER_LANG['encoding']             = 'Ukjent koding: ';
+ $PHPMAILER_LANG['execute']              = 'Kunne ikke utføres: ';
+ $PHPMAILER_LANG['extension_missing']    = 'Utvidelse mangler: ';
+ $PHPMAILER_LANG['file_access']          = 'Kunne ikke få tilgang til filen: ';
+ $PHPMAILER_LANG['file_open']            = 'Feil i fil: Kunne ikke åpne filen: ';
+ $PHPMAILER_LANG['from_failed']          = 'Følgende Fra-adresse mislyktes: ';
+ $PHPMAILER_LANG['instantiate']          = 'Kunne ikke instansiere e-postfunksjonen.';
+ $PHPMAILER_LANG['invalid_address']      = 'Ugyldig adresse: ';
+ $PHPMAILER_LANG['invalid_header']       = 'Ugyldig headernavn eller verdi';
+ $PHPMAILER_LANG['invalid_hostentry']    = 'Ugyldig vertsinngang: ';
+ $PHPMAILER_LANG['invalid_host']         = 'Ugyldig vert: ';
+ $PHPMAILER_LANG['mailer_not_supported'] = ' sender er ikke støttet.';
+ $PHPMAILER_LANG['provide_address']      = 'Du må oppgi minst én mottaker-e-postadresse.';
+ $PHPMAILER_LANG['recipients_failed']    = 'SMTP Feil: Følgende mottakeradresse feilet: ';
+ $PHPMAILER_LANG['signing']              = 'Signeringsfeil: ';
+ $PHPMAILER_LANG['smtp_code']            = 'SMTP-kode: ';
+ $PHPMAILER_LANG['smtp_code_ex']         = 'Ytterligere SMTP-info: ';
+ $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP connect() mislyktes.';
+ $PHPMAILER_LANG['smtp_detail']          = 'Detaljer: ';
+ $PHPMAILER_LANG['smtp_error']           = 'SMTP-serverfeil: ';
+ $PHPMAILER_LANG['variable_set']         = 'Kan ikke angi eller tilbakestille variabel: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-nl.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-nl.php
index bf41ade8..8229d5e2 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-nl.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-nl.php
@@ -7,23 +7,28 @@
  */
 
 $PHPMAILER_LANG['authenticate']         = 'SMTP-fout: authenticatie mislukt.';
+$PHPMAILER_LANG['buggy_php']            = 'PHP versie gededecteerd die onderhavig is aan een bug die kan resulteren in gecorrumpeerde berichten. Om dit te voorkomen, gebruik SMTP voor het verzenden van berichten, zet de mail.add_x_header optie in uw php.ini file uit, gebruik MacOS of Linux, of pas de gebruikte PHP versie aan naar versie 7.0.17+ or 7.1.3+.';
 $PHPMAILER_LANG['connect_host']         = 'SMTP-fout: kon niet verbinden met SMTP-host.';
 $PHPMAILER_LANG['data_not_accepted']    = 'SMTP-fout: data niet geaccepteerd.';
 $PHPMAILER_LANG['empty_message']        = 'Berichttekst is leeg';
 $PHPMAILER_LANG['encoding']             = 'Onbekende codering: ';
 $PHPMAILER_LANG['execute']              = 'Kon niet uitvoeren: ';
+$PHPMAILER_LANG['extension_missing']    = 'Extensie afwezig: ';
 $PHPMAILER_LANG['file_access']          = 'Kreeg geen toegang tot bestand: ';
 $PHPMAILER_LANG['file_open']            = 'Bestandsfout: kon bestand niet openen: ';
 $PHPMAILER_LANG['from_failed']          = 'Het volgende afzendersadres is mislukt: ';
 $PHPMAILER_LANG['instantiate']          = 'Kon mailfunctie niet initialiseren.';
 $PHPMAILER_LANG['invalid_address']      = 'Ongeldig adres: ';
+$PHPMAILER_LANG['invalid_header']       = 'Ongeldige header naam of waarde';
 $PHPMAILER_LANG['invalid_hostentry']    = 'Ongeldige hostentry: ';
 $PHPMAILER_LANG['invalid_host']         = 'Ongeldige host: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' mailer wordt niet ondersteund.';
 $PHPMAILER_LANG['provide_address']      = 'Er moet minstens één ontvanger worden opgegeven.';
 $PHPMAILER_LANG['recipients_failed']    = 'SMTP-fout: de volgende ontvangers zijn mislukt: ';
 $PHPMAILER_LANG['signing']              = 'Signeerfout: ';
+$PHPMAILER_LANG['smtp_code']            = 'SMTP code: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'Aanvullende SMTP informatie: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Verbinding mislukt.';
+$PHPMAILER_LANG['smtp_detail']          = 'Detail: ';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP-serverfout: ';
 $PHPMAILER_LANG['variable_set']         = 'Kan de volgende variabele niet instellen of resetten: ';
-$PHPMAILER_LANG['extension_missing']    = 'Extensie afwezig: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php
index 23caa71b..cb7b2c21 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php
@@ -6,22 +6,28 @@
  */
 
 $PHPMAILER_LANG['authenticate']         = 'Błąd SMTP: Nie można przeprowadzić uwierzytelnienia.';
+$PHPMAILER_LANG['buggy_php']            = 'Twoja wersja PHP zawiera błąd, który może powodować uszkodzenie wiadomości. Aby go naprawić, przełącz się na wysyłanie za pomocą SMTP, wyłącz opcję mail.add_x_header w php.ini, przełącz się na MacOS lub Linux lub zaktualizuj PHP do wersji 7.0.17+ lub 7.1.3+.';
 $PHPMAILER_LANG['connect_host']         = 'Błąd SMTP: Nie można połączyć się z wybranym hostem.';
 $PHPMAILER_LANG['data_not_accepted']    = 'Błąd SMTP: Dane nie zostały przyjęte.';
 $PHPMAILER_LANG['empty_message']        = 'Wiadomość jest pusta.';
-$PHPMAILER_LANG['encoding']             = 'Nieznany sposób kodowania znaków: ';
+$PHPMAILER_LANG['encoding']             = 'Błędny sposób kodowania znaków: ';
 $PHPMAILER_LANG['execute']              = 'Nie można uruchomić: ';
+$PHPMAILER_LANG['extension_missing']    = 'Brakujące rozszerzenie: ';
 $PHPMAILER_LANG['file_access']          = 'Brak dostępu do pliku: ';
 $PHPMAILER_LANG['file_open']            = 'Nie można otworzyć pliku: ';
-$PHPMAILER_LANG['from_failed']          = 'Następujący adres Nadawcy jest nieprawidłowy: ';
+$PHPMAILER_LANG['from_failed']          = 'Następujący adres nadawcy jest nieprawidłowy lub nie istnieje: ';
 $PHPMAILER_LANG['instantiate']          = 'Nie można wywołać funkcji mail(). Sprawdź konfigurację serwera.';
-$PHPMAILER_LANG['invalid_address']      = 'Nie można wysłać wiadomości, ' .
-    'następujący adres Odbiorcy jest nieprawidłowy: ';
-$PHPMAILER_LANG['provide_address']      = 'Należy podać prawidłowy adres email Odbiorcy.';
+$PHPMAILER_LANG['invalid_address']      = 'Nie można wysłać wiadomości, ' . 'następujący adres odbiorcy jest nieprawidłowy lub nie istnieje: ';
+$PHPMAILER_LANG['invalid_header']       = 'Nieprawidłowa nazwa lub wartość nagłówka';
+$PHPMAILER_LANG['invalid_hostentry']    = 'Nieprawidłowy wpis hosta: ';
+$PHPMAILER_LANG['invalid_host']         = 'Nieprawidłowy host: ';
+$PHPMAILER_LANG['provide_address']      = 'Należy podać prawidłowy adres email odbiorcy.';
 $PHPMAILER_LANG['mailer_not_supported'] = 'Wybrana metoda wysyłki wiadomości nie jest obsługiwana.';
-$PHPMAILER_LANG['recipients_failed']    = 'Błąd SMTP: Następujący odbiorcy są nieprawidłowi: ';
+$PHPMAILER_LANG['recipients_failed']    = 'Błąd SMTP: Następujący odbiorcy są nieprawidłowi lub nie istnieją: ';
 $PHPMAILER_LANG['signing']              = 'Błąd podpisywania wiadomości: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() zakończone niepowodzeniem.';
+$PHPMAILER_LANG['smtp_code']            = 'Kod SMTP: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'Dodatkowe informacje SMTP: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Wywołanie funkcji SMTP Connect() zostało zakończone niepowodzeniem.';
+$PHPMAILER_LANG['smtp_detail']          = 'Szczegóły: ';
 $PHPMAILER_LANG['smtp_error']           = 'Błąd SMTP: ';
 $PHPMAILER_LANG['variable_set']         = 'Nie można ustawić lub zmodyfikować zmiennej: ';
-$PHPMAILER_LANG['extension_missing']    = 'Brakujące rozszerzenie: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php
index d8638098..5239865a 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php
@@ -7,24 +7,32 @@
  * @author Lucas Guimarães <lucas@lucasguimaraes.com>
  * @author Phelipe Alves <phelipealvesdesouza@gmail.com>
  * @author Fabio Beneditto <fabiobeneditto@gmail.com>
+ * @author Geidson Benício Coelho <geidsonc@gmail.com>
  */
 
 $PHPMAILER_LANG['authenticate']         = 'Erro de SMTP: Não foi possível autenticar.';
+$PHPMAILER_LANG['buggy_php']            = 'Sua versão do PHP é afetada por um bug que por resultar em messagens corrompidas. Para corrigir, mude para enviar usando SMTP, desative a opção mail.add_x_header em seu php.ini, mude para MacOS ou Linux, ou atualize seu PHP para versão 7.0.17+ ou 7.1.3+ ';
 $PHPMAILER_LANG['connect_host']         = 'Erro de SMTP: Não foi possível conectar ao servidor SMTP.';
 $PHPMAILER_LANG['data_not_accepted']    = 'Erro de SMTP: Dados rejeitados.';
 $PHPMAILER_LANG['empty_message']        = 'Mensagem vazia';
 $PHPMAILER_LANG['encoding']             = 'Codificação desconhecida: ';
 $PHPMAILER_LANG['execute']              = 'Não foi possível executar: ';
+$PHPMAILER_LANG['extension_missing']    = 'Extensão não existe: ';
 $PHPMAILER_LANG['file_access']          = 'Não foi possível acessar o arquivo: ';
 $PHPMAILER_LANG['file_open']            = 'Erro de Arquivo: Não foi possível abrir o arquivo: ';
 $PHPMAILER_LANG['from_failed']          = 'Os seguintes remetentes falharam: ';
 $PHPMAILER_LANG['instantiate']          = 'Não foi possível instanciar a função mail.';
 $PHPMAILER_LANG['invalid_address']      = 'Endereço de e-mail inválido: ';
+$PHPMAILER_LANG['invalid_header']       = 'Nome ou valor de cabeçalho inválido';
+$PHPMAILER_LANG['invalid_hostentry']    = 'hostentry inválido: ';
+$PHPMAILER_LANG['invalid_host']         = 'host inválido: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' mailer não é suportado.';
 $PHPMAILER_LANG['provide_address']      = 'Você deve informar pelo menos um destinatário.';
 $PHPMAILER_LANG['recipients_failed']    = 'Erro de SMTP: Os seguintes destinatários falharam: ';
 $PHPMAILER_LANG['signing']              = 'Erro de Assinatura: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() falhou.';
+$PHPMAILER_LANG['smtp_code']            = 'Código do servidor SMTP: ';
 $PHPMAILER_LANG['smtp_error']           = 'Erro de servidor SMTP: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'Informações adicionais do servidor SMTP: ';
+$PHPMAILER_LANG['smtp_detail']          = 'Detalhes do servidor SMTP: ';
 $PHPMAILER_LANG['variable_set']         = 'Não foi possível definir ou redefinir a variável: ';
-$PHPMAILER_LANG['extension_missing']    = 'Extensão não existe: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ro.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ro.php
index 292ec1e4..45bef915 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ro.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ro.php
@@ -3,25 +3,31 @@
 /**
  * Romanian PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
- * @author Alex Florea <alecz.fia@gmail.com>
  */
 
 $PHPMAILER_LANG['authenticate']         = 'Eroare SMTP: Autentificarea a eșuat.';
+$PHPMAILER_LANG['buggy_php']            = 'Versiunea instalată de PHP este afectată de o problemă care poate duce la coruperea mesajelor Pentru a preveni această problemă, folosiți SMTP, dezactivați opțiunea mail.add_x_header din php.ini, folosiți MacOS/Linux sau actualizați versiunea de PHP la 7.0.17+ sau 7.1.3+.';
 $PHPMAILER_LANG['connect_host']         = 'Eroare SMTP: Conectarea la serverul SMTP a eșuat.';
 $PHPMAILER_LANG['data_not_accepted']    = 'Eroare SMTP: Datele nu au fost acceptate.';
 $PHPMAILER_LANG['empty_message']        = 'Mesajul este gol.';
 $PHPMAILER_LANG['encoding']             = 'Encodare necunoscută: ';
 $PHPMAILER_LANG['execute']              = 'Nu se poate executa următoarea comandă:  ';
+$PHPMAILER_LANG['extension_missing']    = 'Lipsește extensia: ';
 $PHPMAILER_LANG['file_access']          = 'Nu se poate accesa următorul fișier: ';
 $PHPMAILER_LANG['file_open']            = 'Eroare fișier: Nu se poate deschide următorul fișier: ';
 $PHPMAILER_LANG['from_failed']          = 'Următoarele adrese From au dat eroare: ';
 $PHPMAILER_LANG['instantiate']          = 'Funcția mail nu a putut fi inițializată.';
 $PHPMAILER_LANG['invalid_address']      = 'Adresa de email nu este validă: ';
+$PHPMAILER_LANG['invalid_header']       = 'Numele sau valoarea header-ului nu este validă: ';
+$PHPMAILER_LANG['invalid_hostentry']    = 'Hostentry invalid: ';
+$PHPMAILER_LANG['invalid_host']         = 'Host invalid: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' mailer nu este suportat.';
 $PHPMAILER_LANG['provide_address']      = 'Trebuie să adăugați cel puțin o adresă de email.';
 $PHPMAILER_LANG['recipients_failed']    = 'Eroare SMTP: Următoarele adrese de email au eșuat: ';
 $PHPMAILER_LANG['signing']              = 'A aparut o problemă la semnarea emailului. ';
+$PHPMAILER_LANG['smtp_code']            = 'Cod SMTP: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'Informații SMTP adiționale: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'Conectarea la serverul SMTP a eșuat.';
+$PHPMAILER_LANG['smtp_detail']          = 'Detalii SMTP: ';
 $PHPMAILER_LANG['smtp_error']           = 'Eroare server SMTP: ';
 $PHPMAILER_LANG['variable_set']         = 'Nu se poate seta/reseta variabila. ';
-$PHPMAILER_LANG['extension_missing']    = 'Lipsește extensia: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-si.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-si.php
new file mode 100644
index 00000000..dce502aa
--- /dev/null
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-si.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Sinhalese PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Ayesh Karunaratne <ayesh@aye.sh>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP දෝෂය: සත්‍යාපනය අසාර්ථක විය.';
+$PHPMAILER_LANG['buggy_php']            = 'ඔබගේ PHP version එකෙහි පවතින දෝෂයක් නිසා email පණිවිඩ දෝෂ සහගත වීමේ හැකියාවක් ඇත. මෙය විසදීම සදහා SMTP භාවිතා කිරීම, mail.add_x_header INI setting එක අක්‍රීය කිරීම, MacOS හෝ Linux වලට මාරු වීම, හෝ ඔබගේ PHP version එක 7.0.17+ හෝ 7.1.3+ වලට අලුත් කිරීම කරගන්න.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP දෝෂය: සම්බන්ධ වීමට නොහැකි විය.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP දෝෂය: දත්ත පිළිගනු නොලැබේ.';
+$PHPMAILER_LANG['empty_message']        = 'පණිවිඩ අන්තර්ගතය හිස්';
+$PHPMAILER_LANG['encoding']             = 'නොදන්නා කේතනය: ';
+$PHPMAILER_LANG['execute']              = 'ක්‍රියාත්මක කළ නොහැකි විය: ';
+$PHPMAILER_LANG['extension_missing']    = 'Extension එක නොමැත: ';
+$PHPMAILER_LANG['file_access']          = 'File එකට ප්‍රවේශ විය නොහැකි විය: ';
+$PHPMAILER_LANG['file_open']            = 'File දෝෂය: File එක විවෘත කළ නොහැක: ';
+$PHPMAILER_LANG['from_failed']          = 'පහත From ලිපිනයන් අසාර්ථක විය: ';
+$PHPMAILER_LANG['instantiate']          = 'mail function එක ක්‍රියාත්මක කළ නොහැක.';
+$PHPMAILER_LANG['invalid_address']      = 'වලංගු නොවන ලිපිනය: ';
+$PHPMAILER_LANG['invalid_header']       = 'වලංගු නොවන header නාමයක් හෝ අගයක්';
+$PHPMAILER_LANG['invalid_hostentry']    = 'වලංගු නොවන hostentry එකක්: ';
+$PHPMAILER_LANG['invalid_host']         = 'වලංගු නොවන host එකක්: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer සහාය නොදක්වයි.';
+$PHPMAILER_LANG['provide_address']      = 'ඔබ අවම වශයෙන් එක් ලබන්නෙකුගේ ඊමේල් ලිපිනයක් සැපයිය යුතුය.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP දෝෂය: පහත ලබන්නන් අසමත් විය: ';
+$PHPMAILER_LANG['signing']              = 'Sign කිරීමේ දෝෂය: ';
+$PHPMAILER_LANG['smtp_code']            = 'SMTP කේතය: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'අමතර SMTP තොරතුරු: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP සම්බන්ධය අසාර්ථක විය.';
+$PHPMAILER_LANG['smtp_detail']          = 'තොරතුරු: ';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP දෝෂය: ';
+$PHPMAILER_LANG['variable_set']         = 'Variable එක සැකසීමට හෝ නැවත සැකසීමට නොහැක: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php
index c437a886..3e00c259 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php
@@ -9,23 +9,28 @@
  */
 
 $PHPMAILER_LANG['authenticate']         = 'SMTP napaka: Avtentikacija ni uspela.';
+$PHPMAILER_LANG['buggy_php']            = 'Na vašo PHP različico vpliva napaka, ki lahko povzroči poškodovana sporočila. Če želite težavo odpraviti, preklopite na pošiljanje prek SMTP, onemogočite možnost mail.add_x_header v vaši php.ini datoteki, preklopite na MacOS ali Linux, ali nadgradite vašo PHP zaličico na 7.0.17+ ali 7.1.3+.';
 $PHPMAILER_LANG['connect_host']         = 'SMTP napaka: Vzpostavljanje povezave s SMTP gostiteljem ni uspelo.';
 $PHPMAILER_LANG['data_not_accepted']    = 'SMTP napaka: Strežnik zavrača podatke.';
 $PHPMAILER_LANG['empty_message']        = 'E-poštno sporočilo nima vsebine.';
 $PHPMAILER_LANG['encoding']             = 'Nepoznan tip kodiranja: ';
 $PHPMAILER_LANG['execute']              = 'Operacija ni uspela: ';
+$PHPMAILER_LANG['extension_missing']    = 'Manjkajoča razširitev: ';
 $PHPMAILER_LANG['file_access']          = 'Nimam dostopa do datoteke: ';
 $PHPMAILER_LANG['file_open']            = 'Ne morem odpreti datoteke: ';
 $PHPMAILER_LANG['from_failed']          = 'Neveljaven e-naslov pošiljatelja: ';
 $PHPMAILER_LANG['instantiate']          = 'Ne morem inicializirati mail funkcije.';
 $PHPMAILER_LANG['invalid_address']      = 'E-poštno sporočilo ni bilo poslano. E-naslov je neveljaven: ';
+$PHPMAILER_LANG['invalid_header']       = 'Neveljavno ime ali vrednost glave';
 $PHPMAILER_LANG['invalid_hostentry']    = 'Neveljaven vnos gostitelja: ';
 $PHPMAILER_LANG['invalid_host']         = 'Neveljaven gostitelj: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' mailer ni podprt.';
 $PHPMAILER_LANG['provide_address']      = 'Prosimo, vnesite vsaj enega naslovnika.';
 $PHPMAILER_LANG['recipients_failed']    = 'SMTP napaka: Sledeči naslovniki so neveljavni: ';
 $PHPMAILER_LANG['signing']              = 'Napaka pri podpisovanju: ';
+$PHPMAILER_LANG['smtp_code']            = 'SMTP koda: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'Dodatne informacije o SMTP: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'Ne morem vzpostaviti povezave s SMTP strežnikom.';
+$PHPMAILER_LANG['smtp_detail']          = 'Podrobnosti: ';
 $PHPMAILER_LANG['smtp_error']           = 'Napaka SMTP strežnika: ';
 $PHPMAILER_LANG['variable_set']         = 'Ne morem nastaviti oz. ponastaviti spremenljivke: ';
-$PHPMAILER_LANG['extension_missing']    = 'Manjkajoča razširitev: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php
index 728a4994..03d49116 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php
@@ -9,11 +9,13 @@
  */
 
 $PHPMAILER_LANG['authenticate']         = 'SMTP 错误：登录失败。';
+$PHPMAILER_LANG['buggy_php']            = '您的 PHP 版本存在漏洞，可能会导致消息损坏。为修复此问题，请切换到使用 SMTP 发送，在您的 php.ini 中禁用 mail.add_x_header 选项。切换到 MacOS 或 Linux，或将您的 PHP 升级到 7.0.17+ 或 7.1.3+ 版本。';
 $PHPMAILER_LANG['connect_host']         = 'SMTP 错误：无法连接到 SMTP 主机。';
 $PHPMAILER_LANG['data_not_accepted']    = 'SMTP 错误：数据不被接受。';
 $PHPMAILER_LANG['empty_message']        = '邮件正文为空。';
 $PHPMAILER_LANG['encoding']             = '未知编码：';
 $PHPMAILER_LANG['execute']              = '无法执行：';
+$PHPMAILER_LANG['extension_missing']    = '缺少扩展名：';
 $PHPMAILER_LANG['file_access']          = '无法访问文件：';
 $PHPMAILER_LANG['file_open']            = '文件错误：无法打开文件：';
 $PHPMAILER_LANG['from_failed']          = '发送地址错误：';
@@ -22,8 +24,13 @@ $PHPMAILER_LANG['invalid_address']      = '发送失败，电子邮箱地址是
 $PHPMAILER_LANG['mailer_not_supported'] = '发信客户端不被支持。';
 $PHPMAILER_LANG['provide_address']      = '必须提供至少一个收件人地址。';
 $PHPMAILER_LANG['recipients_failed']    = 'SMTP 错误：收件人地址错误：';
-$PHPMAILER_LANG['signing']              = '登录失败：';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP服务器连接失败。';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP服务器出错：';
 $PHPMAILER_LANG['variable_set']         = '无法设置或重置变量：';
-$PHPMAILER_LANG['extension_missing']    = '丢失模块 Extension：';
+$PHPMAILER_LANG['invalid_header']       = '无效的标题名称或值';
+$PHPMAILER_LANG['invalid_hostentry']    = '无效的hostentry： ';
+$PHPMAILER_LANG['invalid_host']         = '无效的主机：';
+$PHPMAILER_LANG['signing']              = '签名错误：';
+$PHPMAILER_LANG['smtp_code']            = 'SMTP代码： ';
+$PHPMAILER_LANG['smtp_code_ex']         = '附加SMTP信息： ';
+$PHPMAILER_LANG['smtp_detail']          = '详情:';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/phpunit.xml.dist b/phpmailer/vendor/phpmailer/phpmailer/phpunit.xml.dist
deleted file mode 100644
index c68df965..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/phpunit.xml.dist
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
-         backupGlobals="true"
-         bootstrap="vendor/autoload.php"
-         verbose="true"
-         colors="true"
-         forceCoversAnnotation="false"
-    >
-    <testsuites>
-        <testsuite name="PHPMailerTests">
-            <directory>./test/</directory>
-        </testsuite>
-    </testsuites>
-    <listeners>
-        <listener class="PHPMailer\Test\DebugLogTestListener" />
-    </listeners>
-    <groups>
-        <exclude>
-            <group>languages</group>
-            <group>pop3</group>
-        </exclude>
-    </groups>
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-        <log type="junit" target="build/logs/junit.xml"/>
-    </logging>
-</phpunit>
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/DSNConfigurator.php b/phpmailer/vendor/phpmailer/phpmailer/src/DSNConfigurator.php
new file mode 100644
index 00000000..566c9618
--- /dev/null
+++ b/phpmailer/vendor/phpmailer/phpmailer/src/DSNConfigurator.php
@@ -0,0 +1,245 @@
+<?php
+
+/**
+ * PHPMailer - PHP email creation and transport class.
+ * PHP Version 5.5.
+ *
+ * @see https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ *
+ * @author    Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author    Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author    Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author    Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2023 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note      This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+namespace PHPMailer\PHPMailer;
+
+/**
+ * Configure PHPMailer with DSN string.
+ *
+ * @see https://en.wikipedia.org/wiki/Data_source_name
+ *
+ * @author Oleg Voronkovich <oleg-voronkovich@yandex.ru>
+ */
+class DSNConfigurator
+{
+    /**
+     * Create new PHPMailer instance configured by DSN.
+     *
+     * @param string $dsn        DSN
+     * @param bool   $exceptions Should we throw external exceptions?
+     *
+     * @return PHPMailer
+     */
+    public static function mailer($dsn, $exceptions = null)
+    {
+        static $configurator = null;
+
+        if (null === $configurator) {
+            $configurator = new DSNConfigurator();
+        }
+
+        return $configurator->configure(new PHPMailer($exceptions), $dsn);
+    }
+
+    /**
+     * Configure PHPMailer instance with DSN string.
+     *
+     * @param PHPMailer $mailer PHPMailer instance
+     * @param string    $dsn    DSN
+     *
+     * @return PHPMailer
+     */
+    public function configure(PHPMailer $mailer, $dsn)
+    {
+        $config = $this->parseDSN($dsn);
+
+        $this->applyConfig($mailer, $config);
+
+        return $mailer;
+    }
+
+    /**
+     * Parse DSN string.
+     *
+     * @param string $dsn DSN
+     *
+     * @throws Exception If DSN is malformed
+     *
+     * @return array Configuration
+     */
+    private function parseDSN($dsn)
+    {
+        $config = $this->parseUrl($dsn);
+
+        if (false === $config || !isset($config['scheme']) || !isset($config['host'])) {
+            throw new Exception('Malformed DSN');
+        }
+
+        if (isset($config['query'])) {
+            parse_str($config['query'], $config['query']);
+        }
+
+        return $config;
+    }
+
+    /**
+     * Apply configuration to mailer.
+     *
+     * @param PHPMailer $mailer PHPMailer instance
+     * @param array     $config Configuration
+     *
+     * @throws Exception If scheme is invalid
+     */
+    private function applyConfig(PHPMailer $mailer, $config)
+    {
+        switch ($config['scheme']) {
+            case 'mail':
+                $mailer->isMail();
+                break;
+            case 'sendmail':
+                $mailer->isSendmail();
+                break;
+            case 'qmail':
+                $mailer->isQmail();
+                break;
+            case 'smtp':
+            case 'smtps':
+                $mailer->isSMTP();
+                $this->configureSMTP($mailer, $config);
+                break;
+            default:
+                throw new Exception(
+                    sprintf(
+                        'Invalid scheme: "%s". Allowed values: "mail", "sendmail", "qmail", "smtp", "smtps".',
+                        $config['scheme']
+                    )
+                );
+        }
+
+        if (isset($config['query'])) {
+            $this->configureOptions($mailer, $config['query']);
+        }
+    }
+
+    /**
+     * Configure SMTP.
+     *
+     * @param PHPMailer $mailer PHPMailer instance
+     * @param array     $config Configuration
+     */
+    private function configureSMTP($mailer, $config)
+    {
+        $isSMTPS = 'smtps' === $config['scheme'];
+
+        if ($isSMTPS) {
+            $mailer->SMTPSecure = PHPMailer::ENCRYPTION_STARTTLS;
+        }
+
+        $mailer->Host = $config['host'];
+
+        if (isset($config['port'])) {
+            $mailer->Port = $config['port'];
+        } elseif ($isSMTPS) {
+            $mailer->Port = SMTP::DEFAULT_SECURE_PORT;
+        }
+
+        $mailer->SMTPAuth = isset($config['user']) || isset($config['pass']);
+
+        if (isset($config['user'])) {
+            $mailer->Username = $config['user'];
+        }
+
+        if (isset($config['pass'])) {
+            $mailer->Password = $config['pass'];
+        }
+    }
+
+    /**
+     * Configure options.
+     *
+     * @param PHPMailer $mailer  PHPMailer instance
+     * @param array     $options Options
+     *
+     * @throws Exception If option is unknown
+     */
+    private function configureOptions(PHPMailer $mailer, $options)
+    {
+        $allowedOptions = get_object_vars($mailer);
+
+        unset($allowedOptions['Mailer']);
+        unset($allowedOptions['SMTPAuth']);
+        unset($allowedOptions['Username']);
+        unset($allowedOptions['Password']);
+        unset($allowedOptions['Hostname']);
+        unset($allowedOptions['Port']);
+        unset($allowedOptions['ErrorInfo']);
+
+        $allowedOptions = \array_keys($allowedOptions);
+
+        foreach ($options as $key => $value) {
+            if (!in_array($key, $allowedOptions)) {
+                throw new Exception(
+                    sprintf(
+                        'Unknown option: "%s". Allowed values: "%s"',
+                        $key,
+                        implode('", "', $allowedOptions)
+                    )
+                );
+            }
+
+            switch ($key) {
+                case 'AllowEmpty':
+                case 'SMTPAutoTLS':
+                case 'SMTPKeepAlive':
+                case 'SingleTo':
+                case 'UseSendmailOptions':
+                case 'do_verp':
+                case 'DKIM_copyHeaderFields':
+                    $mailer->$key = (bool) $value;
+                    break;
+                case 'Priority':
+                case 'SMTPDebug':
+                case 'WordWrap':
+                    $mailer->$key = (int) $value;
+                    break;
+                default:
+                    $mailer->$key = $value;
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Parse a URL.
+     * Wrapper for the built-in parse_url function to work around a bug in PHP 5.5.
+     *
+     * @param string $url URL
+     *
+     * @return array|false
+     */
+    protected function parseUrl($url)
+    {
+        if (\PHP_VERSION_ID >= 50600 || false === strpos($url, '?')) {
+            return parse_url($url);
+        }
+
+        $chunks = explode('?', $url);
+        if (is_array($chunks)) {
+            $result = parse_url($chunks[0]);
+            if (is_array($result)) {
+                $result['query'] = $chunks[1];
+            }
+            return $result;
+        }
+
+        return false;
+    }
+}
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/Exception.php b/phpmailer/vendor/phpmailer/phpmailer/src/Exception.php
index a50a8991..52eaf951 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/src/Exception.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/src/Exception.php
@@ -35,6 +35,6 @@ class Exception extends \Exception
      */
     public function errorMessage()
     {
-        return '<strong>' . htmlspecialchars($this->getMessage()) . "</strong><br />\n";
+        return '<strong>' . htmlspecialchars($this->getMessage(), ENT_COMPAT | ENT_HTML401) . "</strong><br />\n";
     }
 }
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/OAuth.php b/phpmailer/vendor/phpmailer/phpmailer/src/OAuth.php
index c93d0be1..c1d5b776 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/src/OAuth.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/src/OAuth.php
@@ -33,7 +33,7 @@ use League\OAuth2\Client\Token\AccessToken;
  *
  * @author  Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
  */
-class OAuth
+class OAuth implements OAuthTokenProvider
 {
     /**
      * An instance of the League OAuth Client Provider.
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php b/phpmailer/vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php
new file mode 100644
index 00000000..11555074
--- /dev/null
+++ b/phpmailer/vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * PHPMailer - PHP email creation and transport class.
+ * PHP Version 5.5.
+ *
+ * @see https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ *
+ * @author    Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author    Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author    Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author    Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2020 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note      This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+namespace PHPMailer\PHPMailer;
+
+/**
+ * OAuthTokenProvider - OAuth2 token provider interface.
+ * Provides base64 encoded OAuth2 auth strings for SMTP authentication.
+ *
+ * @see     OAuth
+ * @see     SMTP::authenticate()
+ *
+ * @author  Peter Scopes (pdscopes)
+ * @author  Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ */
+interface OAuthTokenProvider
+{
+    /**
+     * Generate a base64-encoded OAuth token ensuring that the access token has not expired.
+     * The string to be base 64 encoded should be in the form:
+     * "user=<user_email_address>\001auth=Bearer <access_token>\001\001"
+     *
+     * @return string
+     */
+    public function getOauth64();
+}
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/PHPMailer.php b/phpmailer/vendor/phpmailer/phpmailer/src/PHPMailer.php
index eb4b742b..ba4bcd47 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/src/PHPMailer.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/src/PHPMailer.php
@@ -103,14 +103,14 @@ class PHPMailer
      *
      * @var string
      */
-    public $From = 'root@localhost';
+    public $From = '';
 
     /**
      * The From name of the message.
      *
      * @var string
      */
-    public $FromName = 'Root User';
+    public $FromName = '';
 
     /**
      * The envelope sender of the message.
@@ -350,17 +350,24 @@ class PHPMailer
     public $Password = '';
 
     /**
-     * SMTP auth type.
-     * Options are CRAM-MD5, LOGIN, PLAIN, XOAUTH2, attempted in that order if not specified.
+     * SMTP authentication type. Options are CRAM-MD5, LOGIN, PLAIN, XOAUTH2.
+     * If not specified, the first one from that list that the server supports will be selected.
      *
      * @var string
      */
     public $AuthType = '';
 
     /**
-     * An instance of the PHPMailer OAuth class.
+     * SMTP SMTPXClient command attibutes
      *
-     * @var OAuth
+     * @var array
+     */
+    protected $SMTPXClient = [];
+
+    /**
+     * An implementation of the PHPMailer OAuthTokenProvider interface.
+     *
+     * @var OAuthTokenProvider
      */
     protected $oauth;
 
@@ -689,7 +696,7 @@ class PHPMailer
     protected $boundary = [];
 
     /**
-     * The array of available languages.
+     * The array of available text strings for the current language.
      *
      * @var array
      */
@@ -750,7 +757,7 @@ class PHPMailer
      *
      * @var string
      */
-    const VERSION = '6.5.0';
+    const VERSION = '6.9.1';
 
     /**
      * Error severity: message only, continue processing.
@@ -795,7 +802,7 @@ class PHPMailer
      * The maximum line length supported by mail().
      *
      * Background: mail() will sometimes corrupt messages
-     * with headers headers longer than 65 chars, see #818.
+     * with headers longer than 65 chars, see #818.
      *
      * @var int
      */
@@ -858,7 +865,7 @@ class PHPMailer
     private function mailPassthru($to, $subject, $body, $header, $params)
     {
         //Check overloading of mail function to avoid double-encoding
-        if (ini_get('mbstring.func_overload') & 1) {
+        if ((int)ini_get('mbstring.func_overload') & 1) {
             $subject = $this->secureHeader($subject);
         } else {
             $subject = $this->encodeHeader($this->secureHeader($subject));
@@ -1066,8 +1073,8 @@ class PHPMailer
      * Addresses that have been added already return false, but do not throw exceptions.
      *
      * @param string $kind    One of 'to', 'cc', 'bcc', or 'ReplyTo'
-     * @param string $address The email address to send, resp. to reply to
-     * @param string $name
+     * @param string $address The email address
+     * @param string $name    An optional username associated with the address
      *
      * @throws Exception
      *
@@ -1075,9 +1082,11 @@ class PHPMailer
      */
     protected function addOrEnqueueAnAddress($kind, $address, $name)
     {
-        $address = trim($address);
-        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-        $pos = strrpos($address, '@');
+        $pos = false;
+        if ($address !== null) {
+            $address = trim($address);
+            $pos = strrpos($address, '@');
+        }
         if (false === $pos) {
             //At-sign is missing.
             $error_message = sprintf(
@@ -1094,8 +1103,14 @@ class PHPMailer
 
             return false;
         }
+        if ($name !== null && is_string($name)) {
+            $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+        } else {
+            $name = '';
+        }
         $params = [$kind, $address, $name];
         //Enqueue addresses with IDN until we know the PHPMailer::$CharSet.
+        //Domain is assumed to be whatever is after the last @ symbol in the address
         if (static::idnSupported() && $this->has8bitChars(substr($address, ++$pos))) {
             if ('Reply-To' !== $kind) {
                 if (!array_key_exists($address, $this->RecipientsQueue)) {
@@ -1116,6 +1131,22 @@ class PHPMailer
         return call_user_func_array([$this, 'addAnAddress'], $params);
     }
 
+    /**
+     * Set the boundaries to use for delimiting MIME parts.
+     * If you override this, ensure you set all 3 boundaries to unique values.
+     * The default boundaries include a "=_" sequence which cannot occur in quoted-printable bodies,
+     * as suggested by https://www.rfc-editor.org/rfc/rfc2045#section-6.7
+     *
+     * @return void
+     */
+    public function setBoundaries()
+    {
+        $this->uniqueid = $this->generateId();
+        $this->boundary[1] = 'b1=_' . $this->uniqueid;
+        $this->boundary[2] = 'b2=_' . $this->uniqueid;
+        $this->boundary[3] = 'b3=_' . $this->uniqueid;
+    }
+
     /**
      * Add an address to one of the recipient arrays or to the ReplyTo array.
      * Addresses that have been added already return false, but do not throw exceptions.
@@ -1185,28 +1216,37 @@ class PHPMailer
      *
      * @param string $addrstr The address list string
      * @param bool   $useimap Whether to use the IMAP extension to parse the list
+     * @param string $charset The charset to use when decoding the address list string.
      *
      * @return array
      */
-    public static function parseAddresses($addrstr, $useimap = true)
+    public static function parseAddresses($addrstr, $useimap = true, $charset = self::CHARSET_ISO88591)
     {
         $addresses = [];
         if ($useimap && function_exists('imap_rfc822_parse_adrlist')) {
             //Use this built-in parser if it's available
             $list = imap_rfc822_parse_adrlist($addrstr, '');
+            // Clear any potential IMAP errors to get rid of notices being thrown at end of script.
+            imap_errors();
             foreach ($list as $address) {
                 if (
-                    ('.SYNTAX-ERROR.' !== $address->host) && static::validateAddress(
-                        $address->mailbox . '@' . $address->host
-                    )
+                    '.SYNTAX-ERROR.' !== $address->host &&
+                    static::validateAddress($address->mailbox . '@' . $address->host)
                 ) {
                     //Decode the name part if it's present and encoded
                     if (
                         property_exists($address, 'personal') &&
-                        extension_loaded('mbstring') &&
-                        preg_match('/^=\?.*\?=$/', $address->personal)
+                        //Check for a Mbstring constant rather than using extension_loaded, which is sometimes disabled
+                        defined('MB_CASE_UPPER') &&
+                        preg_match('/^=\?.*\?=$/s', $address->personal)
                     ) {
+                        $origCharset = mb_internal_encoding();
+                        mb_internal_encoding($charset);
+                        //Undo any RFC2047-encoded spaces-as-underscores
+                        $address->personal = str_replace('_', '=20', $address->personal);
+                        //Decode the name
                         $address->personal = mb_decode_mimeheader($address->personal);
+                        mb_internal_encoding($origCharset);
                     }
 
                     $addresses[] = [
@@ -1234,9 +1274,16 @@ class PHPMailer
                     $email = trim(str_replace('>', '', $email));
                     $name = trim($name);
                     if (static::validateAddress($email)) {
+                        //Check for a Mbstring constant rather than using extension_loaded, which is sometimes disabled
                         //If this name is encoded, decode it
-                        if (preg_match('/^=\?.*\?=$/', $name)) {
+                        if (defined('MB_CASE_UPPER') && preg_match('/^=\?.*\?=$/s', $name)) {
+                            $origCharset = mb_internal_encoding();
+                            mb_internal_encoding($charset);
+                            //Undo any RFC2047-encoded spaces-as-underscores
+                            $name = str_replace('_', '=20', $name);
+                            //Decode the name
                             $name = mb_decode_mimeheader($name);
+                            mb_internal_encoding($origCharset);
                         }
                         $addresses[] = [
                             //Remove any surrounding quotes and spaces from the name
@@ -1264,7 +1311,7 @@ class PHPMailer
      */
     public function setFrom($address, $name = '', $auto = true)
     {
-        $address = trim($address);
+        $address = trim((string)$address);
         $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
         //Don't validate now addresses with IDN. Will be done in send().
         $pos = strrpos($address, '@');
@@ -1436,7 +1483,12 @@ class PHPMailer
                 $errorcode = 0;
                 if (defined('INTL_IDNA_VARIANT_UTS46')) {
                     //Use the current punycode standard (appeared in PHP 7.2)
-                    $punycode = idn_to_ascii($domain, $errorcode, \INTL_IDNA_VARIANT_UTS46);
+                    $punycode = idn_to_ascii(
+                        $domain,
+                        \IDNA_DEFAULT | \IDNA_USE_STD3_RULES | \IDNA_CHECK_BIDI |
+                            \IDNA_CHECK_CONTEXTJ | \IDNA_NONTRANSITIONAL_TO_ASCII,
+                        \INTL_IDNA_VARIANT_UTS46
+                    );
                 } elseif (defined('INTL_IDNA_VARIANT_2003')) {
                     //Fall back to this old, deprecated/removed encoding
                     $punycode = idn_to_ascii($domain, $errorcode, \INTL_IDNA_VARIANT_2003);
@@ -1508,12 +1560,7 @@ class PHPMailer
             && ini_get('mail.add_x_header') === '1'
             && stripos(PHP_OS, 'WIN') === 0
         ) {
-            trigger_error(
-                'Your version of PHP is affected by a bug that may result in corrupted messages.' .
-                ' To fix it, switch to sending using SMTP, disable the mail.add_x_header option in' .
-                ' your php.ini, switch to MacOS or Linux, or upgrade your PHP to version 7.0.17+ or 7.1.3+.',
-                E_USER_WARNING
-            );
+            trigger_error($this->lang('buggy_php'), E_USER_WARNING);
         }
 
         try {
@@ -1531,17 +1578,21 @@ class PHPMailer
 
             //Validate From, Sender, and ConfirmReadingTo addresses
             foreach (['From', 'Sender', 'ConfirmReadingTo'] as $address_kind) {
-                $this->$address_kind = trim($this->$address_kind);
-                if (empty($this->$address_kind)) {
+                if ($this->{$address_kind} === null) {
+                    $this->{$address_kind} = '';
                     continue;
                 }
-                $this->$address_kind = $this->punyencodeAddress($this->$address_kind);
-                if (!static::validateAddress($this->$address_kind)) {
+                $this->{$address_kind} = trim($this->{$address_kind});
+                if (empty($this->{$address_kind})) {
+                    continue;
+                }
+                $this->{$address_kind} = $this->punyencodeAddress($this->{$address_kind});
+                if (!static::validateAddress($this->{$address_kind})) {
                     $error_message = sprintf(
                         '%s (%s): %s',
                         $this->lang('invalid_address'),
                         $address_kind,
-                        $this->$address_kind
+                        $this->{$address_kind}
                     );
                     $this->setError($error_message);
                     $this->edebug($error_message);
@@ -1641,17 +1692,17 @@ class PHPMailer
                 default:
                     $sendMethod = $this->Mailer . 'Send';
                     if (method_exists($this, $sendMethod)) {
-                        return $this->$sendMethod($this->MIMEHeader, $this->MIMEBody);
+                        return $this->{$sendMethod}($this->MIMEHeader, $this->MIMEBody);
                     }
 
                     return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
             }
         } catch (Exception $exc) {
-            if ($this->Mailer === 'smtp' && $this->SMTPKeepAlive == true) {
-                $this->smtp->reset();
-            }
             $this->setError($exc->getMessage());
             $this->edebug($exc->getMessage());
+            if ($this->Mailer === 'smtp' && $this->SMTPKeepAlive == true && $this->smtp->connected()) {
+                $this->smtp->reset();
+            }
             if ($this->exceptions) {
                 throw $exc;
             }
@@ -1687,7 +1738,10 @@ class PHPMailer
         //Sendmail docs: http://www.sendmail.org/~ca/email/man/sendmail.html
         //Qmail docs: http://www.qmail.org/man/man8/qmail-inject.html
         //Example problem: https://www.drupal.org/node/1057954
-        if (empty($this->Sender) && !empty(ini_get('sendmail_from'))) {
+
+        //PHP 5.6 workaround
+        $sendmail_from_value = ini_get('sendmail_from');
+        if (empty($this->Sender) && !empty($sendmail_from_value)) {
             //PHP config has a sender address we can use
             $this->Sender = ini_get('sendmail_from');
         }
@@ -1724,7 +1778,7 @@ class PHPMailer
                 fwrite($mail, $header);
                 fwrite($mail, $body);
                 $result = pclose($mail);
-                $addrinfo = static::parseAddresses($toAddr);
+                $addrinfo = static::parseAddresses($toAddr, true, $this->CharSet);
                 $this->doCallback(
                     ($result === 0),
                     [[$addrinfo['address'], $addrinfo['name']]],
@@ -1779,7 +1833,13 @@ class PHPMailer
      */
     protected static function isShellSafe($string)
     {
-        //Future-proof
+        //It's not possible to use shell commands safely (which includes the mail() function) without escapeshellarg,
+        //but some hosting providers disable it, creating a security problem that we don't want to have to deal with,
+        //so we don't.
+        if (!function_exists('escapeshellarg') || !function_exists('escapeshellcmd')) {
+            return false;
+        }
+
         if (
             escapeshellcmd($string) !== $string
             || !in_array(escapeshellarg($string), ["'$string'", "\"$string\""])
@@ -1830,7 +1890,7 @@ class PHPMailer
         if (!static::isPermittedPath($path)) {
             return false;
         }
-        $readable = file_exists($path);
+        $readable = is_file($path);
         //If not a UNC path (expected to start with \\), check read permission, see #2069
         if (strpos($path, '\\\\') !== 0) {
             $readable = $readable && is_readable($path);
@@ -1858,7 +1918,14 @@ class PHPMailer
         foreach ($this->to as $toaddr) {
             $toArr[] = $this->addrFormat($toaddr);
         }
-        $to = implode(', ', $toArr);
+        $to = trim(implode(', ', $toArr));
+
+        //If there are no To-addresses (e.g. when sending only to BCC-addresses)
+        //the following should be added to get a correct DKIM-signature.
+        //Compare with $this->preSend()
+        if ($to === '') {
+            $to = 'undisclosed-recipients:;';
+        }
 
         $params = null;
         //This sets the SMTP envelope sender which gets turned into a return-path header by the receiver
@@ -1869,7 +1936,10 @@ class PHPMailer
         //Qmail docs: http://www.qmail.org/man/man8/qmail-inject.html
         //Example problem: https://www.drupal.org/node/1057954
         //CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
-        if (empty($this->Sender) && !empty(ini_get('sendmail_from'))) {
+
+        //PHP 5.6 workaround
+        $sendmail_from_value = ini_get('sendmail_from');
+        if (empty($this->Sender) && !empty($sendmail_from_value)) {
             //PHP config has a sender address we can use
             $this->Sender = ini_get('sendmail_from');
         }
@@ -1884,7 +1954,7 @@ class PHPMailer
         if ($this->SingleTo && count($toArr) > 1) {
             foreach ($toArr as $toAddr) {
                 $result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params);
-                $addrinfo = static::parseAddresses($toAddr);
+                $addrinfo = static::parseAddresses($toAddr, true, $this->CharSet);
                 $this->doCallback(
                     $result,
                     [[$addrinfo['address'], $addrinfo['name']]],
@@ -1938,6 +2008,38 @@ class PHPMailer
         return $this->smtp;
     }
 
+    /**
+     * Provide SMTP XCLIENT attributes
+     *
+     * @param string $name  Attribute name
+     * @param ?string $value Attribute value
+     *
+     * @return bool
+     */
+    public function setSMTPXclientAttribute($name, $value)
+    {
+        if (!in_array($name, SMTP::$xclient_allowed_attributes)) {
+            return false;
+        }
+        if (isset($this->SMTPXClient[$name]) && $value === null) {
+            unset($this->SMTPXClient[$name]);
+        } elseif ($value !== null) {
+            $this->SMTPXClient[$name] = $value;
+        }
+
+        return true;
+    }
+
+    /**
+     * Get SMTP XCLIENT attributes
+     *
+     * @return array
+     */
+    public function getSMTPXclientAttributes()
+    {
+        return $this->SMTPXClient;
+    }
+
     /**
      * Send mail via SMTP.
      * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
@@ -1966,6 +2068,9 @@ class PHPMailer
         } else {
             $smtp_from = $this->Sender;
         }
+        if (count($this->SMTPXClient)) {
+            $this->smtp->xclient($this->SMTPXClient);
+        }
         if (!$this->smtp->mail($smtp_from)) {
             $this->setError($this->lang('from_failed') . $smtp_from . ' : ' . implode(',', $this->smtp->getError()));
             throw new Exception($this->ErrorInfo, self::STOP_CRITICAL);
@@ -2058,6 +2163,9 @@ class PHPMailer
         $this->smtp->setDebugLevel($this->SMTPDebug);
         $this->smtp->setDebugOutput($this->Debugoutput);
         $this->smtp->setVerp($this->do_verp);
+        if ($this->Host === null) {
+            $this->Host = 'localhost';
+        }
         $hosts = explode(';', $this->Host);
         $lastexception = null;
 
@@ -2125,15 +2233,23 @@ class PHPMailer
                     $this->smtp->hello($hello);
                     //Automatically enable TLS encryption if:
                     //* it's not disabled
+                    //* we are not connecting to localhost
                     //* we have openssl extension
                     //* we are not already using SSL
                     //* the server offers STARTTLS
-                    if ($this->SMTPAutoTLS && $sslext && 'ssl' !== $secure && $this->smtp->getServerExt('STARTTLS')) {
+                    if (
+                        $this->SMTPAutoTLS &&
+                        $this->Host !== 'localhost' &&
+                        $sslext &&
+                        $secure !== 'ssl' &&
+                        $this->smtp->getServerExt('STARTTLS')
+                    ) {
                         $tls = true;
                     }
                     if ($tls) {
                         if (!$this->smtp->startTLS()) {
-                            throw new Exception($this->lang('connect_host'));
+                            $message = $this->getSmtpErrorMessage('connect_host');
+                            throw new Exception($message);
                         }
                         //We must resend EHLO after TLS negotiation
                         $this->smtp->hello($hello);
@@ -2164,6 +2280,11 @@ class PHPMailer
         if ($this->exceptions && null !== $lastexception) {
             throw $lastexception;
         }
+        if ($this->exceptions) {
+            // no exception was thrown, likely $this->smtp->connect() failed
+            $message = $this->getSmtpErrorMessage('connect_host');
+            throw new Exception($message);
+        }
 
         return false;
     }
@@ -2181,14 +2302,15 @@ class PHPMailer
 
     /**
      * Set the language for error messages.
-     * Returns false if it cannot load the language file.
      * The default language is English.
      *
      * @param string $langcode  ISO 639-1 2-character language code (e.g. French is "fr")
-     * @param string $lang_path Path to the language file directory, with trailing separator (slash).D
+     *                          Optionally, the language code can be enhanced with a 4-character
+     *                          script annotation and/or a 2-character country annotation.
+     * @param string $lang_path Path to the language file directory, with trailing separator (slash)
      *                          Do not set this from user input!
      *
-     * @return bool
+     * @return bool Returns true if the requested language was loaded, false otherwise.
      */
     public function setLanguage($langcode = 'en', $lang_path = '')
     {
@@ -2211,44 +2333,77 @@ class PHPMailer
         //Define full set of translatable strings in English
         $PHPMAILER_LANG = [
             'authenticate' => 'SMTP Error: Could not authenticate.',
+            'buggy_php' => 'Your version of PHP is affected by a bug that may result in corrupted messages.' .
+                ' To fix it, switch to sending using SMTP, disable the mail.add_x_header option in' .
+                ' your php.ini, switch to MacOS or Linux, or upgrade your PHP to version 7.0.17+ or 7.1.3+.',
             'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
             'data_not_accepted' => 'SMTP Error: data not accepted.',
             'empty_message' => 'Message body empty',
             'encoding' => 'Unknown encoding: ',
             'execute' => 'Could not execute: ',
+            'extension_missing' => 'Extension missing: ',
             'file_access' => 'Could not access file: ',
             'file_open' => 'File Error: Could not open file: ',
             'from_failed' => 'The following From address failed: ',
             'instantiate' => 'Could not instantiate mail function.',
             'invalid_address' => 'Invalid address: ',
+            'invalid_header' => 'Invalid header name or value',
             'invalid_hostentry' => 'Invalid hostentry: ',
             'invalid_host' => 'Invalid host: ',
             'mailer_not_supported' => ' mailer is not supported.',
             'provide_address' => 'You must provide at least one recipient email address.',
             'recipients_failed' => 'SMTP Error: The following recipients failed: ',
             'signing' => 'Signing Error: ',
+            'smtp_code' => 'SMTP code: ',
+            'smtp_code_ex' => 'Additional SMTP info: ',
             'smtp_connect_failed' => 'SMTP connect() failed.',
+            'smtp_detail' => 'Detail: ',
             'smtp_error' => 'SMTP server error: ',
             'variable_set' => 'Cannot set or reset variable: ',
-            'extension_missing' => 'Extension missing: ',
         ];
         if (empty($lang_path)) {
             //Calculate an absolute path so it can work if CWD is not here
             $lang_path = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'language' . DIRECTORY_SEPARATOR;
         }
+
         //Validate $langcode
-        if (!preg_match('/^[a-z]{2}(?:_[a-zA-Z]{2})?$/', $langcode)) {
+        $foundlang = true;
+        $langcode  = strtolower($langcode);
+        if (
+            !preg_match('/^(?P<lang>[a-z]{2})(?P<script>_[a-z]{4})?(?P<country>_[a-z]{2})?$/', $langcode, $matches)
+            && $langcode !== 'en'
+        ) {
+            $foundlang = false;
             $langcode = 'en';
         }
-        $foundlang = true;
-        $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php';
+
         //There is no English translation file
         if ('en' !== $langcode) {
-            //Make sure language file path is readable
-            if (!static::fileIsAccessible($lang_file)) {
+            $langcodes = [];
+            if (!empty($matches['script']) && !empty($matches['country'])) {
+                $langcodes[] = $matches['lang'] . $matches['script'] . $matches['country'];
+            }
+            if (!empty($matches['country'])) {
+                $langcodes[] = $matches['lang'] . $matches['country'];
+            }
+            if (!empty($matches['script'])) {
+                $langcodes[] = $matches['lang'] . $matches['script'];
+            }
+            $langcodes[] = $matches['lang'];
+
+            //Try and find a readable language file for the requested language.
+            $foundFile = false;
+            foreach ($langcodes as $code) {
+                $lang_file = $lang_path . 'phpmailer.lang-' . $code . '.php';
+                if (static::fileIsAccessible($lang_file)) {
+                    $foundFile = true;
+                    break;
+                }
+            }
+
+            if ($foundFile === false) {
                 $foundlang = false;
             } else {
-                //$foundlang = include $lang_file;
                 $lines = file($lang_file);
                 foreach ($lines as $line) {
                     //Translation file lines look like this:
@@ -2283,6 +2438,10 @@ class PHPMailer
      */
     public function getTranslations()
     {
+        if (empty($this->language)) {
+            $this->setLanguage(); // Set the default language.
+        }
+
         return $this->language;
     }
 
@@ -2317,7 +2476,7 @@ class PHPMailer
      */
     public function addrFormat($addr)
     {
-        if (empty($addr[1])) { //No name provided
+        if (!isset($addr[1]) || ($addr[1] === '')) { //No name provided
             return $this->secureHeader($addr[0]);
         }
 
@@ -2551,7 +2710,17 @@ class PHPMailer
 
         //Only allow a custom message ID if it conforms to RFC 5322 section 3.6.4
         //https://tools.ietf.org/html/rfc5322#section-3.6.4
-        if ('' !== $this->MessageID && preg_match('/^<.*@.*>$/', $this->MessageID)) {
+        if (
+            '' !== $this->MessageID &&
+            preg_match(
+                '/^<((([a-z\d!#$%&\'*+\/=?^_`{|}~-]+(\.[a-z\d!#$%&\'*+\/=?^_`{|}~-]+)*)' .
+                '|("(([\x01-\x08\x0B\x0C\x0E-\x1F\x7F]|[\x21\x23-\x5B\x5D-\x7E])' .
+                '|(\\[\x01-\x09\x0B\x0C\x0E-\x7F]))*"))@(([a-z\d!#$%&\'*+\/=?^_`{|}~-]+' .
+                '(\.[a-z\d!#$%&\'*+\/=?^_`{|}~-]+)*)|(\[(([\x01-\x08\x0B\x0C\x0E-\x1F\x7F]' .
+                '|[\x21-\x5A\x5E-\x7E])|(\\[\x01-\x09\x0B\x0C\x0E-\x7F]))*\])))>$/Di',
+                $this->MessageID
+            )
+        ) {
             $this->lastMessageID = $this->MessageID;
         } else {
             $this->lastMessageID = sprintf('<%s@%s>', $this->uniqueid, $this->serverHostname());
@@ -2561,16 +2730,15 @@ class PHPMailer
             $result .= $this->headerLine('X-Priority', $this->Priority);
         }
         if ('' === $this->XMailer) {
+            //Empty string for default X-Mailer header
             $result .= $this->headerLine(
                 'X-Mailer',
                 'PHPMailer ' . self::VERSION . ' (https://github.com/PHPMailer/PHPMailer)'
             );
-        } else {
-            $myXmailer = trim($this->XMailer);
-            if ($myXmailer) {
-                $result .= $this->headerLine('X-Mailer', $myXmailer);
-            }
-        }
+        } elseif (is_string($this->XMailer) && trim($this->XMailer) !== '') {
+            //Some string
+            $result .= $this->headerLine('X-Mailer', trim($this->XMailer));
+        } //Other values result in no X-Mailer header
 
         if ('' !== $this->ConfirmReadingTo) {
             $result .= $this->headerLine('Disposition-Notification-To', '<' . $this->ConfirmReadingTo . '>');
@@ -2695,10 +2863,7 @@ class PHPMailer
     {
         $body = '';
         //Create unique IDs and preset boundaries
-        $this->uniqueid = $this->generateId();
-        $this->boundary[1] = 'b1_' . $this->uniqueid;
-        $this->boundary[2] = 'b2_' . $this->uniqueid;
-        $this->boundary[3] = 'b3_' . $this->uniqueid;
+        $this->setBoundaries();
 
         if ($this->sign_key_file) {
             $body .= $this->getMailMIME() . static::$LE;
@@ -2734,7 +2899,7 @@ class PHPMailer
             $altBodyEncoding = static::ENCODING_QUOTED_PRINTABLE;
         }
         //Use this as a preamble in all multipart message types
-        $mimepre = 'This is a multi-part message in MIME format.' . static::$LE . static::$LE;
+        $mimepre = '';
         switch ($this->message_type) {
             case 'inline':
                 $body .= $mimepre;
@@ -2970,6 +3135,18 @@ class PHPMailer
         return $body;
     }
 
+    /**
+     * Get the boundaries that this message will use
+     * @return array
+     */
+    public function getBoundaries()
+    {
+        if (empty($this->boundary)) {
+            $this->setBoundaries();
+        }
+        return $this->boundary;
+    }
+
     /**
      * Return the start of a message boundary.
      *
@@ -3625,20 +3802,21 @@ class PHPMailer
      * These differ from 'regular' attachments in that they are intended to be
      * displayed inline with the message, not just attached for download.
      * This is used in HTML messages that embed the images
-     * the HTML refers to using the $cid value.
+     * the HTML refers to using the `$cid` value in `img` tags, for example `<img src="cid:mylogo">`.
      * Never use a user-supplied path to a file!
      *
      * @param string $path        Path to the attachment
      * @param string $cid         Content ID of the attachment; Use this to reference
      *                            the content when using an embedded image in HTML
-     * @param string $name        Overrides the attachment name
-     * @param string $encoding    File encoding (see $Encoding)
-     * @param string $type        File MIME type
-     * @param string $disposition Disposition to use
-     *
-     * @throws Exception
+     * @param string $name        Overrides the attachment filename
+     * @param string $encoding    File encoding (see $Encoding) defaults to `base64`
+     * @param string $type        File MIME type (by default mapped from the `$path` filename's extension)
+     * @param string $disposition Disposition to use: `inline` (default) or `attachment`
+     *                            (unlikely you want this – {@see `addAttachment()`} instead)
      *
      * @return bool True on successfully adding an attachment
+     * @throws Exception
+     *
      */
     public function addEmbeddedImage(
         $path,
@@ -3922,6 +4100,79 @@ class PHPMailer
         $this->CustomHeader = [];
     }
 
+    /**
+     * Clear a specific custom header by name or name and value.
+     * $name value can be overloaded to contain
+     * both header name and value (name:value).
+     *
+     * @param string      $name  Custom header name
+     * @param string|null $value Header value
+     *
+     * @return bool True if a header was replaced successfully
+     */
+    public function clearCustomHeader($name, $value = null)
+    {
+        if (null === $value && strpos($name, ':') !== false) {
+            //Value passed in as name:value
+            list($name, $value) = explode(':', $name, 2);
+        }
+        $name = trim($name);
+        $value = (null === $value) ? null : trim($value);
+
+        foreach ($this->CustomHeader as $k => $pair) {
+            if ($pair[0] == $name) {
+                // We remove the header if the value is not provided or it matches.
+                if (null === $value ||  $pair[1] == $value) {
+                    unset($this->CustomHeader[$k]);
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Replace a custom header.
+     * $name value can be overloaded to contain
+     * both header name and value (name:value).
+     *
+     * @param string      $name  Custom header name
+     * @param string|null $value Header value
+     *
+     * @return bool True if a header was replaced successfully
+     * @throws Exception
+     */
+    public function replaceCustomHeader($name, $value = null)
+    {
+        if (null === $value && strpos($name, ':') !== false) {
+            //Value passed in as name:value
+            list($name, $value) = explode(':', $name, 2);
+        }
+        $name = trim($name);
+        $value = (null === $value) ? '' : trim($value);
+
+        $replaced = false;
+        foreach ($this->CustomHeader as $k => $pair) {
+            if ($pair[0] == $name) {
+                if ($replaced) {
+                    unset($this->CustomHeader[$k]);
+                    continue;
+                }
+                if (strpbrk($name . $value, "\r\n") !== false) {
+                    if ($this->exceptions) {
+                        throw new Exception($this->lang('invalid_header'));
+                    }
+
+                    return false;
+                }
+                $this->CustomHeader[$k] = [$name, $value];
+                $replaced = true;
+            }
+        }
+
+        return true;
+    }
+
     /**
      * Add an error message to the error container.
      *
@@ -3935,13 +4186,13 @@ class PHPMailer
             if (!empty($lasterror['error'])) {
                 $msg .= $this->lang('smtp_error') . $lasterror['error'];
                 if (!empty($lasterror['detail'])) {
-                    $msg .= ' Detail: ' . $lasterror['detail'];
+                    $msg .= ' ' . $this->lang('smtp_detail') . $lasterror['detail'];
                 }
                 if (!empty($lasterror['smtp_code'])) {
-                    $msg .= ' SMTP code: ' . $lasterror['smtp_code'];
+                    $msg .= ' ' . $this->lang('smtp_code') . $lasterror['smtp_code'];
                 }
                 if (!empty($lasterror['smtp_code_ex'])) {
-                    $msg .= ' Additional SMTP info: ' . $lasterror['smtp_code_ex'];
+                    $msg .= ' ' . $this->lang('smtp_code_ex') . $lasterror['smtp_code_ex'];
                 }
             }
         }
@@ -4002,7 +4253,7 @@ class PHPMailer
             empty($host)
             || !is_string($host)
             || strlen($host) > 256
-            || !preg_match('/^([a-zA-Z\d.-]*|\[[a-fA-F\d:]+])$/', $host)
+            || !preg_match('/^([a-zA-Z\d.-]*|\[[a-fA-F\d:]+\])$/', $host)
         ) {
             return false;
         }
@@ -4016,12 +4267,8 @@ class PHPMailer
             //Is it a valid IPv4 address?
             return filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false;
         }
-        if (filter_var('http://' . $host, FILTER_VALIDATE_URL) !== false) {
-            //Is it a syntactically valid hostname?
-            return true;
-        }
-
-        return false;
+        //Is it a syntactically valid hostname (when embeded in a URL)?
+        return filter_var('http://' . $host, FILTER_VALIDATE_URL) !== false;
     }
 
     /**
@@ -4052,6 +4299,26 @@ class PHPMailer
         return $key;
     }
 
+    /**
+     * Build an error message starting with a generic one and adding details if possible.
+     *
+     * @param string $base_key
+     * @return string
+     */
+    private function getSmtpErrorMessage($base_key)
+    {
+        $message = $this->lang($base_key);
+        $error = $this->smtp->getError();
+        if (!empty($error['error'])) {
+            $message .= ' ' . $error['error'];
+            if (!empty($error['detail'])) {
+                $message .= ' ' . $error['detail'];
+            }
+        }
+
+        return $message;
+    }
+
     /**
      * Check if an error occurred.
      *
@@ -4070,6 +4337,7 @@ class PHPMailer
      * @param string      $name  Custom header name
      * @param string|null $value Header value
      *
+     * @return bool True if a header was set successfully
      * @throws Exception
      */
     public function addCustomHeader($name, $value = null)
@@ -4079,11 +4347,11 @@ class PHPMailer
             list($name, $value) = explode(':', $name, 2);
         }
         $name = trim($name);
-        $value = trim($value);
+        $value = (null === $value) ? '' : trim($value);
         //Ensure name is not empty, and that neither name nor value contain line breaks
         if (empty($name) || strpbrk($name . $value, "\r\n") !== false) {
             if ($this->exceptions) {
-                throw new Exception('Invalid header name or value');
+                throw new Exception($this->lang('invalid_header'));
             }
 
             return false;
@@ -4237,7 +4505,8 @@ class PHPMailer
      *
      * @param string        $html     The HTML text to convert
      * @param bool|callable $advanced Any boolean value to use the internal converter,
-     *                                or provide your own callable for custom conversion
+     *                                or provide your own callable for custom conversion.
+     *                                *Never* pass user-supplied data into this parameter
      *
      * @return string
      */
@@ -4363,6 +4632,7 @@ class PHPMailer
             'ics' => 'text/calendar',
             'xml' => 'text/xml',
             'xsl' => 'text/xml',
+            'csv' => 'text/csv',
             'wmv' => 'video/x-ms-wmv',
             'mpeg' => 'video/mpeg',
             'mpe' => 'video/mpeg',
@@ -4470,7 +4740,7 @@ class PHPMailer
     public function set($name, $value = '')
     {
         if (property_exists($this, $name)) {
-            $this->$name = $value;
+            $this->{$name} = $value;
 
             return true;
         }
@@ -4517,15 +4787,27 @@ class PHPMailer
     }
 
     /**
-     * Remove trailing breaks from a string.
+     * Remove trailing whitespace from a string.
+     *
+     * @param string $text
+     *
+     * @return string The text to remove whitespace from
+     */
+    public static function stripTrailingWSP($text)
+    {
+        return rtrim($text, " \r\n\t");
+    }
+
+    /**
+     * Strip trailing line breaks from a string.
      *
      * @param string $text
      *
      * @return string The text to remove breaks from
      */
-    public static function stripTrailingWSP($text)
+    public static function stripTrailingBreaks($text)
     {
-        return rtrim($text, " \r\n\t");
+        return rtrim($text, "\r\n");
     }
 
     /**
@@ -4691,7 +4973,7 @@ class PHPMailer
         $body = static::normalizeBreaks($body, self::CRLF);
 
         //Reduce multiple trailing line breaks to a single one
-        return static::stripTrailingWSP($body) . self::CRLF;
+        return static::stripTrailingBreaks($body) . self::CRLF;
     }
 
     /**
@@ -4951,9 +5233,9 @@ class PHPMailer
     }
 
     /**
-     * Get the OAuth instance.
+     * Get the OAuthTokenProvider instance.
      *
-     * @return OAuth
+     * @return OAuthTokenProvider
      */
     public function getOAuth()
     {
@@ -4961,9 +5243,9 @@ class PHPMailer
     }
 
     /**
-     * Set an OAuth instance.
+     * Set an OAuthTokenProvider instance.
      */
-    public function setOAuth(OAuth $oauth)
+    public function setOAuth(OAuthTokenProvider $oauth)
     {
         $this->oauth = $oauth;
     }
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/POP3.php b/phpmailer/vendor/phpmailer/phpmailer/src/POP3.php
index b38964b1..7b25fdd7 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/src/POP3.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/src/POP3.php
@@ -46,7 +46,7 @@ class POP3
      *
      * @var string
      */
-    const VERSION = '6.5.0';
+    const VERSION = '6.9.1';
 
     /**
      * Default POP3 port number.
@@ -308,6 +308,7 @@ class POP3
     {
         if (!$this->connected) {
             $this->setError('Not connected to POP3 server');
+            return false;
         }
         if (empty($username)) {
             $username = $this->username;
@@ -336,7 +337,21 @@ class POP3
      */
     public function disconnect()
     {
-        $this->sendString('QUIT');
+        // If could not connect at all, no need to disconnect
+        if ($this->pop_conn === false) {
+            return;
+        }
+
+        $this->sendString('QUIT' . static::LE);
+
+        // RFC 1939 shows POP3 server sending a +OK response to the QUIT command.
+        // Try to get it.  Ignore any failures here.
+        try {
+            $this->getResponse();
+        } catch (Exception $e) {
+            //Do nothing
+        }
+
         //The QUIT command may cause the daemon to exit, which will kill our connection
         //So ignore errors here
         try {
@@ -344,6 +359,10 @@ class POP3
         } catch (Exception $e) {
             //Do nothing
         }
+
+        // Clean up attributes.
+        $this->connected = false;
+        $this->pop_conn  = false;
     }
 
     /**
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/SMTP.php b/phpmailer/vendor/phpmailer/phpmailer/src/SMTP.php
index a4a91ed0..1b5b0077 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/src/SMTP.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/src/SMTP.php
@@ -35,7 +35,7 @@ class SMTP
      *
      * @var string
      */
-    const VERSION = '6.5.0';
+    const VERSION = '6.9.1';
 
     /**
      * SMTP line break constant.
@@ -51,6 +51,13 @@ class SMTP
      */
     const DEFAULT_PORT = 25;
 
+    /**
+     * The SMTPs port to use if one is not specified.
+     *
+     * @var int
+     */
+    const DEFAULT_SECURE_PORT = 465;
+
     /**
      * The maximum line length allowed by RFC 5321 section 4.5.3.1.6,
      * *excluding* a trailing CRLF break.
@@ -187,6 +194,20 @@ class SMTP
         'SendGrid' => '/[\d]{3} Ok: queued as (.*)/',
         'CampaignMonitor' => '/[\d]{3} 2.0.0 OK:([a-zA-Z\d]{48})/',
         'Haraka' => '/[\d]{3} Message Queued \((.*)\)/',
+        'ZoneMTA' => '/[\d]{3} Message queued as (.*)/',
+        'Mailjet' => '/[\d]{3} OK queued as (.*)/',
+    ];
+
+    /**
+     * Allowed SMTP XCLIENT attributes.
+     * Must be allowed by the SMTP server. EHLO response is not checked.
+     *
+     * @see https://www.postfix.org/XCLIENT_README.html
+     *
+     * @var array
+     */
+    public static $xclient_allowed_attributes = [
+        'NAME', 'ADDR', 'PORT', 'PROTO', 'HELO', 'LOGIN', 'DESTADDR', 'DESTPORT'
     ];
 
     /**
@@ -392,7 +413,6 @@ class SMTP
                 STREAM_CLIENT_CONNECT,
                 $socket_context
             );
-            restore_error_handler();
         } else {
             //Fall back to fsockopen which should work in more places, but is missing some features
             $this->edebug(
@@ -407,8 +427,8 @@ class SMTP
                 $errstr,
                 $timeout
             );
-            restore_error_handler();
         }
+        restore_error_handler();
 
         //Verify we connected properly
         if (!is_resource($connection)) {
@@ -483,7 +503,7 @@ class SMTP
      * @param string $username The user name
      * @param string $password The password
      * @param string $authtype The auth type (CRAM-MD5, PLAIN, LOGIN, XOAUTH2)
-     * @param OAuth  $OAuth    An optional OAuth instance for XOAUTH2 authentication
+     * @param OAuthTokenProvider $OAuth An optional OAuthTokenProvider instance for XOAUTH2 authentication
      *
      * @return bool True if successfully authenticated
      */
@@ -682,7 +702,6 @@ class SMTP
      */
     public function close()
     {
-        $this->setError('');
         $this->server_caps = null;
         $this->helo_rply = null;
         if (is_resource($this->smtp_conn)) {
@@ -696,8 +715,8 @@ class SMTP
     /**
      * Send an SMTP DATA command.
      * Issues a data command and sends the msg_data to the server,
-     * finializing the mail transaction. $msg_data is the message
-     * that is to be send with the headers. Each header needs to be
+     * finalizing the mail transaction. $msg_data is the message
+     * that is to be sent with the headers. Each header needs to be
      * on a single line followed by a <CRLF> with the message headers
      * and the message body being separated by an additional <CRLF>.
      * Implements RFC 821: DATA <CRLF>.
@@ -725,7 +744,7 @@ class SMTP
         $lines = explode("\n", str_replace(["\r\n", "\r"], "\n", $msg_data));
 
         /* To distinguish between a complete RFC822 message and a plain message body, we check if the first field
-         * of the first line (':' separated) does not contain a space then it _should_ be a header and we will
+         * of the first line (':' separated) does not contain a space then it _should_ be a header, and we will
          * process all lines before a blank line as headers.
          */
 
@@ -964,6 +983,25 @@ class SMTP
         );
     }
 
+    /**
+     * Send SMTP XCLIENT command to server and check its return code.
+     *
+     * @return bool True on success
+     */
+    public function xclient(array $vars)
+    {
+        $xclient_options = "";
+        foreach ($vars as $key => $value) {
+            if (in_array($key, SMTP::$xclient_allowed_attributes)) {
+                $xclient_options .= " {$key}={$value}";
+            }
+        }
+        if (!$xclient_options) {
+            return true;
+        }
+        return $this->sendCommand('XCLIENT', 'XCLIENT' . $xclient_options, 250);
+    }
+
     /**
      * Send an SMTP RSET command.
      * Abort any transaction that is currently in progress.
@@ -1037,7 +1075,10 @@ class SMTP
             return false;
         }
 
-        $this->setError('');
+        //Don't clear the error store when using keepalive
+        if ($command !== 'RSET') {
+            $this->setError('');
+        }
 
         return true;
     }
@@ -1170,7 +1211,7 @@ class SMTP
         if (!$this->server_caps) {
             $this->setError('No HELO/EHLO was sent');
 
-            return;
+            return null;
         }
 
         if (!array_key_exists($name, $this->server_caps)) {
@@ -1182,7 +1223,7 @@ class SMTP
             }
             $this->setError('HELO handshake was used; No information about server extensions available');
 
-            return;
+            return null;
         }
 
         return $this->server_caps[$name];

From d910502a1762ccb97a30836647d571c0286bb1dc Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Tue, 19 Mar 2024 23:03:34 -0400
Subject: [PATCH 064/294] [s3_storage] Update Composer dependency ahead of
 release

- Updating akeeba/s3 (2.3.1 => 2.3.2)
---
 s3_storage/composer.json                      |  40 +--
 s3_storage/composer.lock                      |  10 +-
 s3_storage/vendor/akeeba/s3/README.md         |  42 ++-
 s3_storage/vendor/akeeba/s3/minitest/NOTES.md |  74 ++++--
 .../akeeba/s3/minitest/Test/AbstractTest.php  |   2 +-
 .../akeeba/s3/minitest/Test/BigFiles.php      |   2 +-
 .../s3/minitest/Test/BucketLocation.php       |   2 +-
 .../akeeba/s3/minitest/Test/BucketsList.php   |   2 +-
 .../akeeba/s3/minitest/Test/HeadObject.php    |   2 +-
 .../akeeba/s3/minitest/Test/ListFiles.php     |   2 +-
 .../s3/minitest/Test/ListThousandsOfFiles.php |   2 +-
 .../akeeba/s3/minitest/Test/Multipart.php     |   2 +-
 .../akeeba/s3/minitest/Test/SignedURLs.php    |  23 +-
 .../s3/minitest/Test/SingleSmallFile.php      |   2 +-
 .../akeeba/s3/minitest/Test/SmallFiles.php    |   2 +-
 .../s3/minitest/Test/SmallFilesNoDelete.php   |   2 +-
 .../s3/minitest/Test/SmallFilesOnlyUpload.php |   2 +-
 .../s3/minitest/Test/SmallInlineFiles.php     |   2 +-
 .../Test/SmallInlineFilesNoDelete.php         |   2 +-
 .../Test/SmallInlineFilesOnlyUpload.php       |   2 +-
 .../s3/minitest/Test/SmallInlineXMLFiles.php  |   2 +-
 .../s3/minitest/Test/StorageClasses.php       |   2 +-
 .../vendor/akeeba/s3/minitest/config.dist.php | 246 +++++++++++++-----
 .../vendor/akeeba/s3/minitest/minitest.php    |  61 ++++-
 s3_storage/vendor/akeeba/s3/src/Acl.php       |   2 +-
 .../vendor/akeeba/s3/src/Configuration.php    |  83 +++++-
 s3_storage/vendor/akeeba/s3/src/Connector.php |   7 +-
 .../s3/src/Exception/CannotDeleteFile.php     |   2 +-
 .../s3/src/Exception/CannotGetBucket.php      |   2 +-
 .../akeeba/s3/src/Exception/CannotGetFile.php |   2 +-
 .../s3/src/Exception/CannotListBuckets.php    |   2 +-
 .../src/Exception/CannotOpenFileForRead.php   |   2 +-
 .../src/Exception/CannotOpenFileForWrite.php  |   2 +-
 .../akeeba/s3/src/Exception/CannotPutFile.php |   2 +-
 .../s3/src/Exception/ConfigurationError.php   |   2 +-
 .../s3/src/Exception/InvalidAccessKey.php     |   2 +-
 .../akeeba/s3/src/Exception/InvalidBody.php   |   2 +-
 .../s3/src/Exception/InvalidEndpoint.php      |   2 +-
 .../s3/src/Exception/InvalidFilePointer.php   |   2 +-
 .../akeeba/s3/src/Exception/InvalidRegion.php |   2 +-
 .../s3/src/Exception/InvalidSecretKey.php     |   2 +-
 .../src/Exception/InvalidSignatureMethod.php  |   2 +-
 .../s3/src/Exception/PropertyNotFound.php     |   2 +-
 s3_storage/vendor/akeeba/s3/src/Input.php     |   2 +-
 s3_storage/vendor/akeeba/s3/src/Request.php   |  34 ++-
 s3_storage/vendor/akeeba/s3/src/Response.php  |   2 +-
 .../vendor/akeeba/s3/src/Response/Error.php   |   2 +-
 s3_storage/vendor/akeeba/s3/src/Signature.php |   2 +-
 .../vendor/akeeba/s3/src/Signature/V2.php     |  25 +-
 .../vendor/akeeba/s3/src/Signature/V4.php     |  52 +++-
 .../vendor/akeeba/s3/src/StorageClass.php     |   2 +-
 s3_storage/vendor/akeeba/s3/src/aliasing.php  |   2 +-
 s3_storage/vendor/composer/installed.json     |  12 +-
 53 files changed, 583 insertions(+), 206 deletions(-)

diff --git a/s3_storage/composer.json b/s3_storage/composer.json
index 7c5a8e78..002c7dc0 100644
--- a/s3_storage/composer.json
+++ b/s3_storage/composer.json
@@ -1,23 +1,23 @@
 {
-  "name": "friendica-addons/s3_storage",
-  "description": "Adds the possibility to use S3 as a selectable storage backend",
-  "type": "friendica-addon",
-  "authors": [
-    {
-      "name": "Philipp Holzer",
-      "email": "admin@philipp.info",
-      "homepage": "https://blog.philipp.info",
-      "role": "Developer"
+    "name": "friendica-addons/s3_storage",
+    "description": "Adds the possibility to use S3 as a selectable storage backend",
+    "type": "friendica-addon",
+    "authors": [
+        {
+            "name": "Philipp Holzer",
+            "email": "admin@philipp.info",
+            "homepage": "https://blog.philipp.info",
+            "role": "Developer"
+        }
+    ],
+    "require": {
+        "php": ">=7.0",
+        "akeeba/s3": "^2.0"
+    },
+    "license": "3-clause BSD license",
+    "config": {
+        "optimize-autoloader": true,
+        "autoloader-suffix": "S3StorageAddon",
+        "preferred-install": "dist"
     }
-  ],
-  "require": {
-    "php": ">=7.0",
-    "akeeba/s3": "^2.0"
-  },
-  "license": "3-clause BSD license",
-  "config": {
-    "optimize-autoloader": true,
-    "autoloader-suffix": "S3StorageAddon",
-    "preferred-install": "dist"
-  }
 }
diff --git a/s3_storage/composer.lock b/s3_storage/composer.lock
index 992e5a9e..766b8e6d 100644
--- a/s3_storage/composer.lock
+++ b/s3_storage/composer.lock
@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "akeeba/s3",
-            "version": "2.3.1",
+            "version": "2.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/akeeba/s3.git",
-                "reference": "7f5b3e929c93eb02ba24472560c0cbbef735aed9"
+                "reference": "452fbd3084f1cb581851a1602226224d29d586d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/akeeba/s3/zipball/7f5b3e929c93eb02ba24472560c0cbbef735aed9",
-                "reference": "7f5b3e929c93eb02ba24472560c0cbbef735aed9",
+                "url": "https://api.github.com/repos/akeeba/s3/zipball/452fbd3084f1cb581851a1602226224d29d586d4",
+                "reference": "452fbd3084f1cb581851a1602226224d29d586d4",
                 "shasum": ""
             },
             "require": {
@@ -51,7 +51,7 @@
             "keywords": [
                 "s3"
             ],
-            "time": "2023-09-26T11:40:10+00:00"
+            "time": "2024-02-19T10:08:06+00:00"
         }
     ],
     "packages-dev": [],
diff --git a/s3_storage/vendor/akeeba/s3/README.md b/s3_storage/vendor/akeeba/s3/README.md
index eb3c5b53..fae5fb33 100644
--- a/s3_storage/vendor/akeeba/s3/README.md
+++ b/s3_storage/vendor/akeeba/s3/README.md
@@ -1,6 +1,8 @@
 # Akeeba Amazon S3 Connector
 
-A compact, dependency-less Amazon S3 API client implementing the most commonly used features
+A compact, dependency-less Amazon S3 API client implementing the most commonly used features.
+
+This library is designed to work with Amazon S3 proper, as well as S3-compatible services such as but not limited to Wasabi, Google Storage, Synology C2, ExoScale etc.
 
 ## Why reinvent the wheel
 
@@ -275,7 +277,9 @@ $connector = new \Akeeba\S3\Connector($configuration);
 
 ```php
 $configuration->setSSL(false);
-```  
+```
+
+Caveat: HTTPS will only work if PHP can verify the TLS certificate of your endpoint. This may not be the case when using a local testing service (e.g. LocalStack), or for some buckets with dots in their names. Moreover, if you are on Windows, do note that neither PHP comes with a Certification Authority cache, nor is there a system-wide CA cache; you'll have to [download](https://curl.se/docs/caextract.html) it and configure PHP, or use [composer/ca-bundle](https://packagist.org/packages/composer/ca-bundle) in your `composer.json` file.
 
 ### Custom endpoint
 
@@ -293,6 +297,8 @@ $configuration = new \Akeeba\S3\Configuration(
     'nyc3'
 );
 $configuration->setEndpoint('nyc3.digitaloceanspaces.com');
+$configuration->setRegion('nyc3');
+$configuration->setSignatureMethod('v4');
 
 $connector = new \Akeeba\S3\Connector($configuration);
 ```
@@ -312,18 +318,22 @@ $configuration->setEndpoint('nyc3.digitaloceanspaces.com');
 $connector = new \Akeeba\S3\Connector($configuration);
 ```
 
+Caveat: Setting the endpoint resets the signature version and region. This is why you need to set them _a second time_, after setting the endpoint, as seen in the first example above.
+
 ### Legacy path-style access
 
 The S3 API calls made by this library will use by default the subdomain-style access. That is to say, the endpoint will be prefixed with the name of the bucket. For example, a bucket called `example` in the `eu-west-1` region will be accessed using the endpoint URL `example.s3.eu-west-1.amazonaws.com`.
 
-If you have buckets with characters that are invalid in the context of DNS (most notably dots and uppercase characters) this will fail. You will need to use the legacy path style instead. In this case the endpoint used is the generic region specific one (`s3.eu-west-1.amazonaws.com` in our example above) and the API URL will be prefixed with the bucket name.
+If you have buckets with characters that are invalid in the context of DNS (most notably dots and uppercase characters) this will fail. You will need to use the legacy path style instead. In this case the endpoint used is the generic region specific one (`s3.eu-west-1.amazonaws.com` in our example above), and the API URL will be prefixed with the bucket name.
 
 You need to do:
 ```php
 $configuration->setUseLegacyPathStyle(true);
 ```
 
-Caveat: this will not work with v2 signatures if you are using Amazon AWS S3 proper. It will very likely work with the v2 signatures if you are using a custom endpoint, though.
+Caveats:
+* This will not work with v2 signatures if you are using Amazon AWS S3 proper. It will very likely work with the v2 signatures if you are using a custom endpoint, though.
+* This option has no effect on pre-authorised (pre-signed) URLs. Legacy path-style access is used for these URLs by default.
 
 ### Dualstack (IPv4 and IPv6) support
 
@@ -333,4 +343,26 @@ Amazon S3 supports dual-stack URLs which resolve to both IPv4 and IPv6 addresses
 $connector->setUseDualstackUrl(true);
 ```
 
-Caveat: this option only takes effect if you are using Amazon S3 proper. It will _not_ have any effect with custom endpoints.
\ No newline at end of file
+Caveat: This option only takes effect if you are using Amazon S3 proper. It will _not_ have any effect with custom endpoints. DualStack support is deprecated by Amazon S3. We strongly advise you NOT to use it anymore.
+
+### Alternate Date Format
+
+By default, this library uses the standard date format `D, d M Y H:i:s O` which Amazon _incorrectly_ documents as "ISO 8601" (it's not, see the [ISO 8601 Wikipedia entry](https://en.wikipedia.org/wiki/ISO_8601) for reference). Most third party, Amazon S3-compatible services use the same and understand it just fine.
+
+A minority of services don't understand the GMT offset at the end of the date format, and instead need the format `D, d M Y H:i:s T`. You can set a flag to enable this behaviour like so:
+```php
+$configuration->setAlternateDateHeaderFormat(true);
+```
+
+Caveat: Enabling this flag breaks compatibility with S3 proper.
+
+### Using The HTTP Date Header Instead Of X-Amz-Date
+
+Amazon documents that you should be using the standard HTTP `Date` header, and only resort to using the `X-Amz-Date` header when using the standard header is impossible, e.g. when creating pre-authorised (signed) URLs, or when your HTTP library does not let you set the standard header.
+
+Unfortunately, some third party S3-compatible services such as Wasabi and ExoScale do _NOT_ support the standard `Date` header at all. Using it makes them falsely spit out a message about the signature being wrong. They are the reason why, by default, we are passing the request date and time using the `X-Amz-Date` header.
+
+If you are using a third party service which for any reason does not understand the `X-Amz-Date` header you need to set a flag which forces the use of the standard `Date` header like so:
+```php
+$configuration->setUseHTTPDateHeader(true);
+```
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/minitest/NOTES.md b/s3_storage/vendor/akeeba/s3/minitest/NOTES.md
index b31f4f0a..f44c79c8 100644
--- a/s3_storage/vendor/akeeba/s3/minitest/NOTES.md
+++ b/s3_storage/vendor/akeeba/s3/minitest/NOTES.md
@@ -1,5 +1,7 @@
 # Testing notes
 
+**⚠️ WARNING**: Running all tests across all services takes _hours_. It is recommended that you use the SignedURLs test as a quick validation tool across multiple services, then test against the `$standardTests` suite overnight.
+
 ## Against Amazon S3 proper
 
 This is the _canonical_ method for testing this library since Amazon S3 proper is the canonical provider of the S3 API (and not all of its quirks are fully documented, we might add). 
@@ -8,9 +10,9 @@ Copy `config.dist.php` to `config.php` and enter the connection information to y
 
 ## Against [LocalStack](https://localstack.cloud)
 
-This method is very useful for development.
+This method is very useful for development. It is the most faithful implementation of S3, but it does have some minor quirks not present in the real thing as a result of it running inside a Docker container.
 
-Install LocalStack [as per their documentation](https://docs.localstack.cloud/getting-started/installation/).
+Install LocalStack [per its documentation](https://docs.localstack.cloud/getting-started/installation/), or using its Docker Desktop Extension.
 
 You will also need to install [`awslocal`](https://github.com/localstack/awscli-local) like so:
 ```php
@@ -18,45 +20,67 @@ pip install awscli
 pip install awscli-local
 ```
 
-Start LocalStack e.g. `localstack start -d`
+Start LocalStack e.g. `localstack start -d` or via the Docker Desktop Extension.
 
-Create a new bucket called `test` i.e. `awslocal s3 mk s3://test`
+Create a new bucket called `test` i.e. `awslocal s3 mb s3://test`
 
-Copy `config.dist.php` to `config.php` and make the following changes:
-```php
-    define('DEFAULT_ENDPOINT', 'localhost.localstack.cloud:4566');
-    define('DEFAULT_ACCESS_KEY', 'ANYRANDOMSTRINGWILLDO');
-    define('DEFAULT_SECRET_KEY', 'ThisIsAlwaysIgnoredByLocalStack');
-    define('DEFAULT_REGION', 'us-east-1');
-    define('DEFAULT_BUCKET', 'test');
-    define('DEFAULT_SIGNATURE', 'v4');
-    define('DEFAULT_PATH_ACCESS', true);
-```
-
-Note that single- and dualstack tests result in the same URLs for all S3-compatible services, including LocalStack. These tests are essentially duplicates in this use case.
+The `config.dist.php` already has a configuration for LocalStack. Yes, the access and secret key can be any random string.
 
 ## Against Wasabi
 
-Wasabi nominally supports v4 signatures, but their implementation is actually _non-canonical_, as they only read the date from the optional `x-amz-date` header, without falling back to the standard HTTP `Date` header. We have added a workaround for this behaviour which necessitates testing with it.
+Wasabi nominally supports v4 signatures, but their implementation is actually _non-canonical_, as they only read the date from the optional `x-amz-date` header, without falling back to the standard HTTP `Date` header. We have changed the behaviour of the library to always go through the X-Amz-Date header as a result. Hence, the need to test with Wasabi.
+
+The Wasabi configuration block looks like this:
 
-Just like with Amazon S3 proper, copy `config.dist.php` to `config.php` and enter the connection information to your Wasabi storage. You will also need to set up the custom endpoint like so:
 ```php
-define('DEFAULT_ENDPOINT', 's3.eu-central-2.wasabisys.com');
+	'wasabi-v4' => [
+		'access'      => 'THE_ACCESS_KEY',
+		'secret'      => 'VERY_SECRET_MUCH_WOW',
+		'region'      => 'eu-central-2',
+		'bucket'      => 'bucketname',
+		'signature'   => 'v4',
+		'dualstack'   => false,
+		'path_access' => true,
+		'ssl'         => true,
+		'endpoint'    => 's3.eu-central-2.wasabisys.com',
+	],
+	'wasabi-v2' => [
+		'access'      => 'THE_ACCESS_KEY',
+		'secret'      => 'VERY_SECRET_MUCH_WOW',
+		'region'      => 'eu-central-2',
+		'bucket'      => 'bucketname',
+		'signature'   => 'v2',
+		'dualstack'   => false,
+		'path_access' => true,
+		'ssl'         => true,
+		'endpoint'    => 's3.eu-central-2.wasabisys.com',
+	],
+
 ```
 
-**IMPORTANT!** The above endpoint will be different, depending on which region you've created your bucket in. The example above assumes the `eu-central-2` region. If you use the wrong region the tests _will_ fail! 
+**❗Important**: The Endpoint and Region must match each other, and the region the bucket was crated in. In the example above, we have created a bucket in the `eu-central-2` region. If you use the wrong region and/or endpoint the tests _will_ fail! 
 
 ## Against Synology C2
 
-Synology C2 is an S3-“compatible” storage service. It is not very “compatible” though, since they implemented Amazon's documentation of the v4 signatures instead of how the v4 signatures work in the real world (yeah, there's a very big difference). While Amazon S3 _in reality_ expects all dates to be formatted as per RFC1123, they document that they expect them to be formatted as per “ISO 8601” and they give their _completely wrong_ interpretation of what the “ISO 8601” format is. Synology did not catch that discrepancy, and they only expect the wrongly formatted dates which is totally NOT what S3 itself expects. Luckily, most third party implementations expect either format because they've caught the discrepancy between documentation and reality, therefore making it possible for us to come up with a viable workaround.
+Synology C2 is an S3-“compatible” storage service. It is not very “compatible” though, since they implemented Amazon's documentation of the v4 signatures instead of how the v4 signatures work in the real world (yeah, there's a very big difference). While Amazon S3 _in reality_ expects all dates to be formatted as per RFC1123, they document that they expect them to be formatted as per “ISO 8601”, and they give their _completely wrong_ interpretation of what the “ISO 8601” format is. Synology did not catch that discrepancy, and they only expect the wrongly formatted dates which is totally NOT what S3 itself expects. Luckily, most third party implementations expect either format because they've caught the discrepancy between documentation and reality, therefore making it possible for us to come up with a viable workaround.
 
 And that's why we need to test with C2 as well, folks.
 
-Copy `config.dist.php` to `config.php` and enter the connection information to your Synology S3 service.
+The C2 config block looks like this:
 
-It is very important to note two things:
 ```php
-define('DEFAULT_ENDPOINT', 'eu-002.s3.synologyc2.net');
-define('DEFAULT_REGION', 'eu-002');
+	'c2' => [
+		'access'      => 'THE_ACCESS_KEY',
+		'secret'      => 'VERY_SECRET_MUCH_WOW',
+		'region'      => 'eu-002',
+		'bucket'      => 'bucketname',
+		'signature'   => 'v4',
+		'dualstack'   => false,
+		'path_access' => false,
+		'ssl'         => true,
+		'endpoint'    => 'eu-002.s3.synologyc2.net',
+	],
+
 ```
+
 The endpoint URL is given in the Synology C2 Object Manager, next to each bucket. Note the part before `.s3.`. This is the **region** you need to use with v4 signatures. They do not document this anywhere.
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/AbstractTest.php b/s3_storage/vendor/akeeba/s3/minitest/Test/AbstractTest.php
index 895259dd..e3f77cce 100644
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/AbstractTest.php
+++ b/s3_storage/vendor/akeeba/s3/minitest/Test/AbstractTest.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/BigFiles.php b/s3_storage/vendor/akeeba/s3/minitest/Test/BigFiles.php
index 437d73ed..17969be9 100644
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/BigFiles.php
+++ b/s3_storage/vendor/akeeba/s3/minitest/Test/BigFiles.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/BucketLocation.php b/s3_storage/vendor/akeeba/s3/minitest/Test/BucketLocation.php
index ff04f58a..70552045 100644
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/BucketLocation.php
+++ b/s3_storage/vendor/akeeba/s3/minitest/Test/BucketLocation.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/BucketsList.php b/s3_storage/vendor/akeeba/s3/minitest/Test/BucketsList.php
index 4dab491d..ebd7d5eb 100644
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/BucketsList.php
+++ b/s3_storage/vendor/akeeba/s3/minitest/Test/BucketsList.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/HeadObject.php b/s3_storage/vendor/akeeba/s3/minitest/Test/HeadObject.php
index 535afdbd..abcb5177 100644
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/HeadObject.php
+++ b/s3_storage/vendor/akeeba/s3/minitest/Test/HeadObject.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/ListFiles.php b/s3_storage/vendor/akeeba/s3/minitest/Test/ListFiles.php
index 00b5fdbf..fc6ed232 100644
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/ListFiles.php
+++ b/s3_storage/vendor/akeeba/s3/minitest/Test/ListFiles.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/ListThousandsOfFiles.php b/s3_storage/vendor/akeeba/s3/minitest/Test/ListThousandsOfFiles.php
index 8146d4cd..8485a715 100644
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/ListThousandsOfFiles.php
+++ b/s3_storage/vendor/akeeba/s3/minitest/Test/ListThousandsOfFiles.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/Multipart.php b/s3_storage/vendor/akeeba/s3/minitest/Test/Multipart.php
index df097e96..fc244c62 100644
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/Multipart.php
+++ b/s3_storage/vendor/akeeba/s3/minitest/Test/Multipart.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/SignedURLs.php b/s3_storage/vendor/akeeba/s3/minitest/Test/SignedURLs.php
index a82d4381..41667cc3 100644
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/SignedURLs.php
+++ b/s3_storage/vendor/akeeba/s3/minitest/Test/SignedURLs.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
@@ -22,20 +22,39 @@ class SignedURLs extends AbstractTest
 		return static::signedURL($s3, $options, Acl::ACL_PUBLIC_READ);
 	}
 
+	public static function signedURLPublicObjectSpaces(Connector $s3, array $options): bool
+	{
+		return static::signedURL($s3, array_merge($options, [
+			'spaces' => true
+		]), Acl::ACL_PUBLIC_READ);
+	}
+
 	public static function signedURLPrivateObject(Connector $s3, array $options): bool
 	{
 		return static::signedURL($s3, $options, Acl::ACL_PRIVATE);
 	}
 
+	public static function signedURLPrivateObjectSpaces(Connector $s3, array $options): bool
+	{
+		return static::signedURL($s3, array_merge($options, [
+			'spaces' => true
+		]), Acl::ACL_PRIVATE);
+	}
+
 	private static function signedURL(Connector $s3, array $options, string $aclPrivilege): bool
 	{
+		$spaces   = isset($options['spaces']) && boolval($options['spaces']);
 		$tempData = static::getRandomData(AbstractTest::TEN_KB);
 		$input    = Input::createFromData($tempData);
-		$uri      = 'test.' . md5(microtime(false)) . '.dat';
+		$prefix   = $spaces ? 'test file' : 'test';
+		$uri      = $prefix . '.' . md5(microtime(false)) . '.dat';
 
 		$s3->putObject($input, $options['bucket'], $uri, $aclPrivilege);
 
 		$downloadURL    = $s3->getAuthenticatedURL($options['bucket'], $uri, null, $options['ssl']);
+
+		echo "\n\tDownload URL: $downloadURL\n";
+
 		$downloadedData = @file_get_contents($downloadURL);
 
 		try
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/SingleSmallFile.php b/s3_storage/vendor/akeeba/s3/minitest/Test/SingleSmallFile.php
index 9b833097..51716621 100644
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/SingleSmallFile.php
+++ b/s3_storage/vendor/akeeba/s3/minitest/Test/SingleSmallFile.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallFiles.php b/s3_storage/vendor/akeeba/s3/minitest/Test/SmallFiles.php
index 82b2027f..75d91d11 100644
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallFiles.php
+++ b/s3_storage/vendor/akeeba/s3/minitest/Test/SmallFiles.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallFilesNoDelete.php b/s3_storage/vendor/akeeba/s3/minitest/Test/SmallFilesNoDelete.php
index bdd3193b..fee30e5f 100644
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallFilesNoDelete.php
+++ b/s3_storage/vendor/akeeba/s3/minitest/Test/SmallFilesNoDelete.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallFilesOnlyUpload.php b/s3_storage/vendor/akeeba/s3/minitest/Test/SmallFilesOnlyUpload.php
index e1aacafd..1d2aa370 100644
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallFilesOnlyUpload.php
+++ b/s3_storage/vendor/akeeba/s3/minitest/Test/SmallFilesOnlyUpload.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineFiles.php b/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineFiles.php
index d648d106..378f04b1 100644
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineFiles.php
+++ b/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineFiles.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineFilesNoDelete.php b/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineFilesNoDelete.php
index d7e0d73e..f17f84d9 100644
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineFilesNoDelete.php
+++ b/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineFilesNoDelete.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineFilesOnlyUpload.php b/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineFilesOnlyUpload.php
index 890ecccd..3d9202e7 100644
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineFilesOnlyUpload.php
+++ b/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineFilesOnlyUpload.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineXMLFiles.php b/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineXMLFiles.php
index 5ab54893..8c94ff07 100644
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineXMLFiles.php
+++ b/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineXMLFiles.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/StorageClasses.php b/s3_storage/vendor/akeeba/s3/minitest/Test/StorageClasses.php
index 42adce42..a6144c4b 100644
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/StorageClasses.php
+++ b/s3_storage/vendor/akeeba/s3/minitest/Test/StorageClasses.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/minitest/config.dist.php b/s3_storage/vendor/akeeba/s3/minitest/config.dist.php
index b9124065..f67e521e 100644
--- a/s3_storage/vendor/akeeba/s3/minitest/config.dist.php
+++ b/s3_storage/vendor/akeeba/s3/minitest/config.dist.php
@@ -3,31 +3,89 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
-// Custom Endpoint. The example below is for using LocalStack, see https://localstack.cloud/
-// define('DEFAULT_ENDPOINT', 'localhost.localstack.cloud:4566');
-// Default Amazon S3 Access Key
-define('DEFAULT_ACCESS_KEY', 'your s3 access key');
-// Default Amazon S3 Secret Key
-define('DEFAULT_SECRET_KEY', 'your secret key');
-// Default region for the bucket
-define('DEFAULT_REGION', 'us-east-1');
-// Default bucket name
-define('DEFAULT_BUCKET', 'example');
-// Default signature method (v4 or v2)
-define('DEFAULT_SIGNATURE', 'v4');
-// Use Dualstack unless otherwise specified?
-define('DEFAULT_DUALSTACK', false);
-// Use legacy path access by default?
-define('DEFAULT_PATH_ACCESS', false);
-// Should I use SSL by default?
-define('DEFAULT_SSL', true);
 // Create the 2100 test files in the bucket?
 define('CREATE_2100_FILES', true);
 
+/**
+ * Configure the connection options for S3 and S3-compatible services here. Use them in the $testConfigurations array.
+ */
+$serviceConfigurations = [
+	's3-v4'         => [
+		'access'      => 'AK0123456789BCDEFGHI',
+		'secret'      => 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
+		'region'      => 'eu-west-1',
+		'bucket'      => 'mybucket',
+		'signature'   => 'v4',
+		'dualstack'   => false,
+		'path_access' => false,
+		'ssl'         => false,
+		'endpoint'    => null,
+	],
+	's3-v2'         => [
+		'access'      => 'AK0123456789BCDEFGHI',
+		'secret'      => 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
+		'region'      => 'eu-west-1',
+		'bucket'      => 'mybucket',
+		'signature'   => 'v2',
+		'dualstack'   => false,
+		'path_access' => false,
+		'ssl'         => false,
+		'endpoint'    => null,
+	],
+	'localstack-v4' => [
+		'access'      => 'KYLOREN',
+		'secret'      => 'BenSolo',
+		'region'      => 'us-east-1',
+		'bucket'      => 'test',
+		'signature'   => 'v4',
+		'dualstack'   => false,
+		'path_access' => true,
+		'ssl'         => false,
+		'endpoint'    => 'localhost.localstack.cloud:4566',
+	],
+	'localstack-v2' => [
+		'access'      => 'KYLOREN',
+		'secret'      => 'BenSolo',
+		'region'      => 'us-east-1',
+		'bucket'      => 'test',
+		'signature'   => 'v2',
+		'dualstack'   => false,
+		'path_access' => true,
+		'ssl'         => false,
+		'endpoint'    => 'localhost.localstack.cloud:4566',
+	],
+];
+
+/**
+ * Test EVERYTHING.
+ */
+$allTheTests = [
+	'BucketsList',
+	'BucketLocation',
+	'HeadObject',
+	'ListFiles',
+	'SmallFiles',
+	'SmallInlineFiles',
+	'SmallFilesNoDelete',
+	'SmallFilesOnlyUpload',
+	'SmallInlineFilesNoDelete',
+	'SmallInlineFilesOnlyUpload',
+	'SmallInlineXMLFiles',
+	'BigFiles',
+	'Multipart',
+	'StorageClasses',
+	'SignedURLs',
+];
+
+if (CREATE_2100_FILES)
+{
+	$allTheTests[] = 'ListThousandsOfFiles';
+}
+
 /**
  * Tests for standard key pairs allowing us to read, write and delete
  *
@@ -36,15 +94,15 @@ define('CREATE_2100_FILES', true);
 $standardTests = [
 	'BucketsList',
 	'BucketLocation',
-	'SmallFiles',
 	'HeadObject',
+	'ListFiles',
+	'SmallFiles',
 	'SmallInlineFiles',
 	'SmallInlineXMLFiles',
-	'SignedURLs',
-	'StorageClasses',
-	'ListFiles',
 	'BigFiles',
 	'Multipart',
+	'StorageClasses',
+	'SignedURLs',
 ];
 
 /**
@@ -123,53 +181,123 @@ $testConfigurations = [
 	 * - Buckets with international letters
 	 * - Access from within EC2
 	 */
-	'Global key, v4, DNS, single stack'  => [
-		'configuration' => [
-			'signature'   => 'v4',
-			'dualstack'   => false,
-			'path_access' => false,
-		],
+
+	// Amazon S3, v2 signatures
+	'S3, v2, subdomain, single stack'  => [
+		'configuration' => array_merge(
+			$serviceConfigurations['s3-v2'],
+			[
+				'dualstack'   => false,
+				'path_access' => false,
+			]
+		),
 		'tests'         => $standardTests,
+		'skip'          => false,
 	],
-	'Global key, v4, DNS, dual stack'    => [
-		'configuration' => [
-			'signature'   => 'v4',
-			'dualstack'   => true,
-			'path_access' => false,
-		],
+	'S3, v2, subdomain, dual stack'    => [
+		'configuration' => array_merge(
+			$serviceConfigurations['s3-v2'],
+			[
+				'dualstack'   => true,
+				'path_access' => false,
+			]
+		),
 		'tests'         => $standardTests,
+		'skip'          => false,
 	],
-	'Global key, v4, path, single stack' => [
-		'configuration' => [
-			'signature'   => 'v4',
-			'dualstack'   => false,
-			'path_access' => true,
-		],
+	'S3, v2, path, single stack'  => [
+		'configuration' => array_merge(
+			$serviceConfigurations['s3-v2'],
+			[
+				'dualstack'   => false,
+				'path_access' => true,
+			]
+		),
 		'tests'         => $standardTests,
+		'skip'          => false,
 	],
-	'Global key, v4, path, dual stack'   => [
-		'configuration' => [
-			'signature'   => 'v4',
-			'dualstack'   => true,
-			'path_access' => true,
-		],
+	'S3, v2, path, dual stack'    => [
+		'configuration' => array_merge(
+			$serviceConfigurations['s3-v2'],
+			[
+				'dualstack'   => true,
+				'path_access' => true,
+			]
+		),
 		'tests'         => $standardTests,
+		'skip'          => false,
 	],
 
-	'Global key, v2, DNS, single stack' => [
-		'configuration' => [
-			'signature'   => 'v2',
-			'dualstack'   => false,
-			'path_access' => false,
-		],
+	// Amazon S3, v4 signatures
+	'S3, v4, subdomain, single stack'  => [
+		'configuration' => array_merge(
+			$serviceConfigurations['s3-v4'],
+			[
+				'dualstack'   => false,
+				'path_access' => false,
+			]
+		),
 		'tests'         => $standardTests,
+		'skip'          => false,
 	],
-	'Global key, v2, DNS, dual stack'   => [
-		'configuration' => [
-			'signature'   => 'v2',
-			'dualstack'   => true,
-			'path_access' => false,
-		],
+	'S3, v4, subdomain, dual stack'    => [
+		'configuration' => array_merge(
+			$serviceConfigurations['s3-v4'],
+			[
+				'dualstack'   => true,
+				'path_access' => false,
+			]
+		),
 		'tests'         => $standardTests,
+		'skip'          => false,
 	],
+	'S3, v4, path, single stack'  => [
+		'configuration' => array_merge(
+			$serviceConfigurations['s3-v4'],
+			[
+				'dualstack'   => false,
+				'path_access' => true,
+			]
+		),
+		'tests'         => $standardTests,
+		'skip'          => false,
+	],
+	'S3, v4, path, dual stack'    => [
+		'configuration' => array_merge(
+			$serviceConfigurations['s3-v4'],
+			[
+				'dualstack'   => true,
+				'path_access' => true,
+			]
+		),
+		'tests'         => $standardTests,
+		'skip'          => false,
+	],
+
+	// LocalStack
+	'LocalStack, V2 (always path access, single stack)' => [
+		'configuration' => $serviceConfigurations['localstack-v2'],
+		'tests'         => $allTheTests,
+		'skip'          => false,
+	],
+
+	'LocalStack, V4 (always path access, single stack)' => [
+		'configuration' => $serviceConfigurations['localstack-v4'],
+		'tests'         => $allTheTests,
+		'skip'          => false,
+	],
+
+	/**
+	 * In the real config file we also have tests running on:
+	 *
+	 * - Wasabi, v2, path-style access.
+	 * - Wasabi, v4, path-style access.
+	 * - Synology C2, subdomain access.
+	 *
+	 * See [[NOTES.md]] for more information. If you have another environment you think we should test with please
+	 * update NOTES.md and make a pull request, along with the reasoning behind it.
+	 *
+	 * There are known failures for some cases, notably LocalStack v4 (something is amiss?) and C2 (necessary flag is
+	 * not yet supported by the minitest framework).
+	 */
 ];
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/minitest/minitest.php b/s3_storage/vendor/akeeba/s3/minitest/minitest.php
index 21e9dce1..0d986804 100644
--- a/s3_storage/vendor/akeeba/s3/minitest/minitest.php
+++ b/s3_storage/vendor/akeeba/s3/minitest/minitest.php
@@ -3,13 +3,29 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
 use Akeeba\S3\Configuration;
 use Akeeba\S3\Connector;
-use Akeeba\S3\Input;
+
+/**
+ * The Miniature Test Framework For The Akeeba S3 Library
+ *
+ * This is a self-contained test-suite runner. Running minitest.php will execute all the tests against all
+ * configurations set up in the config.php file. When it's decked out with all real world examples this can take many
+ * hours to complete (it's not as "mini" as its name would like you to believe).
+ *
+ * Please read NOTES.md before proceeding and do keep in mind that some tests may fail for reasons outside the control
+ * of the library such as network conditions, whether PHP has a configured Certification Authority cache etc.
+ *
+ * As to why we didn't use Unit Tests: Elementary, dear Watson. Unit Tests are great when testing your code against a
+ * specification. In this case, the specification would be the Amazon S3 API documentation. Sounds great in theory, but
+ * not even Amazon itself works according to its own documentation, let alone the third party "S3-compatible" services
+ * which each one implements its own interpretation of that documentation. Therefore, slow-as-heck integration testing
+ * is the only way to do any kind of meaningful testing.
+ */
 
 // Necessary for including the library
 define('AKEEBAENGINE', 1);
@@ -152,6 +168,13 @@ foreach ($testConfigurations as $description => $setup)
 	echo "▶ " . $description . PHP_EOL;
 	echo str_repeat('〰', 80) . PHP_EOL . PHP_EOL;
 
+	if ($setup['skip'] ?? false)
+	{
+		echo "\t🤡 Skipping\n\n";
+
+		continue;
+	}
+
 	// Extract the configuration options
 	if (!isset($setup['configuration']))
 	{
@@ -159,14 +182,14 @@ foreach ($testConfigurations as $description => $setup)
 	}
 
 	$configOptions = array_merge([
-		'access'      => DEFAULT_ACCESS_KEY,
-		'secret'      => DEFAULT_SECRET_KEY,
-		'region'      => DEFAULT_REGION,
-		'bucket'      => DEFAULT_BUCKET,
-		'signature'   => DEFAULT_SIGNATURE,
-		'dualstack'   => DEFAULT_DUALSTACK,
-		'path_access' => DEFAULT_PATH_ACCESS,
-		'ssl'         => DEFAULT_SSL,
+		'access'      => defined('DEFAULT_ACCESS_KEY') ? DEFAULT_ACCESS_KEY : null,
+		'secret'      => defined('DEFAULT_SECRET_KEY') ? DEFAULT_SECRET_KEY : null,
+		'region'      => defined('DEFAULT_REGION') ? DEFAULT_REGION : null,
+		'bucket'      => defined('DEFAULT_BUCKET') ? DEFAULT_BUCKET : null,
+		'signature'   => defined('DEFAULT_SIGNATURE') ? DEFAULT_SIGNATURE : null,
+		'dualstack'   => defined('DEFAULT_DUALSTACK') ? DEFAULT_DUALSTACK : null,
+		'path_access' => defined('DEFAULT_PATH_ACCESS') ? DEFAULT_PATH_ACCESS : null,
+		'ssl'         => defined('DEFAULT_SSL') ? DEFAULT_SSL : null,
 		'endpoint'    => defined('DEFAULT_ENDPOINT') ? constant('DEFAULT_ENDPOINT') : null,
 	], $setup['configuration']);
 
@@ -200,6 +223,22 @@ foreach ($testConfigurations as $description => $setup)
 	$s3Configuration->setUseLegacyPathStyle($configOptions['path_access']);
 	$s3Configuration->setSSL($configOptions['ssl']);
 
+	// Feature flags
+	if (isset($configOptions['alternateDateHeaderFormat']))
+	{
+		$s3Configuration->setAlternateDateHeaderFormat((bool) $configOptions['alternateDateHeaderFormat']);
+	}
+
+	if (isset($configOptions['useHTTPDateHeader']))
+	{
+		$s3Configuration->setUseHTTPDateHeader((bool) $configOptions['useHTTPDateHeader']);
+	}
+
+	if (isset($configOptions['preSignedBucketInURL']))
+	{
+		$s3Configuration->setPreSignedBucketInURL((bool) $configOptions['preSignedBucketInURL']);
+	}
+
 	// Create the connector object
 	$s3Connector = new Connector($s3Configuration);
 
@@ -350,7 +389,7 @@ foreach ($testConfigurations as $description => $setup)
 			[$className, $method] = $callableSetup;
 			echo "  ⏱ Tearing down {$className}:{$method}…";
 			call_user_func($callableTeardown, $s3Connector, $configOptions);
-			echo "\r     Teared down {$className}   " . PHP_EOL;
+			echo "\r     Tore down {$className}   " . PHP_EOL;
 		}
 	}
 
diff --git a/s3_storage/vendor/akeeba/s3/src/Acl.php b/s3_storage/vendor/akeeba/s3/src/Acl.php
index 3a58f5e8..178932a6 100644
--- a/s3_storage/vendor/akeeba/s3/src/Acl.php
+++ b/s3_storage/vendor/akeeba/s3/src/Acl.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/src/Configuration.php b/s3_storage/vendor/akeeba/s3/src/Configuration.php
index ca5fa19e..9128ae50 100644
--- a/s3_storage/vendor/akeeba/s3/src/Configuration.php
+++ b/s3_storage/vendor/akeeba/s3/src/Configuration.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
@@ -82,6 +82,33 @@ class Configuration
 	 */
 	protected $endpoint = 's3.amazonaws.com';
 
+	/**
+	 * Should I use an alternative date header format (D, d M Y H:i:s T instead of D, d M Y H:i:s O) for non-Amazon,
+	 * S3-compatible services?
+	 *
+	 * This is enabled by default.
+	 *
+	 * @var  bool
+	 */
+	protected $alternateDateHeaderFormat = true;
+
+	/**
+	 * Should I use the standard HTTP Date header instead of the X-Amz-Date header?
+	 *
+	 * @var  bool
+	 */
+	protected $useHTTPDateHeader = false;
+
+	/**
+	 * Should pre-signed URLs include the bucket name in the URL? Only applies to v4 signatures.
+	 *
+	 * Amazon S3 and most implementations need this turned off (default). LocalStack seems to not work properly with the
+	 * bucket name as a subdomain, hence the need for this flag.
+	 *
+	 * @var  bool
+	 */
+	protected $preSignedBucketInURL = false;
+
 	/**
 	 * Public constructor
 	 *
@@ -363,4 +390,58 @@ class Configuration
 	{
 		$this->useDualstackUrl = $useDualstackUrl;
 	}
+
+	/**
+	 * Get the flag for using an alternate date format for non-Amazon, S3-compatible services.
+	 *
+	 * @return bool
+	 */
+	public function getAlternateDateHeaderFormat(): bool
+	{
+		return $this->alternateDateHeaderFormat;
+	}
+
+	/**
+	 * Set the flag for using an alternate date format for non-Amazon, S3-compatible services.
+	 *
+	 * @param   bool  $alternateDateHeaderFormat
+	 *
+	 * @return  void
+	 */
+	public function setAlternateDateHeaderFormat(bool $alternateDateHeaderFormat): void
+	{
+		$this->alternateDateHeaderFormat = $alternateDateHeaderFormat;
+	}
+
+	/**
+	 * Get the flag indicating whether to use the HTTP Date header
+	 *
+	 * @return  bool  Flag indicating whether to use the HTTP Date header
+	 */
+	public function getUseHTTPDateHeader(): bool
+	{
+		return $this->useHTTPDateHeader;
+	}
+
+	/**
+	 * Set the flag indicating whether to use the HTTP Date header.
+	 *
+	 * @param   bool  $useHTTPDateHeader  Whether to use the HTTP Date header
+	 *
+	 * @return  void
+	 */
+	public function setUseHTTPDateHeader(bool $useHTTPDateHeader): void
+	{
+		$this->useHTTPDateHeader = $useHTTPDateHeader;
+	}
+
+	public function getPreSignedBucketInURL(): bool
+	{
+		return $this->preSignedBucketInURL;
+	}
+
+	public function setPreSignedBucketInURL(bool $preSignedBucketInURL): void
+	{
+		$this->preSignedBucketInURL = $preSignedBucketInURL;
+	}
 }
diff --git a/s3_storage/vendor/akeeba/s3/src/Connector.php b/s3_storage/vendor/akeeba/s3/src/Connector.php
index 54fdc3cc..e57e710f 100644
--- a/s3_storage/vendor/akeeba/s3/src/Connector.php
+++ b/s3_storage/vendor/akeeba/s3/src/Connector.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
@@ -341,7 +341,7 @@ class Connector
 		 * Authenticated (pre-signed) URLs are always made against the generic S3 region endpoint, not the bucket's
 		 * virtual-hosting-style domain name. The bucket is always the first component of the path.
 		 *
-		 * For example, given a bucket called foobar and an object baz.txt in it we are pre-signing the URL
+		 * For example, given a bucket called foobar, and an object baz.txt in it, we are pre-signing the URL
 		 * https://s3-eu-west-1.amazonaws.com/foobar/baz.txt, not
 		 * https://foobar.s3-eu-west-1.amazonaws.com/foobar/baz.txt (as we'd be doing with v2 signatures).
 		 *
@@ -354,7 +354,7 @@ class Connector
 		 * object is true. Naturally, the default behavior being virtual-hosting-style access to buckets, this flag is
 		 * most likely **false**.
 		 *
-		 * Therefore we need to clone the Configuration object, set the flag to true and create a Request object using
+		 * Therefore, we need to clone the Configuration object, set the flag to true and create a Request object using
 		 * the falsified Configuration object.
 		 *
 		 * Note that v2 signatures are not affected. In v2 we are always appending the bucket name to the path, despite
@@ -368,7 +368,6 @@ class Connector
 		$newConfig->setUseLegacyPathStyle(true);
 
 		// Create the request object.
-		$uri     = str_replace('%2F', '/', rawurlencode($uri));
 		$request = new Request('GET', $bucket, $uri, $newConfig);
 
 		if ($query)
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/CannotDeleteFile.php b/s3_storage/vendor/akeeba/s3/src/Exception/CannotDeleteFile.php
index 05e3fa50..7bb47035 100644
--- a/s3_storage/vendor/akeeba/s3/src/Exception/CannotDeleteFile.php
+++ b/s3_storage/vendor/akeeba/s3/src/Exception/CannotDeleteFile.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/CannotGetBucket.php b/s3_storage/vendor/akeeba/s3/src/Exception/CannotGetBucket.php
index e87c0994..0910fb61 100644
--- a/s3_storage/vendor/akeeba/s3/src/Exception/CannotGetBucket.php
+++ b/s3_storage/vendor/akeeba/s3/src/Exception/CannotGetBucket.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/CannotGetFile.php b/s3_storage/vendor/akeeba/s3/src/Exception/CannotGetFile.php
index 5a9d8e82..3582cea1 100644
--- a/s3_storage/vendor/akeeba/s3/src/Exception/CannotGetFile.php
+++ b/s3_storage/vendor/akeeba/s3/src/Exception/CannotGetFile.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/CannotListBuckets.php b/s3_storage/vendor/akeeba/s3/src/Exception/CannotListBuckets.php
index 7a365fba..86799275 100644
--- a/s3_storage/vendor/akeeba/s3/src/Exception/CannotListBuckets.php
+++ b/s3_storage/vendor/akeeba/s3/src/Exception/CannotListBuckets.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/CannotOpenFileForRead.php b/s3_storage/vendor/akeeba/s3/src/Exception/CannotOpenFileForRead.php
index 78aa5cd2..ea8c729e 100644
--- a/s3_storage/vendor/akeeba/s3/src/Exception/CannotOpenFileForRead.php
+++ b/s3_storage/vendor/akeeba/s3/src/Exception/CannotOpenFileForRead.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/CannotOpenFileForWrite.php b/s3_storage/vendor/akeeba/s3/src/Exception/CannotOpenFileForWrite.php
index 24f8a724..9a7fcde9 100644
--- a/s3_storage/vendor/akeeba/s3/src/Exception/CannotOpenFileForWrite.php
+++ b/s3_storage/vendor/akeeba/s3/src/Exception/CannotOpenFileForWrite.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/CannotPutFile.php b/s3_storage/vendor/akeeba/s3/src/Exception/CannotPutFile.php
index a7a2a478..2656eeae 100644
--- a/s3_storage/vendor/akeeba/s3/src/Exception/CannotPutFile.php
+++ b/s3_storage/vendor/akeeba/s3/src/Exception/CannotPutFile.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/ConfigurationError.php b/s3_storage/vendor/akeeba/s3/src/Exception/ConfigurationError.php
index 2699b5e7..f4789687 100644
--- a/s3_storage/vendor/akeeba/s3/src/Exception/ConfigurationError.php
+++ b/s3_storage/vendor/akeeba/s3/src/Exception/ConfigurationError.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidAccessKey.php b/s3_storage/vendor/akeeba/s3/src/Exception/InvalidAccessKey.php
index 3db444b4..d8e7afe7 100644
--- a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidAccessKey.php
+++ b/s3_storage/vendor/akeeba/s3/src/Exception/InvalidAccessKey.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidBody.php b/s3_storage/vendor/akeeba/s3/src/Exception/InvalidBody.php
index 57b628fd..4971a468 100644
--- a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidBody.php
+++ b/s3_storage/vendor/akeeba/s3/src/Exception/InvalidBody.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidEndpoint.php b/s3_storage/vendor/akeeba/s3/src/Exception/InvalidEndpoint.php
index 3c58c035..0ef7a3fe 100644
--- a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidEndpoint.php
+++ b/s3_storage/vendor/akeeba/s3/src/Exception/InvalidEndpoint.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidFilePointer.php b/s3_storage/vendor/akeeba/s3/src/Exception/InvalidFilePointer.php
index 15c546cd..4b6bc1c4 100644
--- a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidFilePointer.php
+++ b/s3_storage/vendor/akeeba/s3/src/Exception/InvalidFilePointer.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidRegion.php b/s3_storage/vendor/akeeba/s3/src/Exception/InvalidRegion.php
index e21c1f67..6fd7a9eb 100644
--- a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidRegion.php
+++ b/s3_storage/vendor/akeeba/s3/src/Exception/InvalidRegion.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidSecretKey.php b/s3_storage/vendor/akeeba/s3/src/Exception/InvalidSecretKey.php
index af58e5d9..31e964ef 100644
--- a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidSecretKey.php
+++ b/s3_storage/vendor/akeeba/s3/src/Exception/InvalidSecretKey.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidSignatureMethod.php b/s3_storage/vendor/akeeba/s3/src/Exception/InvalidSignatureMethod.php
index bd4fdedc..44b8b5c7 100644
--- a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidSignatureMethod.php
+++ b/s3_storage/vendor/akeeba/s3/src/Exception/InvalidSignatureMethod.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/PropertyNotFound.php b/s3_storage/vendor/akeeba/s3/src/Exception/PropertyNotFound.php
index 3f521532..58eb7755 100644
--- a/s3_storage/vendor/akeeba/s3/src/Exception/PropertyNotFound.php
+++ b/s3_storage/vendor/akeeba/s3/src/Exception/PropertyNotFound.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/src/Input.php b/s3_storage/vendor/akeeba/s3/src/Input.php
index 5dd5743d..1fab7186 100644
--- a/s3_storage/vendor/akeeba/s3/src/Input.php
+++ b/s3_storage/vendor/akeeba/s3/src/Input.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/src/Request.php b/s3_storage/vendor/akeeba/s3/src/Request.php
index 4237b862..d9b1833a 100644
--- a/s3_storage/vendor/akeeba/s3/src/Request.php
+++ b/s3_storage/vendor/akeeba/s3/src/Request.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
@@ -143,7 +143,7 @@ class Request
 		$this->headers['Date'] = gmdate('D, d M Y H:i:s O');
 
 		// S3-"compatible" services use a different date format. Because why not?
-		if (strpos($this->headers['Host'], '.amazonaws.com') === false)
+		if ($this->configuration->getAlternateDateHeaderFormat() && strpos($this->headers['Host'], '.amazonaws.com') === false)
 		{
 			$this->headers['Date'] = gmdate('D, d M Y H:i:s T');
 		}
@@ -438,16 +438,30 @@ class Request
 		curl_setopt($curl, CURLOPT_URL, $url);
 
 		/**
-		 * Set the optional x-amz-date header for third party services.
+		 * Set the optional x-amz-date header instead of the standard HTTP Date header.
 		 *
-		 * Amazon S3 proper expects to get the date from the Date header. Third party services typically implement the
-		 * (wrongly) documented behaviour of using the x-amz-date header but, if it's missing, fall back to the Date
-		 * header. Wasabi does not fall back; it only uses the x-amz-date header which is why we have to set it here if
-		 * the request iss not made to Amazon S3 proper.
+		 * Amazon S3 proper expects to get the date from the Date header. It also allows you to instead use the optional
+		 * X-Amz-Date header as a means to resolve situations where your HTTP library does not let you control the
+		 * standard Date header. In other words, it accepts both, it encourages the standard Date header, but it will
+		 * give priority to the X-Amz-Date header to help you get out of a sticky situation.
+		 *
+		 * Unfortunately, third party services which claim to be "S3-compatible" are written by people with poor reading
+		 * skills or, more likely, under unrealistic time constraints to deliver working code. They are implementing the
+		 * date handling behaviout wrong. Instead of using the Date header unless the X-Amz-Date header is set, they
+		 * **expect** to only ever see the X-Amz-Date header. If it's missing, they do not fall back to the standard
+		 * Date header; they just spit out a message about the signature being wrong. Wasabi and ExoScale are two prime
+		 * examples of that, and only when using v2 signatures.
+		 *
+		 * To avoid this problem, we are now defaulting to always using the X-Amz-Date header everywhere. If you want to
+		 * revert to using the Date header with S3 proper please use setUseHTTPDateHeader(true) to your configuration
+		 * object. In this case DO NOT set the X-Amz-Date header yourself, or you're going to have a *really* bad time.
 		 */
-		$this->headers['x-amz-date'] = strpos($this->headers['Host'], '.amazonaws.com') !== false
-			? ''
-			: (new \DateTime($this->headers['Date']))->format('Ymd\THis\Z');
+		if (!$this->configuration->getUseHTTPDateHeader())
+		{
+			$this->amzHeaders['x-amz-date'] = (new \DateTime($this->headers['Date']))->format('Ymd\THis\Z');
+
+			unset ($this->headers['Date']);
+		}
 
 		/**
 		 * Remove empty headers.
diff --git a/s3_storage/vendor/akeeba/s3/src/Response.php b/s3_storage/vendor/akeeba/s3/src/Response.php
index 01810941..56bb5d83 100644
--- a/s3_storage/vendor/akeeba/s3/src/Response.php
+++ b/s3_storage/vendor/akeeba/s3/src/Response.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/src/Response/Error.php b/s3_storage/vendor/akeeba/s3/src/Response/Error.php
index 69710bdf..f316b6ae 100644
--- a/s3_storage/vendor/akeeba/s3/src/Response/Error.php
+++ b/s3_storage/vendor/akeeba/s3/src/Response/Error.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/src/Signature.php b/s3_storage/vendor/akeeba/s3/src/Signature.php
index 93d8f0f6..a1def56c 100644
--- a/s3_storage/vendor/akeeba/s3/src/Signature.php
+++ b/s3_storage/vendor/akeeba/s3/src/Signature.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/src/Signature/V2.php b/s3_storage/vendor/akeeba/s3/src/Signature/V2.php
index 6864846f..ef7e7daa 100644
--- a/s3_storage/vendor/akeeba/s3/src/Signature/V2.php
+++ b/s3_storage/vendor/akeeba/s3/src/Signature/V2.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
@@ -64,10 +64,11 @@ class V2 extends Signature
 
 		$search = '/' . $bucket;
 
-		if (strpos($uri, $search) === 0)
-		{
-			$uri = substr($uri, strlen($search));
-		}
+		// This does not look right... The bucket name must be included in the URL.
+//		 if (strpos($uri, $search) === 0)
+//		 {
+//		 	$uri = substr($uri, strlen($search));
+//		 }
 
 		$queryParameters = array_merge($this->request->getParameters(), [
 			'AWSAccessKeyId' => $accessKey,
@@ -134,7 +135,15 @@ class V2 extends Signature
 		// See http://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html#RESTAuthenticationQueryStringAuth
 		if (isset($headers['Expires']))
 		{
-			$headers['Date'] = $headers['Expires'];
+			if (isset($headers['Date']))
+			{
+				$headers['Date'] = $headers['Expires'];
+			}
+			else
+			{
+				$amzHeaders['x-amz-date'] = $headers['Expires'];
+			}
+
 			unset ($headers['Expires']);
 
 			$isPresignedURL = true;
@@ -152,14 +161,14 @@ class V2 extends Signature
 		$stringToSign = $verb . "\n" .
 			($headers['Content-MD5'] ?? '') . "\n" .
 			($headers['Content-Type'] ?? '') . "\n" .
-			$headers['Date'] .
+			($headers['Date'] ?? '') .
 			$amzString . "\n" .
 			$resourcePath;
 
 		// CloudFront only requires a date to be signed
 		if ($headers['Host'] == 'cloudfront.amazonaws.com')
 		{
-			$stringToSign = $headers['Date'];
+			$stringToSign = $headers['Date'] ?? $amzHeaders['x-amz-date'] ?? '';
 		}
 
 		$amazonV2Hash = $this->amazonV2Hash($stringToSign);
diff --git a/s3_storage/vendor/akeeba/s3/src/Signature/V4.php b/s3_storage/vendor/akeeba/s3/src/Signature/V4.php
index b39f81f4..daf27afc 100644
--- a/s3_storage/vendor/akeeba/s3/src/Signature/V4.php
+++ b/s3_storage/vendor/akeeba/s3/src/Signature/V4.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
@@ -80,7 +80,7 @@ class V4 extends Signature
 		$bucket   = $this->request->getBucket();
 		$hostname = $this->getPresignedHostnameForRegion($region);
 
-		if ($this->isValidBucketName($bucket))
+		if (!$this->request->getConfiguration()->getPreSignedBucketInURL() && $this->isValidBucketName($bucket))
 		{
 			$hostname = $bucket . '.' . $hostname;
 		}
@@ -99,7 +99,11 @@ class V4 extends Signature
 		// The query parameters are returned serialized; unserialize them, then build and return the URL.
 		$queryParameters = unserialize($serialisedParams);
 
-		if ($this->isValidBucketName($bucket) && strpos($uri, '/' . $bucket) === 0)
+		// This should be toggleable
+		if (
+			!$this->request->getConfiguration()->getPreSignedBucketInURL()
+			&& $this->isValidBucketName($bucket)
+			&& strpos($uri, '/' . $bucket) === 0)
 		{
 			$uri = substr($uri, strlen($bucket) + 1);
 		}
@@ -137,7 +141,7 @@ class V4 extends Signature
 		}
 
 		// Get the credentials scope
-		$signatureDate = new DateTime($headers['Date']);
+		$signatureDate = new DateTime($headers['Date'] ?? $amzHeaders['x-amz-date']);
 
 		$credentialScope = $signatureDate->format('Ymd') . '/' .
 		                   $this->request->getConfiguration()->getRegion() . '/' .
@@ -218,10 +222,37 @@ class V4 extends Signature
 
 		// The canonical URI is the resource path
 		$canonicalURI     = $resourcePath;
-		$bucketResource   = '/' . $bucket;
+		$bucketResource   = '/' . $bucket . '/';
 		$regionalHostname = ($headers['Host'] != 's3.amazonaws.com')
 		                    && ($headers['Host'] != $bucket . '.s3.amazonaws.com');
 
+		/**
+		 * Yet another special case for third party, S3-compatible services, when using pre-signed URLs.
+		 *
+		 * Given a bucket `example` and filepath `foo/bar.txt` the canonical URI to sign is supposed to be
+		 * /example/foo/bar.txt regardless of whether we are using path style or subdomain hosting style access to the
+		 * bucket.
+		 *
+		 * When calculating a pre-signed URL, the URL we will be accessing will be something to the tune of
+		 * example.endpoint.com/foo/bar.txt. Amazon S3 proper allows us to use EITHER the nominal canonical URI
+		 * /foo/bar.txt OR the /example/foo/bar.txt canonical URI for consistency. Some third party providers, like
+		 * Wasabi, will choke on the former and complain about the signature being invalid.
+		 *
+		 * To address this issue we check if all the following conditions are met:
+		 * - We are calculating a signature for a pre-signed URL.
+		 * - The service is NOT Amazon S3 proper.
+		 * - The domain name starts with the bucket name.
+		 * In this case, and this case only, we set $regionalHostname to false. This triggers an if-block further down
+		 * which strips the `/bucketName/` prefix from the canonical URI, converting it to `/`. Therefore, the canonical
+		 * URI in the signature becomes the nominal URI we will be accessing in the bucket, solving the problem with
+		 * those third party services.
+		 */
+		// Figuring out whether it's a regional hostname DOES NOT work above if it's not AWS S3 proper. Let's fix that.
+		if ($isPresignedURL && strpos($headers['Host'], 'amazonaws.com') === false && !strpos($headers['Host'], $bucket . '.'))
+		{
+			$regionalHostname = false;
+		}
+
 		// Special case: if the canonical URI ends in /?location the bucket name DOES count as part of the canonical URL
 		// even though the Host is s3.amazonaws.com (in which case it normally shouldn't count). Yeah, I know, it makes
 		// no sense!!!
@@ -231,15 +262,15 @@ class V4 extends Signature
 			$regionalHostname = true;
 		}
 
-		if (!$regionalHostname && (strpos($canonicalURI, $bucketResource) === 0))
+		if (!$regionalHostname && (strpos($canonicalURI, $bucketResource) === 0 || strpos($canonicalURI, substr($bucketResource, 0, -1)) === 0))
 		{
-			if ($canonicalURI === $bucketResource)
+			if ($canonicalURI === substr($bucketResource, 0, -1))
 			{
 				$canonicalURI = '/';
 			}
 			else
 			{
-				$canonicalURI = substr($canonicalURI, strlen($bucketResource));
+				$canonicalURI = substr($canonicalURI, strlen($bucketResource) - 1);
 			}
 		}
 
@@ -323,7 +354,7 @@ class V4 extends Signature
 		 * headers if the request is made to a service _other_ than Amazon S3 proper.
 		 */
 		$dateToSignFor = strpos($headers['Host'], '.amazonaws.com') !== false
-			? $headers['Date']
+			? (($headers['Date'] ?? null) ?: ($amzHeaders['x-amz-date'] ?? null) ?: $signatureDate->format('Ymd\THis\Z'))
 			: $signatureDate->format('Ymd\THis\Z');
 
 		$stringToSign = "AWS4-HMAC-SHA256\n" .
@@ -410,7 +441,8 @@ class V4 extends Signature
 			$endpoint = 's3.' . $region . '.amazonaws.com';
 		}
 
-		$dualstackEnabled = $this->request->getConfiguration()->getDualstackUrl();
+		// As of October 2023, AWS does not consider DualStack signed URLs as valid. Whatever.
+		$dualstackEnabled = false && $this->request->getConfiguration()->getDualstackUrl();
 
 		// If dual-stack URLs are enabled then prepend the endpoint
 		if ($dualstackEnabled)
diff --git a/s3_storage/vendor/akeeba/s3/src/StorageClass.php b/s3_storage/vendor/akeeba/s3/src/StorageClass.php
index 0c213af2..91f9bb84 100644
--- a/s3_storage/vendor/akeeba/s3/src/StorageClass.php
+++ b/s3_storage/vendor/akeeba/s3/src/StorageClass.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/akeeba/s3/src/aliasing.php b/s3_storage/vendor/akeeba/s3/src/aliasing.php
index 4b408ac3..f5a11897 100644
--- a/s3_storage/vendor/akeeba/s3/src/aliasing.php
+++ b/s3_storage/vendor/akeeba/s3/src/aliasing.php
@@ -3,7 +3,7 @@
  * Akeeba Engine
  *
  * @package   akeebaengine
- * @copyright Copyright (c)2006-2023 Nicholas K. Dionysopoulos / Akeeba Ltd
+ * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
  * @license   GNU General Public License version 3, or later
  */
 
diff --git a/s3_storage/vendor/composer/installed.json b/s3_storage/vendor/composer/installed.json
index 70c17e11..ac2eaec6 100644
--- a/s3_storage/vendor/composer/installed.json
+++ b/s3_storage/vendor/composer/installed.json
@@ -1,17 +1,17 @@
 [
     {
         "name": "akeeba/s3",
-        "version": "2.3.1",
-        "version_normalized": "2.3.1.0",
+        "version": "2.3.2",
+        "version_normalized": "2.3.2.0",
         "source": {
             "type": "git",
             "url": "https://github.com/akeeba/s3.git",
-            "reference": "7f5b3e929c93eb02ba24472560c0cbbef735aed9"
+            "reference": "452fbd3084f1cb581851a1602226224d29d586d4"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/akeeba/s3/zipball/7f5b3e929c93eb02ba24472560c0cbbef735aed9",
-            "reference": "7f5b3e929c93eb02ba24472560c0cbbef735aed9",
+            "url": "https://api.github.com/repos/akeeba/s3/zipball/452fbd3084f1cb581851a1602226224d29d586d4",
+            "reference": "452fbd3084f1cb581851a1602226224d29d586d4",
             "shasum": ""
         },
         "require": {
@@ -19,7 +19,7 @@
             "ext-simplexml": "*",
             "php": ">=7.1.0 <8.4"
         },
-        "time": "2023-09-26T11:40:10+00:00",
+        "time": "2024-02-19T10:08:06+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {

From 7bff983d215650cd2c732fbeaf6daea7aa96fbab Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Tue, 19 Mar 2024 23:01:21 -0400
Subject: [PATCH 065/294] [saml] Update Composer dependency ahead of release

- Updating onelogin/php-saml (4.0.0 => 4.1.0)
---
 saml/composer.lock                            |  17 +-
 saml/vendor/composer/ClassLoader.php          |  38 +---
 saml/vendor/composer/autoload_classmap.php    |   1 -
 saml/vendor/composer/autoload_real.php        |   6 +-
 saml/vendor/composer/autoload_static.php      |   5 -
 saml/vendor/composer/installed.json           | 205 +++++++++---------
 .../.github/workflows/php-package.yml         |  54 +++++
 saml/vendor/onelogin/php-saml/README.md       |  39 +++-
 .../onelogin/php-saml/src/Saml2/Auth.php      |   6 +-
 .../php-saml/src/Saml2/IdPMetadataParser.php  |   7 +
 .../onelogin/php-saml/src/Saml2/Response.php  |  28 ++-
 .../onelogin/php-saml/src/Saml2/Settings.php  |   2 +-
 .../onelogin/php-saml/src/Saml2/Utils.php     |  29 ++-
 .../onelogin/php-saml/src/Saml2/version.json  |   4 +-
 14 files changed, 256 insertions(+), 185 deletions(-)
 create mode 100644 saml/vendor/onelogin/php-saml/.github/workflows/php-package.yml

diff --git a/saml/composer.lock b/saml/composer.lock
index 4ae19c1b..46ee7ce6 100644
--- a/saml/composer.lock
+++ b/saml/composer.lock
@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "onelogin/php-saml",
-            "version": "4.0.0",
+            "version": "4.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/onelogin/php-saml.git",
-                "reference": "f30f5062f3653c4d2082892d207f4dc3e577d979"
+                "reference": "b22a57ebd13e838b90df5d3346090bc37056409d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/onelogin/php-saml/zipball/f30f5062f3653c4d2082892d207f4dc3e577d979",
-                "reference": "f30f5062f3653c4d2082892d207f4dc3e577d979",
+                "url": "https://api.github.com/repos/onelogin/php-saml/zipball/b22a57ebd13e838b90df5d3346090bc37056409d",
+                "reference": "b22a57ebd13e838b90df5d3346090bc37056409d",
                 "shasum": ""
             },
             "require": {
@@ -55,12 +55,7 @@
                 "onelogin",
                 "saml"
             ],
-            "support": {
-                "email": "sixto.garcia@onelogin.com",
-                "issues": "https://github.com/onelogin/php-saml/issues",
-                "source": "https://github.com/onelogin/php-saml/"
-            },
-            "time": "2021-03-02T10:19:19+00:00"
+            "time": "2022-07-15T20:44:36+00:00"
         },
         {
             "name": "robrichards/xmlseclibs",
@@ -113,5 +108,5 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
-    "plugin-api-version": "2.0.0"
+    "plugin-api-version": "1.1.0"
 }
diff --git a/saml/vendor/composer/ClassLoader.php b/saml/vendor/composer/ClassLoader.php
index 247294d6..03b9bb9c 100644
--- a/saml/vendor/composer/ClassLoader.php
+++ b/saml/vendor/composer/ClassLoader.php
@@ -37,13 +37,11 @@ namespace Composer\Autoload;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    https://www.php-fig.org/psr/psr-0/
- * @see    https://www.php-fig.org/psr/psr-4/
+ * @see    http://www.php-fig.org/psr/psr-0/
+ * @see    http://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {
-    private $vendorDir;
-
     // PSR-4
     private $prefixLengthsPsr4 = array();
     private $prefixDirsPsr4 = array();
@@ -59,13 +57,6 @@ class ClassLoader
     private $missingClasses = array();
     private $apcuPrefix;
 
-    private static $registeredLoaders = array();
-
-    public function __construct($vendorDir = null)
-    {
-        $this->vendorDir = $vendorDir;
-    }
-
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
@@ -309,17 +300,6 @@ class ClassLoader
     public function register($prepend = false)
     {
         spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-
-        if (null === $this->vendorDir) {
-            return;
-        }
-
-        if ($prepend) {
-            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
-        } else {
-            unset(self::$registeredLoaders[$this->vendorDir]);
-            self::$registeredLoaders[$this->vendorDir] = $this;
-        }
     }
 
     /**
@@ -328,10 +308,6 @@ class ClassLoader
     public function unregister()
     {
         spl_autoload_unregister(array($this, 'loadClass'));
-
-        if (null !== $this->vendorDir) {
-            unset(self::$registeredLoaders[$this->vendorDir]);
-        }
     }
 
     /**
@@ -391,16 +367,6 @@ class ClassLoader
         return $file;
     }
 
-    /**
-     * Returns the currently registered loaders indexed by their corresponding vendor directories.
-     *
-     * @return self[]
-     */
-    public static function getRegisteredLoaders()
-    {
-        return self::$registeredLoaders;
-    }
-
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
diff --git a/saml/vendor/composer/autoload_classmap.php b/saml/vendor/composer/autoload_classmap.php
index b26f1b13..7a91153b 100644
--- a/saml/vendor/composer/autoload_classmap.php
+++ b/saml/vendor/composer/autoload_classmap.php
@@ -6,5 +6,4 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
 );
diff --git a/saml/vendor/composer/autoload_real.php b/saml/vendor/composer/autoload_real.php
index 617b7cd1..724ced60 100644
--- a/saml/vendor/composer/autoload_real.php
+++ b/saml/vendor/composer/autoload_real.php
@@ -22,15 +22,13 @@ class ComposerAutoloaderInit6ecac07d47dd9d108b36bee3eda76704
             return self::$loader;
         }
 
-        require __DIR__ . '/platform_check.php';
-
         spl_autoload_register(array('ComposerAutoloaderInit6ecac07d47dd9d108b36bee3eda76704', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
         spl_autoload_unregister(array('ComposerAutoloaderInit6ecac07d47dd9d108b36bee3eda76704', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
-            require __DIR__ . '/autoload_static.php';
+            require_once __DIR__ . '/autoload_static.php';
 
             call_user_func(\Composer\Autoload\ComposerStaticInit6ecac07d47dd9d108b36bee3eda76704::getInitializer($loader));
         } else {
diff --git a/saml/vendor/composer/autoload_static.php b/saml/vendor/composer/autoload_static.php
index cc5e7f93..395b9179 100644
--- a/saml/vendor/composer/autoload_static.php
+++ b/saml/vendor/composer/autoload_static.php
@@ -28,16 +28,11 @@ class ComposerStaticInit6ecac07d47dd9d108b36bee3eda76704
         ),
     );
 
-    public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
-    );
-
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInit6ecac07d47dd9d108b36bee3eda76704::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInit6ecac07d47dd9d108b36bee3eda76704::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit6ecac07d47dd9d108b36bee3eda76704::$classMap;
 
         }, null, ClassLoader::class);
     }
diff --git a/saml/vendor/composer/installed.json b/saml/vendor/composer/installed.json
index 689f9b11..f87cbadb 100644
--- a/saml/vendor/composer/installed.json
+++ b/saml/vendor/composer/installed.json
@@ -1,110 +1,99 @@
-{
-    "packages": [
-        {
-            "name": "onelogin/php-saml",
-            "version": "4.0.0",
-            "version_normalized": "4.0.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/onelogin/php-saml.git",
-                "reference": "f30f5062f3653c4d2082892d207f4dc3e577d979"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/onelogin/php-saml/zipball/f30f5062f3653c4d2082892d207f4dc3e577d979",
-                "reference": "f30f5062f3653c4d2082892d207f4dc3e577d979",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3",
-                "robrichards/xmlseclibs": ">=3.1.1"
-            },
-            "require-dev": {
-                "pdepend/pdepend": "^2.8.0",
-                "php-coveralls/php-coveralls": "^2.0",
-                "phploc/phploc": "^4.0 || ^5.0 || ^6.0 || ^7.0",
-                "phpunit/phpunit": "^9.5",
-                "sebastian/phpcpd": "^4.0 || ^5.0 || ^6.0 ",
-                "squizlabs/php_codesniffer": "^3.5.8"
-            },
-            "suggest": {
-                "ext-curl": "Install curl lib to be able to use the IdPMetadataParser for parsing remote XMLs",
-                "ext-dom": "Install xml lib",
-                "ext-openssl": "Install openssl lib in order to handle with x509 certs (require to support sign and encryption)",
-                "ext-zlib": "Install zlib"
-            },
-            "time": "2021-03-02T10:19:19+00:00",
-            "type": "library",
-            "installation-source": "dist",
-            "autoload": {
-                "psr-4": {
-                    "OneLogin\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "OneLogin PHP SAML Toolkit",
-            "homepage": "https://developers.onelogin.com/saml/php",
-            "keywords": [
-                "SAML2",
-                "onelogin",
-                "saml"
-            ],
-            "support": {
-                "email": "sixto.garcia@onelogin.com",
-                "issues": "https://github.com/onelogin/php-saml/issues",
-                "source": "https://github.com/onelogin/php-saml/"
-            },
-            "install-path": "../onelogin/php-saml"
+[
+    {
+        "name": "onelogin/php-saml",
+        "version": "4.1.0",
+        "version_normalized": "4.1.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/onelogin/php-saml.git",
+            "reference": "b22a57ebd13e838b90df5d3346090bc37056409d"
         },
-        {
-            "name": "robrichards/xmlseclibs",
-            "version": "3.1.1",
-            "version_normalized": "3.1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/robrichards/xmlseclibs.git",
-                "reference": "f8f19e58f26cdb42c54b214ff8a820760292f8df"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/f8f19e58f26cdb42c54b214ff8a820760292f8df",
-                "reference": "f8f19e58f26cdb42c54b214ff8a820760292f8df",
-                "shasum": ""
-            },
-            "require": {
-                "ext-openssl": "*",
-                "php": ">= 5.4"
-            },
-            "time": "2020-09-05T13:00:25+00:00",
-            "type": "library",
-            "installation-source": "dist",
-            "autoload": {
-                "psr-4": {
-                    "RobRichards\\XMLSecLibs\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "A PHP library for XML Security",
-            "homepage": "https://github.com/robrichards/xmlseclibs",
-            "keywords": [
-                "security",
-                "signature",
-                "xml",
-                "xmldsig"
-            ],
-            "support": {
-                "issues": "https://github.com/robrichards/xmlseclibs/issues",
-                "source": "https://github.com/robrichards/xmlseclibs/tree/3.1.1"
-            },
-            "install-path": "../robrichards/xmlseclibs"
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/onelogin/php-saml/zipball/b22a57ebd13e838b90df5d3346090bc37056409d",
+            "reference": "b22a57ebd13e838b90df5d3346090bc37056409d",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=7.3",
+            "robrichards/xmlseclibs": ">=3.1.1"
+        },
+        "require-dev": {
+            "pdepend/pdepend": "^2.8.0",
+            "php-coveralls/php-coveralls": "^2.0",
+            "phploc/phploc": "^4.0 || ^5.0 || ^6.0 || ^7.0",
+            "phpunit/phpunit": "^9.5",
+            "sebastian/phpcpd": "^4.0 || ^5.0 || ^6.0 ",
+            "squizlabs/php_codesniffer": "^3.5.8"
+        },
+        "suggest": {
+            "ext-curl": "Install curl lib to be able to use the IdPMetadataParser for parsing remote XMLs",
+            "ext-dom": "Install xml lib",
+            "ext-openssl": "Install openssl lib in order to handle with x509 certs (require to support sign and encryption)",
+            "ext-zlib": "Install zlib"
+        },
+        "time": "2022-07-15T20:44:36+00:00",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "OneLogin\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "description": "OneLogin PHP SAML Toolkit",
+        "homepage": "https://developers.onelogin.com/saml/php",
+        "keywords": [
+            "SAML2",
+            "onelogin",
+            "saml"
+        ]
+    },
+    {
+        "name": "robrichards/xmlseclibs",
+        "version": "3.1.1",
+        "version_normalized": "3.1.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/robrichards/xmlseclibs.git",
+            "reference": "f8f19e58f26cdb42c54b214ff8a820760292f8df"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/f8f19e58f26cdb42c54b214ff8a820760292f8df",
+            "reference": "f8f19e58f26cdb42c54b214ff8a820760292f8df",
+            "shasum": ""
+        },
+        "require": {
+            "ext-openssl": "*",
+            "php": ">= 5.4"
+        },
+        "time": "2020-09-05T13:00:25+00:00",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "RobRichards\\XMLSecLibs\\": "src"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "description": "A PHP library for XML Security",
+        "homepage": "https://github.com/robrichards/xmlseclibs",
+        "keywords": [
+            "security",
+            "signature",
+            "xml",
+            "xmldsig"
+        ],
+        "support": {
+            "issues": "https://github.com/robrichards/xmlseclibs/issues",
+            "source": "https://github.com/robrichards/xmlseclibs/tree/3.1.1"
         }
-    ],
-    "dev": true,
-    "dev-package-names": []
-}
+    }
+]
diff --git a/saml/vendor/onelogin/php-saml/.github/workflows/php-package.yml b/saml/vendor/onelogin/php-saml/.github/workflows/php-package.yml
new file mode 100644
index 00000000..3ba3d152
--- /dev/null
+++ b/saml/vendor/onelogin/php-saml/.github/workflows/php-package.yml
@@ -0,0 +1,54 @@
+# This workflow will install PHP dependencies, run tests and lint with a variety of PHP versions
+# For more information see: https://github.com/marketplace/actions/setup-php-action
+
+name: php-saml 4.x package
+
+on:
+  push:
+    branches: [ 4.* ]
+  pull_request:
+    branches: [ 4.* ]
+
+jobs:
+  test:
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: ['ubuntu-latest']
+        php-versions: [7.3, 7.4, 8.0, 8.1]
+    steps:
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring, intl, mcrypt, xml
+          tools: composer:v2
+          ini-values: post_max_size=256M, max_execution_time=180
+          coverage: xdebug
+
+      - name: Set git to use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+      - uses: actions/checkout@v2
+
+      - name: Validate composer.json and composer.lock
+        run: composer validate
+
+      - name: Install Composer dependencies
+        run: |
+          composer self-update
+          composer install --prefer-source --no-interaction
+      - name: Syntax check PHP
+        run: |
+          php vendor/bin/phpcpd --exclude tests --exclude vendor .
+          php vendor/bin/phploc src/.
+          mkdir -p tests/build/dependences
+          php vendor/bin/pdepend --summary-xml=tests/build/logs/dependence-summary.xml --jdepend-chart=tests/build/dependences/jdepend.svg --overview-pyramid=tests/build/dependences/pyramid.svg  src/.
+ 
+      - name: PHP Code Sniffer
+        run: php vendor/bin/phpcs --standard=tests/ZendModStandard src/Saml2 demo1 demo2 endpoints tests/src
+    
+      - name: Run unit tests
+        run: vendor/bin/phpunit --verbose --debug
diff --git a/saml/vendor/onelogin/php-saml/README.md b/saml/vendor/onelogin/php-saml/README.md
index d2199ec3..99c24c42 100644
--- a/saml/vendor/onelogin/php-saml/README.md
+++ b/saml/vendor/onelogin/php-saml/README.md
@@ -148,6 +148,37 @@ environment is not secure and will be exposed to attacks.
 
 In production also we highly recommended to register on the settings the IdP certificate instead of using the fingerprint method. The fingerprint, is a hash, so at the end is open to a collision attack that can end on a signature validation bypass. Other SAML toolkits deprecated that mechanism, we maintain it for compatibility and also to be used on test environment.
 
+
+### Avoiding Open Redirect attacks ###
+
+Some implementations uses the RelayState parameter as a way to control the flow when SSO and SLO succeeded. So basically the
+user is redirected to the value of the RelayState.
+
+If you are using Signature Validation on the HTTP-Redirect binding, you will have the RelayState value integrity covered, otherwise, and
+on HTTP-POST binding, you can't trust the RelayState so before
+executing the validation, you need to verify that its value belong
+a trusted and expected URL.
+
+Read more about Open Redirect [CWE-601](https://cwe.mitre.org/data/definitions/601.html).
+
+
+### Avoiding Reply attacks ###
+
+A reply attack is basically try to reuse an intercepted valid SAML Message in order to impersonate a SAML action (SSO or SLO).
+
+SAML Messages have a limited timelife (NotBefore, NotOnOrAfter) that
+make harder this kind of attacks, but they are still possible.
+
+In order to avoid them, the SP can keep a list of SAML Messages or Assertion IDs alredy valdidated and processed. Those values only need
+to be stored the amount of time of the SAML Message life time, so
+we don't need to store all processed message/assertion Ids, but the most recent ones.
+
+The OneLogin_Saml2_Auth class contains the [getLastRequestID](https://github.com/onelogin/php-saml/blob/b8214b74dd72960fa6aa88ab454667c64cea935c/src/Saml2/Auth.php#L657), [getLastMessageId](https://github.com/onelogin/php-saml/blob/b8214b74dd72960fa6aa88ab454667c64cea935c/src/Saml2/Auth.php#L762) and [getLastAssertionId](https://github.com/onelogin/php-saml/blob/b8214b74dd72960fa6aa88ab454667c64cea935c/src/Saml2/Auth.php#L770) methods to retrieve the IDs
+
+Checking that the ID of the current Message/Assertion does not exists in the list of the ones already processed will prevent reply
+attacks.
+
+
 Getting started
 ---------------
 
@@ -754,6 +785,8 @@ $_SESSION['samlNameidSPNameQualifier'] = $auth->getNameIdSPNameQualifier();
 $_SESSION['samlSessionIndex'] = $auth->getSessionIndex();
 
 if (isset($_POST['RelayState']) && OneLogin\Saml2\Utils::getSelfURL() != $_POST['RelayState']) {
+    // To avoid 'Open Redirect' attacks, before execute the
+    // redirection confirm the value of $_POST['RelayState'] is a // trusted URL.
     $auth->redirectTo($_POST['RelayState']);
 }
 
@@ -1092,6 +1125,8 @@ if (isset($_GET['sso'])) {    // SSO action.  Will send an AuthNRequest to the I
 
     $_SESSION['samlUserdata'] = $auth->getAttributes(); // Retrieves user data
     if (isset($_POST['RelayState']) && OneLogin\Saml2\Utils::getSelfURL() != $_POST['RelayState']) {
+        // To avoid 'Open Redirect' attacks, before execute the
+        // redirection confirm the value of $_POST['RelayState'] is a // trusted URL.
         $auth->redirectTo($_POST['RelayState']);  // Redirect if there is a
     }                                             // relayState set
 } else if (isset($_GET['sls'])) {   // Single Logout Service
@@ -1100,7 +1135,7 @@ if (isset($_GET['sso'])) {    // SSO action.  Will send an AuthNRequest to the I
     if (empty($errors)) {
         echo '<p>Sucessfully logged out</p>';
     } else {
-        echo '<p>' . implode(', ', $errors) . '</p>';
+        echo '<p>' . htmlentities(implode(', ', $errors)) . '</p>';
     }
 }
 
@@ -1384,6 +1419,8 @@ Auxiliary class that contains several methods to retrieve and process IdP metada
  * `parseXML` - Get IdP Metadata Info from XML.
  * `injectIntoSettings` - Inject metadata info into php-saml settings array.
 
+The class does not validate in any way the URL that is introduced on methods like parseRemoteXML in order to retrieve the remove XML. Usually is the same administrator that handles the Service Provider the ones that set the URL that should belong to a trusted third-party IdP.
+But there are other scenarios, like a SAAS app where the administrator of the app delegates on other administrators. In such case, extra protection should be taken in order to validate such URL inputs and avoid attacks like SSRF.
 
 For more info, look at the source code; each method is documented and details
 about what it does and how to use it are provided. Make sure to also check the doc folder where
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/Auth.php b/saml/vendor/onelogin/php-saml/src/Saml2/Auth.php
index 037b53fb..e5c4d54c 100644
--- a/saml/vendor/onelogin/php-saml/src/Saml2/Auth.php
+++ b/saml/vendor/onelogin/php-saml/src/Saml2/Auth.php
@@ -168,13 +168,14 @@ class Auth
      * Initializes the SP SAML instance.
      *
      * @param array|null $settings Setting data
+     * @param bool $spValidationOnly if true, The library will only validate the SAML SP settings,
      *
      * @throws Exception
      * @throws Error
      */
-    public function __construct(array $settings = null)
+    public function __construct(array $settings = null, bool $spValidationOnly = false)
     {
-        $this->_settings = new Settings($settings);
+        $this->_settings = new Settings($settings, $spValidationOnly);
     }
 
     /**
@@ -251,7 +252,6 @@ class Auth
                 $this->_errors[] = 'invalid_response';
                 $this->_lastErrorException = $response->getErrorException();
                 $this->_lastError = $response->getError();
-                $this->_errors[] = $this->_lastError;
             }
         } else {
             $this->_errors[] = 'invalid_binding';
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/IdPMetadataParser.php b/saml/vendor/onelogin/php-saml/src/Saml2/IdPMetadataParser.php
index 947d6548..a4fcc30e 100644
--- a/saml/vendor/onelogin/php-saml/src/Saml2/IdPMetadataParser.php
+++ b/saml/vendor/onelogin/php-saml/src/Saml2/IdPMetadataParser.php
@@ -26,6 +26,10 @@ class IdPMetadataParser
     /**
      * Get IdP Metadata Info from URL
      *
+     * This class does not validate in any way the URL that is introduced,
+     * make sure to validate it properly before use it in the parseRemoteXML
+     * method in order to avoid security issues like SSRF attacks.
+     *
      * @param string $url                 URL where the IdP metadata is published
      * @param string $entityId            Entity Id of the desired IdP, if no
      *                                    entity Id is provided and the XML
@@ -43,6 +47,9 @@ class IdPMetadataParser
 
         try {
             $ch = curl_init($url);
+            curl_setopt($ch, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS | CURLPROTO_HTTP);
+            curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTPS  | CURLPROTO_HTTP);
+            curl_setopt($ch, CURLOPT_MAXREDIRS, 5);
             curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "GET");
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
             curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/Response.php b/saml/vendor/onelogin/php-saml/src/Saml2/Response.php
index a2f8d6dd..813aa66a 100644
--- a/saml/vendor/onelogin/php-saml/src/Saml2/Response.php
+++ b/saml/vendor/onelogin/php-saml/src/Saml2/Response.php
@@ -269,7 +269,10 @@ class Response
 
                 // Check destination
                 if ($this->document->documentElement->hasAttribute('Destination')) {
-                    $destination = trim($this->document->documentElement->getAttribute('Destination'));
+                    $destination = $this->document->documentElement->getAttribute('Destination');
+                    if (isset($destination)) {
+                        $destination = trim($destination);
+                    }
                     if (empty($destination)) {
                         if (!$security['relaxDestinationValidation']) {
                             throw new ValidationError(
@@ -308,12 +311,14 @@ class Response
                 // Check the issuers
                 $issuers = $this->getIssuers();
                 foreach ($issuers as $issuer) {
-                    $trimmedIssuer = trim($issuer);
-                    if (empty($trimmedIssuer) || $trimmedIssuer !== $idPEntityId) {
-                        throw new ValidationError(
-                            "Invalid issuer in the Assertion/Response (expected '$idPEntityId', got '$trimmedIssuer')",
-                            ValidationError::WRONG_ISSUER
-                        );
+                    if (isset($issuer)) {
+                        $trimmedIssuer = trim($issuer);
+                        if (empty($trimmedIssuer) || $trimmedIssuer !== $idPEntityId) {
+                            throw new ValidationError(
+                                "Invalid issuer in the Assertion/Response (expected '$idPEntityId', got '$trimmedIssuer')",
+                                ValidationError::WRONG_ISSUER
+                            );
+                        }
                     }
                 }
 
@@ -554,7 +559,10 @@ class Response
 
         $entries = $this->_queryAssertion('/saml:Conditions/saml:AudienceRestriction/saml:Audience');
         foreach ($entries as $entry) {
-            $value = trim($entry->textContent);
+            $value = $entry->textContent;
+            if (isset($value)) {
+                $value = trim($value);
+            }
             if (!empty($value)) {
                 $audiences[] = $value;
             }
@@ -814,7 +822,7 @@ class Response
                 continue;
             }
             $attributeKeyName = $attributeKeyNode->nodeValue;
-            if (in_array($attributeKeyName, array_keys($attributes))) {
+            if (in_array($attributeKeyName, array_keys($attributes), true)) {
                 if (!$allowRepeatAttributeName) {
                     throw new ValidationError(
                         "Found an Attribute element with duplicated ".$keyName,
@@ -830,7 +838,7 @@ class Response
                 }
             }
 
-            if (in_array($attributeKeyName, array_keys($attributes))) {
+            if (in_array($attributeKeyName, array_keys($attributes), true)) {
                 $attributes[$attributeKeyName] = array_merge($attributes[$attributeKeyName], $attributeValues);
             } else {
                 $attributes[$attributeKeyName] = $attributeValues;
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/Settings.php b/saml/vendor/onelogin/php-saml/src/Saml2/Settings.php
index 43457bad..4d9b3339 100644
--- a/saml/vendor/onelogin/php-saml/src/Saml2/Settings.php
+++ b/saml/vendor/onelogin/php-saml/src/Saml2/Settings.php
@@ -122,7 +122,7 @@ class Settings
      * @throws Error If any settings parameter is invalid
      * @throws Exception If Settings is incorrectly supplied
      */
-    public function __construct(array $settings = null, $spValidationOnly = false)
+    public function __construct(array $settings = null,bool $spValidationOnly = false)
     {
         $this->_spValidationOnly = $spValidationOnly;
         $this->_loadPaths();
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/Utils.php b/saml/vendor/onelogin/php-saml/src/Saml2/Utils.php
index 582c117b..c6e912c4 100644
--- a/saml/vendor/onelogin/php-saml/src/Saml2/Utils.php
+++ b/saml/vendor/onelogin/php-saml/src/Saml2/Utils.php
@@ -221,6 +221,10 @@ class Utils
      */
     public static function formatCert($cert, $heads = true)
     {
+        if (is_null($cert)) {
+          return;
+        }
+
         $x509cert = str_replace(array("\x0D", "\r", "\n"), "", $cert);
         if (!empty($x509cert)) {
             $x509cert = str_replace('-----BEGIN CERTIFICATE-----', "", $x509cert);
@@ -245,6 +249,10 @@ class Utils
      */
     public static function formatPrivateKey($key, $heads = true)
     {
+        if (is_null($key)) {
+          return;
+        }
+
         $key = str_replace(array("\x0D", "\r", "\n"), "", $key);
         if (!empty($key)) {
             if (strpos($key, '-----BEGIN PRIVATE KEY-----') !== false) {
@@ -319,7 +327,12 @@ class Utils
          * Verify that the URL matches the regex for the protocol.
          * By default this will check for http and https
          */
-        $wrongProtocol = !preg_match(self::$_protocolRegex, $url);
+        if (isset(self::$_protocolRegex)) {
+            $protocol = self::$_protocolRegex;
+        } else {
+            $protocol = "";
+        }
+        $wrongProtocol = !preg_match($protocol, $url);
         $url = filter_var($url, FILTER_VALIDATE_URL);
         if ($wrongProtocol || empty($url)) {
             throw new Error(
@@ -743,7 +756,7 @@ class Utils
      */
     public static function generateUniqueID()
     {
-        return 'ONELOGIN_' . sha1(uniqid((string)mt_rand(), true));
+        return 'ONELOGIN_' . sha1(random_bytes(20));
     }
 
     /**
@@ -773,6 +786,10 @@ class Utils
      */
     public static function parseSAML2Time($time)
     {
+        if (empty($time)) {
+          return null;
+        }
+
         $matches = array();
 
         /* We use a very strict regex to parse the timestamp. */
@@ -1010,7 +1027,10 @@ class Utils
                 if (strncmp($curData, '-----END CERTIFICATE', 20) == 0) {
                     break;
                 }
-                $data .= trim($curData);
+                if (isset($curData)) {
+                    $curData = trim($curData);
+                }
+                $data .= $curData;
             }
         }
 
@@ -1043,6 +1063,9 @@ class Utils
      */
     public static function formatFingerPrint($fingerprint)
     {
+        if (is_null($fingerprint)) {
+            return;
+        }
         $formatedFingerprint = str_replace(':', '', $fingerprint);
         $formatedFingerprint = strtolower($formatedFingerprint);
         return $formatedFingerprint;
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/version.json b/saml/vendor/onelogin/php-saml/src/Saml2/version.json
index 220f250a..2c41bd60 100644
--- a/saml/vendor/onelogin/php-saml/src/Saml2/version.json
+++ b/saml/vendor/onelogin/php-saml/src/Saml2/version.json
@@ -1,7 +1,7 @@
 {
     "php-saml": {
-        "version": "4.0.0",
-        "released": "02/03/2021"
+        "version": "4.1.0",
+        "released": "07/15/2022"
     }
 }
 

From 0a69c66d0920cad86e56cf6d068b3536344a3cf0 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Tue, 19 Mar 2024 22:08:59 -0400
Subject: [PATCH 066/294] [securemail] Update Composer dependency ahead of
 release

- Updating phpseclib/phpseclib (3.0.19 => 3.0.37)
---
 securemail/composer.json                      |  46 +-
 securemail/composer.lock                      |  10 +-
 securemail/vendor/composer/installed.json     |  12 +-
 .../vendor/phpseclib/phpseclib/BACKERS.md     |   4 +-
 .../vendor/phpseclib/phpseclib/README.md      |   3 +-
 .../phpseclib/Crypt/Common/AsymmetricKey.php  |   6 +-
 .../Crypt/Common/Formats/Keys/PKCS8.php       |   3 +-
 .../phpseclib/Crypt/Common/SymmetricKey.php   |   4 +-
 .../Crypt/EC/Formats/Signature/IEEE.php       |  66 ++
 .../phpseclib/Crypt/EC/PrivateKey.php         |   2 +-
 .../phpseclib/phpseclib/Crypt/RSA.php         |  21 +-
 .../phpseclib/phpseclib/Crypt/Rijndael.php    |   4 +-
 .../phpseclib/phpseclib/File/ASN1.php         |  10 +-
 .../phpseclib/phpseclib/File/X509.php         |  26 +-
 .../phpseclib/phpseclib/Math/BigInteger.php   |  17 +-
 .../Math/BigInteger/Engines/Engine.php        |  21 +-
 .../phpseclib/Math/BigInteger/Engines/PHP.php |  28 +
 .../Math/BigInteger/Engines/PHP32.php         |   6 +-
 .../Math/BigInteger/Engines/PHP64.php         |   2 +-
 .../phpseclib/phpseclib/Math/BinaryField.php  |   9 +
 .../phpseclib/Math/PrimeField/Integer.php     |   9 +-
 .../phpseclib/phpseclib/Net/SFTP.php          | 385 +++++-----
 .../phpseclib/phpseclib/Net/SSH2.php          | 720 ++++++++++++------
 23 files changed, 922 insertions(+), 492 deletions(-)
 create mode 100644 securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/IEEE.php

diff --git a/securemail/composer.json b/securemail/composer.json
index 4c7cb54b..9383d645 100644
--- a/securemail/composer.json
+++ b/securemail/composer.json
@@ -1,26 +1,26 @@
 {
-  "name": "friendica-addons/securemail",
-  "description": "Send notification mail encrypted with user-defined public GPG key.",
-  "type": "friendica-addon",
-  "authors": [
-    {
-      "name": "Fabio Comuni",
-      "homepage": "https://kirgroup.com/profile/fabrixxm",
-      "role": "Developer"
+    "name": "friendica-addons/securemail",
+    "description": "Send notification mail encrypted with user-defined public GPG key.",
+    "type": "friendica-addon",
+    "authors": [
+        {
+            "name": "Fabio Comuni",
+            "homepage": "https://kirgroup.com/profile/fabrixxm",
+            "role": "Developer"
+        }
+    ],
+    "require": {
+        "singpolyma/openpgp-php": "0.6.0"
+    },
+    "replace": {
+        "paragonie/random_compat": "9.99.99"
+    },
+    "license": "AGPL-3.0+",
+    "minimum-stability": "stable",
+    "config": {
+        "autoloader-suffix": "SecuremailAddon",
+        "platform": {
+            "php": "7.3"
+        }
     }
-  ],
-  "require": {
-    "singpolyma/openpgp-php": "0.6.0"
-  },
-  "replace": {
-    "paragonie/random_compat": "9.99.99"
-  },
-  "license": "AGPL-3.0+",
-  "minimum-stability": "stable",
-  "config": {
-    "autoloader-suffix": "SecuremailAddon",
-    "platform": {
-      "php": "7.3"
-    }
-  }
 }
diff --git a/securemail/composer.lock b/securemail/composer.lock
index 7934eebc..8960cfcb 100644
--- a/securemail/composer.lock
+++ b/securemail/composer.lock
@@ -70,16 +70,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "3.0.19",
+            "version": "3.0.37",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "cc181005cf548bfd8a4896383bb825d859259f95"
+                "reference": "cfa2013d0f68c062055180dd4328cc8b9d1f30b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/cc181005cf548bfd8a4896383bb825d859259f95",
-                "reference": "cc181005cf548bfd8a4896383bb825d859259f95",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/cfa2013d0f68c062055180dd4328cc8b9d1f30b8",
+                "reference": "cfa2013d0f68c062055180dd4328cc8b9d1f30b8",
                 "shasum": ""
             },
             "require": {
@@ -172,7 +172,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-05T17:13:09+00:00"
+            "time": "2024-03-03T02:14:58+00:00"
         },
         {
             "name": "singpolyma/openpgp-php",
diff --git a/securemail/vendor/composer/installed.json b/securemail/vendor/composer/installed.json
index 25c1aae4..680a3ffe 100644
--- a/securemail/vendor/composer/installed.json
+++ b/securemail/vendor/composer/installed.json
@@ -65,17 +65,17 @@
     },
     {
         "name": "phpseclib/phpseclib",
-        "version": "3.0.19",
-        "version_normalized": "3.0.19.0",
+        "version": "3.0.37",
+        "version_normalized": "3.0.37.0",
         "source": {
             "type": "git",
             "url": "https://github.com/phpseclib/phpseclib.git",
-            "reference": "cc181005cf548bfd8a4896383bb825d859259f95"
+            "reference": "cfa2013d0f68c062055180dd4328cc8b9d1f30b8"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/cc181005cf548bfd8a4896383bb825d859259f95",
-            "reference": "cc181005cf548bfd8a4896383bb825d859259f95",
+            "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/cfa2013d0f68c062055180dd4328cc8b9d1f30b8",
+            "reference": "cfa2013d0f68c062055180dd4328cc8b9d1f30b8",
             "shasum": ""
         },
         "require": {
@@ -93,7 +93,7 @@
             "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
             "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
         },
-        "time": "2023-03-05T17:13:09+00:00",
+        "time": "2024-03-03T02:14:58+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
diff --git a/securemail/vendor/phpseclib/phpseclib/BACKERS.md b/securemail/vendor/phpseclib/phpseclib/BACKERS.md
index 5e5c6d99..efca482a 100644
--- a/securemail/vendor/phpseclib/phpseclib/BACKERS.md
+++ b/securemail/vendor/phpseclib/phpseclib/BACKERS.md
@@ -12,4 +12,6 @@ phpseclib ongoing development is made possible by [Tidelift](https://tidelift.co
 - [Charles Severance](https://github.com/csev)
 - [Rachel Fish](https://github.com/itsrachelfish)
 - Tharyrok
-- [cjhaas](https://github.com/cjhaas)
\ No newline at end of file
+- [cjhaas](https://github.com/cjhaas)
+- [istiak-tridip](https://github.com/istiak-tridip)
+- [Anna Filina](https://github.com/afilina)
\ No newline at end of file
diff --git a/securemail/vendor/phpseclib/phpseclib/README.md b/securemail/vendor/phpseclib/phpseclib/README.md
index 64c06ba2..37cbcb9d 100644
--- a/securemail/vendor/phpseclib/phpseclib/README.md
+++ b/securemail/vendor/phpseclib/phpseclib/README.md
@@ -51,8 +51,7 @@ SSH-2, SFTP, X.509, an arbitrary-precision integer arithmetic library, Ed25519 /
 * PHP4 compatible
 * Composer compatible (PSR-0 autoloading)
 * Install using Composer: `composer require phpseclib/phpseclib:~1.0`
-* Install using PEAR: See [phpseclib PEAR Channel Documentation](http://phpseclib.sourceforge.net/pear.htm)
-* [Download 1.0.20 as ZIP](http://sourceforge.net/projects/phpseclib/files/phpseclib1.0.20.zip/download)
+* [Download 1.0.23 as ZIP](http://sourceforge.net/projects/phpseclib/files/phpseclib1.0.23.zip/download)
 
 ## Security contact information
 
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/AsymmetricKey.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/AsymmetricKey.php
index 407f0369..09eb5b1b 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/AsymmetricKey.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/AsymmetricKey.php
@@ -94,7 +94,7 @@ abstract class AsymmetricKey
 
     /**
      * @param string $type
-     * @return string
+     * @return array|string
      */
     abstract public function toString($type, array $options = []);
 
@@ -130,7 +130,7 @@ abstract class AsymmetricKey
      *
      * @param string $key
      * @param string $password optional
-     * @return AsymmetricKey
+     * @return \phpseclib3\Crypt\Common\PublicKey|\phpseclib3\Crypt\Common\PrivateKey
      */
     public static function load($key, $password = false)
     {
@@ -382,7 +382,7 @@ abstract class AsymmetricKey
             $shortname = $meta->getShortName();
             self::$plugins[static::ALGORITHM]['Keys'][strtolower($shortname)] = $fullname;
             if ($meta->hasConstant('IS_INVISIBLE')) {
-                self::$invisiblePlugins[static::ALGORITHM] = strtolower($name);
+                self::$invisiblePlugins[static::ALGORITHM][] = strtolower($shortname);
             }
         }
     }
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/PKCS8.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/PKCS8.php
index 4638a539..7aa55480 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/PKCS8.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/PKCS8.php
@@ -141,6 +141,7 @@ abstract class PKCS8 extends PKCS
                 break;
             case 'RC2':
                 $cipher = new RC2('cbc');
+                $cipher->setKeyLength(64);
                 break;
             case '3-KeyTripleDES':
                 $cipher = new TripleDES('cbc');
@@ -218,7 +219,7 @@ abstract class PKCS8 extends PKCS
     {
         switch ($algo) {
             case 'desCBC':
-                $cipher = new TripleDES('cbc');
+                $cipher = new DES('cbc');
                 break;
             case 'des-EDE3-CBC':
                 $cipher = new TripleDES('cbc');
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/SymmetricKey.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/SymmetricKey.php
index 2a376f11..175508d4 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/SymmetricKey.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/SymmetricKey.php
@@ -668,6 +668,8 @@ abstract class SymmetricKey
             switch (true) {
                 // PHP_OS & "\xDF\xDF\xDF" == strtoupper(substr(PHP_OS, 0, 3)), but a lot faster
                 case (PHP_OS & "\xDF\xDF\xDF") === 'WIN':
+                case !function_exists('php_uname'):
+                case !is_string(php_uname('m')):
                 case (php_uname('m') & "\xDF\xDF\xDF") != 'ARM':
                 case defined('PHP_INT_SIZE') && PHP_INT_SIZE == 8:
                     self::$use_reg_intval = true;
@@ -917,7 +919,7 @@ abstract class SymmetricKey
      * @see Crypt/Hash.php
      * @param string $password
      * @param string $method
-     * @param string[] ...$func_args
+     * @param int|string ...$func_args
      * @throws \LengthException if pbkdf1 is being used and the derived key length exceeds the hash length
      * @throws \RuntimeException if bcrypt is being used and a salt isn't provided
      * @return bool
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/IEEE.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/IEEE.php
new file mode 100644
index 00000000..69139da4
--- /dev/null
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/IEEE.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * IEEE P1363 Signature Handler
+ *
+ * PHP version 5
+ *
+ * Handles signatures in the format described in
+ * https://standards.ieee.org/ieee/1363/2049/ and
+ * https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/sign#ecdsa
+ *
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2016 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+namespace phpseclib3\Crypt\EC\Formats\Signature;
+
+use phpseclib3\Math\BigInteger;
+
+/**
+ * ASN1 Signature Handler
+ *
+ * @author  Jim Wigginton <terrafrost@php.net>
+ */
+abstract class IEEE
+{
+    /**
+     * Loads a signature
+     *
+     * @param string $sig
+     * @return array
+     */
+    public static function load($sig)
+    {
+        if (!is_string($sig)) {
+            return false;
+        }
+
+        $len = strlen($sig);
+        if ($len & 1) {
+            return false;
+        }
+
+        $r = new BigInteger(substr($sig, 0, $len >> 1), 256);
+        $s = new BigInteger(substr($sig, $len >> 1), 256);
+
+        return compact('r', 's');
+    }
+
+    /**
+     * Returns a signature in the appropriate format
+     *
+     * @param \phpseclib3\Math\BigInteger $r
+     * @param \phpseclib3\Math\BigInteger $s
+     * @return string
+     */
+    public static function save(BigInteger $r, BigInteger $s)
+    {
+        $r = $r->toBytes();
+        $s = $s->toBytes();
+        $len = max(strlen($r), strlen($s));
+        return str_pad($r, $len, "\0", STR_PAD_LEFT) . str_pad($s, $len, "\0", STR_PAD_LEFT);
+    }
+}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/PrivateKey.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/PrivateKey.php
index 462ea1a3..59886961 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/PrivateKey.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/PrivateKey.php
@@ -150,7 +150,7 @@ final class PrivateKey extends EC implements Common\PrivateKey
             // we use specified curves to avoid issues with OpenSSL possibly not supporting a given named curve;
             // doing this may mean some curve-specific optimizations can't be used but idk if OpenSSL even
             // has curve-specific optimizations
-            $result = openssl_sign($message, $signature, $this->toString('PKCS8', ['namedCurve' => false]), $this->hash->getHash());
+            $result = openssl_sign($message, $signature, $this->withPassword()->toString('PKCS8', ['namedCurve' => false]), $this->hash->getHash());
 
             if ($result) {
                 if ($shortFormat == 'ASN1') {
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php
index 7b935cc2..19dcfea3 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php
@@ -332,6 +332,7 @@ abstract class RSA extends AsymmetricKey
                 openssl_pkey_export($rsa, $privatekeystr, null, $config);
 
                 // clear the buffer of error strings stemming from a minimalistic openssl.cnf
+                // https://github.com/php/php-src/issues/11054 talks about other errors this'll pick up
                 while (openssl_error_string() !== false) {
                 }
 
@@ -841,15 +842,15 @@ abstract class RSA extends AsymmetricKey
             self::ENCRYPTION_PKCS1,
             self::ENCRYPTION_NONE
         ];
-        $numSelected = 0;
+        $encryptedCount = 0;
         $selected = 0;
         foreach ($masks as $mask) {
             if ($padding & $mask) {
                 $selected = $mask;
-                $numSelected++;
+                $encryptedCount++;
             }
         }
-        if ($numSelected > 1) {
+        if ($encryptedCount > 1) {
             throw new InconsistentSetupException('Multiple encryption padding modes have been selected; at most only one should be selected');
         }
         $encryptionPadding = $selected;
@@ -859,22 +860,26 @@ abstract class RSA extends AsymmetricKey
             self::SIGNATURE_RELAXED_PKCS1,
             self::SIGNATURE_PKCS1
         ];
-        $numSelected = 0;
+        $signatureCount = 0;
         $selected = 0;
         foreach ($masks as $mask) {
             if ($padding & $mask) {
                 $selected = $mask;
-                $numSelected++;
+                $signatureCount++;
             }
         }
-        if ($numSelected > 1) {
+        if ($signatureCount > 1) {
             throw new InconsistentSetupException('Multiple signature padding modes have been selected; at most only one should be selected');
         }
         $signaturePadding = $selected;
 
         $new = clone $this;
-        $new->encryptionPadding = $encryptionPadding;
-        $new->signaturePadding = $signaturePadding;
+        if ($encryptedCount) {
+            $new->encryptionPadding = $encryptionPadding;
+        }
+        if ($signatureCount) {
+            $new->signaturePadding = $signaturePadding;
+        }
         return $new;
     }
 
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Rijndael.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Rijndael.php
index cd8b7627..ff31f9c8 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Rijndael.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Rijndael.php
@@ -833,7 +833,6 @@ class Rijndael extends BlockCipher
 
         // Generating encrypt code:
         $init_encrypt .= '
-            static $tables;
             if (empty($tables)) {
                 $tables = &$this->getTables();
             }
@@ -890,7 +889,6 @@ class Rijndael extends BlockCipher
 
         // Generating decrypt code:
         $init_decrypt .= '
-            static $invtables;
             if (empty($invtables)) {
                 $invtables = &$this->getInvTables();
             }
@@ -947,7 +945,7 @@ class Rijndael extends BlockCipher
 
         $this->inline_crypt = $this->createInlineCryptFunction(
             [
-               'init_crypt'    => '',
+               'init_crypt'    => 'static $tables; static $invtables;',
                'init_encrypt'  => $init_encrypt,
                'init_decrypt'  => $init_decrypt,
                'encrypt_block' => $encrypt_block,
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php
index e21589c5..c4b06a56 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php
@@ -21,7 +21,6 @@
 
 namespace phpseclib3\File;
 
-use DateTime;
 use phpseclib3\Common\Functions\Strings;
 use phpseclib3\File\ASN1\Element;
 use phpseclib3\Math\BigInteger;
@@ -205,7 +204,7 @@ abstract class ASN1
             return null;
         }
 
-        return [self::decode_ber($encoded)];
+        return [$decoded];
     }
 
     /**
@@ -1149,6 +1148,11 @@ abstract class ASN1
         $oid = [];
         $pos = 0;
         $len = strlen($content);
+        // see https://github.com/openjdk/jdk/blob/2deb318c9f047ec5a4b160d66a4b52f93688ec42/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java#L55
+        if ($len > 4096) {
+            //throw new \RuntimeException("Object identifier size is limited to 4096 bytes ($len bytes present)");
+            return false;
+        }
 
         if (ord($content[$len - 1]) & 0x80) {
             return false;
@@ -1403,7 +1407,7 @@ abstract class ASN1
                         return false;
                     }
                     break;
-                case ($c & 0x80000000) != 0:
+                case ($c & (PHP_INT_SIZE == 8 ? 0x80000000 : (1 << 31))) != 0:
                     return false;
                 case $c >= 0x04000000:
                     $v .= chr(0x80 | ($c & 0x3F));
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/X509.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/X509.php
index 7aa278f2..5e2f073f 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/X509.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/X509.php
@@ -164,7 +164,7 @@ class X509
      *
      * @var array
      */
-    private $CAs;
+    private $CAs = [];
 
     /**
      * The currently loaded certificate
@@ -315,6 +315,10 @@ class X509
                 'id-at-uniqueIdentifier' => '2.5.4.45',
                 'id-at-role' => '2.5.4.72',
                 'id-at-postalAddress' => '2.5.4.16',
+                'jurisdictionOfIncorporationCountryName' => '1.3.6.1.4.1.311.60.2.1.3',
+                'jurisdictionOfIncorporationStateOrProvinceName' => '1.3.6.1.4.1.311.60.2.1.2',
+                'jurisdictionLocalityName' => '1.3.6.1.4.1.311.60.2.1.1',
+                'id-at-businessCategory' => '2.5.4.15',
 
                 //'id-domainComponent' => '0.9.2342.19200300.100.1.25',
                 //'pkcs-9' => '1.2.840.113549.1.9',
@@ -1038,7 +1042,8 @@ class X509
         if ($names = $this->getExtension('id-ce-subjectAltName')) {
             foreach ($names as $name) {
                 foreach ($name as $key => $value) {
-                    $value = str_replace(['.', '*'], ['\.', '[^.]*'], $value);
+                    $value = preg_quote($value);
+                    $value = str_replace('\*', '[^.]*', $value);
                     switch ($key) {
                         case 'dNSName':
                             /* From RFC2818 "HTTP over TLS":
@@ -1538,6 +1543,20 @@ class X509
     private function translateDNProp($propName)
     {
         switch (strtolower($propName)) {
+            case 'jurisdictionofincorporationcountryname':
+            case 'jurisdictioncountryname':
+            case 'jurisdictionc':
+                return 'jurisdictionOfIncorporationCountryName';
+            case 'jurisdictionofincorporationstateorprovincename':
+            case 'jurisdictionstateorprovincename':
+            case 'jurisdictionst':
+                return 'jurisdictionOfIncorporationStateOrProvinceName';
+            case 'jurisdictionlocalityname':
+            case 'jurisdictionl':
+                return 'jurisdictionLocalityName';
+            case 'id-at-businesscategory':
+            case 'businesscategory':
+                return 'id-at-businessCategory';
             case 'id-at-countryname':
             case 'countryname':
             case 'c':
@@ -2030,9 +2049,6 @@ class X509
         if (!is_array($this->currentCert) || !isset($this->currentCert['tbsCertificate'])) {
             return false;
         }
-        if (empty($this->CAs)) {
-            return $chain;
-        }
         while (true) {
             $currentCert = $chain[count($chain) - 1];
             for ($i = 0; $i < count($this->CAs); $i++) {
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php
index 70491abd..67d4788f 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php
@@ -100,10 +100,6 @@ class BigInteger implements \JsonSerializable
         /** @var class-string<Engine> $fqmain */
         self::$mainEngine = $fqmain;
 
-        if (!in_array('Default', $modexps)) {
-            $modexps[] = 'DefaultEngine';
-        }
-
         $found = false;
         foreach ($modexps as $modexp) {
             try {
@@ -140,18 +136,23 @@ class BigInteger implements \JsonSerializable
     {
         if (!isset(self::$mainEngine)) {
             $engines = [
-                ['GMP'],
+                ['GMP', ['DefaultEngine']],
                 ['PHP64', ['OpenSSL']],
                 ['BCMath', ['OpenSSL']],
-                ['PHP32', ['OpenSSL']]
+                ['PHP32', ['OpenSSL']],
+                ['PHP64', ['DefaultEngine']],
+                ['PHP32', ['DefaultEngine']]
             ];
+
             foreach ($engines as $engine) {
                 try {
-                    self::setEngine($engine[0], isset($engine[1]) ? $engine[1] : []);
-                    break;
+                    self::setEngine($engine[0], $engine[1]);
+                    return;
                 } catch (\Exception $e) {
                 }
             }
+
+            throw new \UnexpectedValueException('No valid BigInteger found. This is only possible when JIT is enabled on Windows and neither the GMP or BCMath extensions are available so either disable JIT or install GMP / BCMath');
         }
     }
 
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/Engine.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/Engine.php
index 2b00bc37..474abe10 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/Engine.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/Engine.php
@@ -619,7 +619,7 @@ abstract class Engine implements \JsonSerializable
      */
     public function getLengthInBytes()
     {
-        return strlen($this->toBytes());
+        return (int) ceil($this->getLength() / 8);
     }
 
     /**
@@ -644,6 +644,11 @@ abstract class Engine implements \JsonSerializable
             return $this->normalize($temp->powModInner($e, $n));
         }
 
+        if ($this->compare($n) > 0) {
+            list(, $temp) = $this->divide($n);
+            return $temp->powModInner($e, $n);
+        }
+
         return $this->powModInner($e, $n);
     }
 
@@ -781,6 +786,11 @@ abstract class Engine implements \JsonSerializable
             $min = $temp;
         }
 
+        $length = $max->getLength();
+        if ($length > 8196) {
+            throw new \RuntimeException("Generation of random prime numbers larger than 8196 has been disabled ($length)");
+        }
+
         $x = static::randomRange($min, $max);
 
         return static::randomRangePrimeInner($x, $min, $max);
@@ -985,6 +995,15 @@ abstract class Engine implements \JsonSerializable
      */
     public function isPrime($t = false)
     {
+        // OpenSSL limits RSA keys to 16384 bits. The length of an RSA key is equal to the length of the modulo, which is
+        // produced by multiplying the primes p and q by one another. The largest number two 8196 bit primes can produce is
+        // a 16384 bit number so, basically, 8196 bit primes are the largest OpenSSL will generate and if that's the largest
+        // that it'll generate it also stands to reason that that's the largest you'll be able to test primality on
+        $length = $this->getLength();
+        if ($length > 8196) {
+            throw new \RuntimeException("Primality testing is not supported for numbers larger than 8196 bits ($length)");
+        }
+
         if (!$t) {
             $t = $this->setupIsPrime();
         }
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP.php
index ab9bdc99..2d895952 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP.php
@@ -1326,4 +1326,32 @@ abstract class PHP extends Engine
 
         return array_reverse($vals);
     }
+
+    /**
+     * @return bool
+     */
+    protected static function testJITOnWindows()
+    {
+        // see https://github.com/php/php-src/issues/11917
+        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' && function_exists('opcache_get_status') && PHP_VERSION_ID < 80213 && !defined('PHPSECLIB_ALLOW_JIT')) {
+            $status = opcache_get_status();
+            if ($status && isset($status['jit']) && $status['jit']['enabled'] && $status['jit']['on']) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Return the size of a BigInteger in bits
+     *
+     * @return int
+     */
+    public function getLength()
+    {
+        $max = count($this->value) - 1;
+        return $max != -1 ?
+            $max * static::BASE + intval(ceil(log($this->value[$max] + 1, 2))) :
+            0;
+    }
 }
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP32.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP32.php
index 964cd170..3a775e7d 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP32.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP32.php
@@ -80,10 +80,10 @@ class PHP32 extends PHP
             }
             $step = count($vals) & 3;
             if ($step) {
-                $digit = floor($digit / pow(2, 2 * $step));
+                $digit = (int) floor($digit / pow(2, 2 * $step));
             }
             if ($step != 3) {
-                $digit &= static::MAX_DIGIT;
+                $digit = (int) fmod($digit, static::BASE_FULL);
                 $i++;
             }
             $vals[] = $digit;
@@ -102,7 +102,7 @@ class PHP32 extends PHP
      */
     public static function isValidEngine()
     {
-        return PHP_INT_SIZE >= 4;
+        return PHP_INT_SIZE >= 4 && !self::testJITOnWindows();
     }
 
     /**
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP64.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP64.php
index ca11c08d..70a2e173 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP64.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP64.php
@@ -103,7 +103,7 @@ class PHP64 extends PHP
      */
     public static function isValidEngine()
     {
-        return PHP_INT_SIZE >= 8;
+        return PHP_INT_SIZE >= 8 && !self::testJITOnWindows();
     }
 
     /**
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BinaryField.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BinaryField.php
index 3e21a67a..5da8c937 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BinaryField.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BinaryField.php
@@ -48,6 +48,15 @@ class BinaryField extends FiniteField
     public function __construct(...$indices)
     {
         $m = array_shift($indices);
+        if ($m > 571) {
+            /* sect571r1 and sect571k1 are the largest binary curves that https://www.secg.org/sec2-v2.pdf defines
+               altho theoretically there may be legit reasons to use binary finite fields with larger degrees
+               imposing a limit on the maximum size is both reasonable and precedented. in particular,
+               http://tools.ietf.org/html/rfc4253#section-6.1 (The Secure Shell (SSH) Transport Layer Protocol) says
+               "implementations SHOULD check that the packet length is reasonable in order for the implementation to
+                avoid denial of service and/or buffer overflow attacks" */
+            throw new \OutOfBoundsException('Degrees larger than 571 are not supported');
+        }
         $val = str_repeat('0', $m) . '1';
         foreach ($indices as $index) {
             $val[$index] = '1';
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/PrimeField/Integer.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/PrimeField/Integer.php
index 748f9a49..1bd7aaf0 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/PrimeField/Integer.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/PrimeField/Integer.php
@@ -263,7 +263,7 @@ class Integer extends Base
         $r = $this->value->powMod($temp, static::$modulo[$this->instanceID]);
 
         while (!$t->equals($one)) {
-            for ($i == clone $one; $i->compare($m) < 0; $i = $i->add($one)) {
+            for ($i = clone $one; $i->compare($m) < 0; $i = $i->add($one)) {
                 if ($t->powMod($two->pow($i), static::$modulo[$this->instanceID])->equals($one)) {
                     break;
                 }
@@ -312,8 +312,11 @@ class Integer extends Base
      */
     public function toBytes()
     {
-        $length = static::$modulo[$this->instanceID]->getLengthInBytes();
-        return str_pad($this->value->toBytes(), $length, "\0", STR_PAD_LEFT);
+        if (isset(static::$modulo[$this->instanceID])) {
+            $length = static::$modulo[$this->instanceID]->getLengthInBytes();
+            return str_pad($this->value->toBytes(), $length, "\0", STR_PAD_LEFT);
+        }
+        return $this->value->toBytes();
     }
 
     /**
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP.php
index 1c675a6e..144ef795 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP.php
@@ -93,7 +93,7 @@ class SFTP extends SSH2
      * @var array
      * @access private
      */
-    private $packet_types = [];
+    private static $packet_types = [];
 
     /**
      * Status Codes
@@ -102,19 +102,19 @@ class SFTP extends SSH2
      * @var array
      * @access private
      */
-    private $status_codes = [];
+    private static $status_codes = [];
 
     /** @var array<int, string> */
-    private $attributes;
+    private static $attributes;
 
     /** @var array<int, string> */
-    private $open_flags;
+    private static $open_flags;
 
     /** @var array<int, string> */
-    private $open_flags5;
+    private static $open_flags5;
 
     /** @var array<int, string> */
-    private $file_types;
+    private static $file_types;
 
     /**
      * The Request ID
@@ -350,7 +350,9 @@ class SFTP extends SSH2
      *
      * Connects to an SFTP server
      *
-     * @param string $host
+     * $host can either be a string, representing the host, or a stream resource.
+     *
+     * @param mixed $host
      * @param int $port
      * @param int $timeout
      */
@@ -360,154 +362,156 @@ class SFTP extends SSH2
 
         $this->max_sftp_packet = 1 << 15;
 
-        $this->packet_types = [
-            1  => 'NET_SFTP_INIT',
-            2  => 'NET_SFTP_VERSION',
-            3  => 'NET_SFTP_OPEN',
-            4  => 'NET_SFTP_CLOSE',
-            5  => 'NET_SFTP_READ',
-            6  => 'NET_SFTP_WRITE',
-            7  => 'NET_SFTP_LSTAT',
-            9  => 'NET_SFTP_SETSTAT',
-            10 => 'NET_SFTP_FSETSTAT',
-            11 => 'NET_SFTP_OPENDIR',
-            12 => 'NET_SFTP_READDIR',
-            13 => 'NET_SFTP_REMOVE',
-            14 => 'NET_SFTP_MKDIR',
-            15 => 'NET_SFTP_RMDIR',
-            16 => 'NET_SFTP_REALPATH',
-            17 => 'NET_SFTP_STAT',
-            18 => 'NET_SFTP_RENAME',
-            19 => 'NET_SFTP_READLINK',
-            20 => 'NET_SFTP_SYMLINK',
-            21 => 'NET_SFTP_LINK',
+        if (empty(self::$packet_types)) {
+            self::$packet_types = [
+                1  => 'NET_SFTP_INIT',
+                2  => 'NET_SFTP_VERSION',
+                3  => 'NET_SFTP_OPEN',
+                4  => 'NET_SFTP_CLOSE',
+                5  => 'NET_SFTP_READ',
+                6  => 'NET_SFTP_WRITE',
+                7  => 'NET_SFTP_LSTAT',
+                9  => 'NET_SFTP_SETSTAT',
+                10 => 'NET_SFTP_FSETSTAT',
+                11 => 'NET_SFTP_OPENDIR',
+                12 => 'NET_SFTP_READDIR',
+                13 => 'NET_SFTP_REMOVE',
+                14 => 'NET_SFTP_MKDIR',
+                15 => 'NET_SFTP_RMDIR',
+                16 => 'NET_SFTP_REALPATH',
+                17 => 'NET_SFTP_STAT',
+                18 => 'NET_SFTP_RENAME',
+                19 => 'NET_SFTP_READLINK',
+                20 => 'NET_SFTP_SYMLINK',
+                21 => 'NET_SFTP_LINK',
 
-            101 => 'NET_SFTP_STATUS',
-            102 => 'NET_SFTP_HANDLE',
-            103 => 'NET_SFTP_DATA',
-            104 => 'NET_SFTP_NAME',
-            105 => 'NET_SFTP_ATTRS',
+                101 => 'NET_SFTP_STATUS',
+                102 => 'NET_SFTP_HANDLE',
+                103 => 'NET_SFTP_DATA',
+                104 => 'NET_SFTP_NAME',
+                105 => 'NET_SFTP_ATTRS',
 
-            200 => 'NET_SFTP_EXTENDED'
-        ];
-        $this->status_codes = [
-            0 => 'NET_SFTP_STATUS_OK',
-            1 => 'NET_SFTP_STATUS_EOF',
-            2 => 'NET_SFTP_STATUS_NO_SUCH_FILE',
-            3 => 'NET_SFTP_STATUS_PERMISSION_DENIED',
-            4 => 'NET_SFTP_STATUS_FAILURE',
-            5 => 'NET_SFTP_STATUS_BAD_MESSAGE',
-            6 => 'NET_SFTP_STATUS_NO_CONNECTION',
-            7 => 'NET_SFTP_STATUS_CONNECTION_LOST',
-            8 => 'NET_SFTP_STATUS_OP_UNSUPPORTED',
-            9 => 'NET_SFTP_STATUS_INVALID_HANDLE',
-            10 => 'NET_SFTP_STATUS_NO_SUCH_PATH',
-            11 => 'NET_SFTP_STATUS_FILE_ALREADY_EXISTS',
-            12 => 'NET_SFTP_STATUS_WRITE_PROTECT',
-            13 => 'NET_SFTP_STATUS_NO_MEDIA',
-            14 => 'NET_SFTP_STATUS_NO_SPACE_ON_FILESYSTEM',
-            15 => 'NET_SFTP_STATUS_QUOTA_EXCEEDED',
-            16 => 'NET_SFTP_STATUS_UNKNOWN_PRINCIPAL',
-            17 => 'NET_SFTP_STATUS_LOCK_CONFLICT',
-            18 => 'NET_SFTP_STATUS_DIR_NOT_EMPTY',
-            19 => 'NET_SFTP_STATUS_NOT_A_DIRECTORY',
-            20 => 'NET_SFTP_STATUS_INVALID_FILENAME',
-            21 => 'NET_SFTP_STATUS_LINK_LOOP',
-            22 => 'NET_SFTP_STATUS_CANNOT_DELETE',
-            23 => 'NET_SFTP_STATUS_INVALID_PARAMETER',
-            24 => 'NET_SFTP_STATUS_FILE_IS_A_DIRECTORY',
-            25 => 'NET_SFTP_STATUS_BYTE_RANGE_LOCK_CONFLICT',
-            26 => 'NET_SFTP_STATUS_BYTE_RANGE_LOCK_REFUSED',
-            27 => 'NET_SFTP_STATUS_DELETE_PENDING',
-            28 => 'NET_SFTP_STATUS_FILE_CORRUPT',
-            29 => 'NET_SFTP_STATUS_OWNER_INVALID',
-            30 => 'NET_SFTP_STATUS_GROUP_INVALID',
-            31 => 'NET_SFTP_STATUS_NO_MATCHING_BYTE_RANGE_LOCK'
-        ];
-        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-7.1
-        // the order, in this case, matters quite a lot - see \phpseclib3\Net\SFTP::_parseAttributes() to understand why
-        $this->attributes = [
-            0x00000001 => 'NET_SFTP_ATTR_SIZE',
-            0x00000002 => 'NET_SFTP_ATTR_UIDGID',          // defined in SFTPv3, removed in SFTPv4+
-            0x00000080 => 'NET_SFTP_ATTR_OWNERGROUP',      // defined in SFTPv4+
-            0x00000004 => 'NET_SFTP_ATTR_PERMISSIONS',
-            0x00000008 => 'NET_SFTP_ATTR_ACCESSTIME',
-            0x00000010 => 'NET_SFTP_ATTR_CREATETIME',      // SFTPv4+
-            0x00000020 => 'NET_SFTP_ATTR_MODIFYTIME',
-            0x00000040 => 'NET_SFTP_ATTR_ACL',
-            0x00000100 => 'NET_SFTP_ATTR_SUBSECOND_TIMES',
-            0x00000200 => 'NET_SFTP_ATTR_BITS',            // SFTPv5+
-            0x00000400 => 'NET_SFTP_ATTR_ALLOCATION_SIZE', // SFTPv6+
-            0x00000800 => 'NET_SFTP_ATTR_TEXT_HINT',
-            0x00001000 => 'NET_SFTP_ATTR_MIME_TYPE',
-            0x00002000 => 'NET_SFTP_ATTR_LINK_COUNT',
-            0x00004000 => 'NET_SFTP_ATTR_UNTRANSLATED_NAME',
-            0x00008000 => 'NET_SFTP_ATTR_CTIME',
-            // 0x80000000 will yield a floating point on 32-bit systems and converting floating points to integers
-            // yields inconsistent behavior depending on how php is compiled.  so we left shift -1 (which, in
-            // two's compliment, consists of all 1 bits) by 31.  on 64-bit systems this'll yield 0xFFFFFFFF80000000.
-            // that's not a problem, however, and 'anded' and a 32-bit number, as all the leading 1 bits are ignored.
-            (PHP_INT_SIZE == 4 ? -1 : 0xFFFFFFFF) => 'NET_SFTP_ATTR_EXTENDED'
-        ];
-        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-6.3
-        // the flag definitions change somewhat in SFTPv5+.  if SFTPv5+ support is added to this library, maybe name
-        // the array for that $this->open5_flags and similarly alter the constant names.
-        $this->open_flags = [
-            0x00000001 => 'NET_SFTP_OPEN_READ',
-            0x00000002 => 'NET_SFTP_OPEN_WRITE',
-            0x00000004 => 'NET_SFTP_OPEN_APPEND',
-            0x00000008 => 'NET_SFTP_OPEN_CREATE',
-            0x00000010 => 'NET_SFTP_OPEN_TRUNCATE',
-            0x00000020 => 'NET_SFTP_OPEN_EXCL',
-            0x00000040 => 'NET_SFTP_OPEN_TEXT' // defined in SFTPv4
-        ];
-        // SFTPv5+ changed the flags up:
-        // https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-8.1.1.3
-        $this->open_flags5 = [
-            // when SSH_FXF_ACCESS_DISPOSITION is a 3 bit field that controls how the file is opened
-            0x00000000 => 'NET_SFTP_OPEN_CREATE_NEW',
-            0x00000001 => 'NET_SFTP_OPEN_CREATE_TRUNCATE',
-            0x00000002 => 'NET_SFTP_OPEN_OPEN_EXISTING',
-            0x00000003 => 'NET_SFTP_OPEN_OPEN_OR_CREATE',
-            0x00000004 => 'NET_SFTP_OPEN_TRUNCATE_EXISTING',
-            // the rest of the flags are not supported
-            0x00000008 => 'NET_SFTP_OPEN_APPEND_DATA', // "the offset field of SS_FXP_WRITE requests is ignored"
-            0x00000010 => 'NET_SFTP_OPEN_APPEND_DATA_ATOMIC',
-            0x00000020 => 'NET_SFTP_OPEN_TEXT_MODE',
-            0x00000040 => 'NET_SFTP_OPEN_BLOCK_READ',
-            0x00000080 => 'NET_SFTP_OPEN_BLOCK_WRITE',
-            0x00000100 => 'NET_SFTP_OPEN_BLOCK_DELETE',
-            0x00000200 => 'NET_SFTP_OPEN_BLOCK_ADVISORY',
-            0x00000400 => 'NET_SFTP_OPEN_NOFOLLOW',
-            0x00000800 => 'NET_SFTP_OPEN_DELETE_ON_CLOSE',
-            0x00001000 => 'NET_SFTP_OPEN_ACCESS_AUDIT_ALARM_INFO',
-            0x00002000 => 'NET_SFTP_OPEN_ACCESS_BACKUP',
-            0x00004000 => 'NET_SFTP_OPEN_BACKUP_STREAM',
-            0x00008000 => 'NET_SFTP_OPEN_OVERRIDE_OWNER',
-        ];
-        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-5.2
-        // see \phpseclib3\Net\SFTP::_parseLongname() for an explanation
-        $this->file_types = [
-            1 => 'NET_SFTP_TYPE_REGULAR',
-            2 => 'NET_SFTP_TYPE_DIRECTORY',
-            3 => 'NET_SFTP_TYPE_SYMLINK',
-            4 => 'NET_SFTP_TYPE_SPECIAL',
-            5 => 'NET_SFTP_TYPE_UNKNOWN',
-            // the following types were first defined for use in SFTPv5+
-            // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-05#section-5.2
-            6 => 'NET_SFTP_TYPE_SOCKET',
-            7 => 'NET_SFTP_TYPE_CHAR_DEVICE',
-            8 => 'NET_SFTP_TYPE_BLOCK_DEVICE',
-            9 => 'NET_SFTP_TYPE_FIFO'
-        ];
-        $this->define_array(
-            $this->packet_types,
-            $this->status_codes,
-            $this->attributes,
-            $this->open_flags,
-            $this->open_flags5,
-            $this->file_types
-        );
+                200 => 'NET_SFTP_EXTENDED'
+            ];
+            self::$status_codes = [
+                0 => 'NET_SFTP_STATUS_OK',
+                1 => 'NET_SFTP_STATUS_EOF',
+                2 => 'NET_SFTP_STATUS_NO_SUCH_FILE',
+                3 => 'NET_SFTP_STATUS_PERMISSION_DENIED',
+                4 => 'NET_SFTP_STATUS_FAILURE',
+                5 => 'NET_SFTP_STATUS_BAD_MESSAGE',
+                6 => 'NET_SFTP_STATUS_NO_CONNECTION',
+                7 => 'NET_SFTP_STATUS_CONNECTION_LOST',
+                8 => 'NET_SFTP_STATUS_OP_UNSUPPORTED',
+                9 => 'NET_SFTP_STATUS_INVALID_HANDLE',
+                10 => 'NET_SFTP_STATUS_NO_SUCH_PATH',
+                11 => 'NET_SFTP_STATUS_FILE_ALREADY_EXISTS',
+                12 => 'NET_SFTP_STATUS_WRITE_PROTECT',
+                13 => 'NET_SFTP_STATUS_NO_MEDIA',
+                14 => 'NET_SFTP_STATUS_NO_SPACE_ON_FILESYSTEM',
+                15 => 'NET_SFTP_STATUS_QUOTA_EXCEEDED',
+                16 => 'NET_SFTP_STATUS_UNKNOWN_PRINCIPAL',
+                17 => 'NET_SFTP_STATUS_LOCK_CONFLICT',
+                18 => 'NET_SFTP_STATUS_DIR_NOT_EMPTY',
+                19 => 'NET_SFTP_STATUS_NOT_A_DIRECTORY',
+                20 => 'NET_SFTP_STATUS_INVALID_FILENAME',
+                21 => 'NET_SFTP_STATUS_LINK_LOOP',
+                22 => 'NET_SFTP_STATUS_CANNOT_DELETE',
+                23 => 'NET_SFTP_STATUS_INVALID_PARAMETER',
+                24 => 'NET_SFTP_STATUS_FILE_IS_A_DIRECTORY',
+                25 => 'NET_SFTP_STATUS_BYTE_RANGE_LOCK_CONFLICT',
+                26 => 'NET_SFTP_STATUS_BYTE_RANGE_LOCK_REFUSED',
+                27 => 'NET_SFTP_STATUS_DELETE_PENDING',
+                28 => 'NET_SFTP_STATUS_FILE_CORRUPT',
+                29 => 'NET_SFTP_STATUS_OWNER_INVALID',
+                30 => 'NET_SFTP_STATUS_GROUP_INVALID',
+                31 => 'NET_SFTP_STATUS_NO_MATCHING_BYTE_RANGE_LOCK'
+            ];
+            // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-7.1
+            // the order, in this case, matters quite a lot - see \phpseclib3\Net\SFTP::_parseAttributes() to understand why
+            self::$attributes = [
+                0x00000001 => 'NET_SFTP_ATTR_SIZE',
+                0x00000002 => 'NET_SFTP_ATTR_UIDGID',          // defined in SFTPv3, removed in SFTPv4+
+                0x00000080 => 'NET_SFTP_ATTR_OWNERGROUP',      // defined in SFTPv4+
+                0x00000004 => 'NET_SFTP_ATTR_PERMISSIONS',
+                0x00000008 => 'NET_SFTP_ATTR_ACCESSTIME',
+                0x00000010 => 'NET_SFTP_ATTR_CREATETIME',      // SFTPv4+
+                0x00000020 => 'NET_SFTP_ATTR_MODIFYTIME',
+                0x00000040 => 'NET_SFTP_ATTR_ACL',
+                0x00000100 => 'NET_SFTP_ATTR_SUBSECOND_TIMES',
+                0x00000200 => 'NET_SFTP_ATTR_BITS',            // SFTPv5+
+                0x00000400 => 'NET_SFTP_ATTR_ALLOCATION_SIZE', // SFTPv6+
+                0x00000800 => 'NET_SFTP_ATTR_TEXT_HINT',
+                0x00001000 => 'NET_SFTP_ATTR_MIME_TYPE',
+                0x00002000 => 'NET_SFTP_ATTR_LINK_COUNT',
+                0x00004000 => 'NET_SFTP_ATTR_UNTRANSLATED_NAME',
+                0x00008000 => 'NET_SFTP_ATTR_CTIME',
+                // 0x80000000 will yield a floating point on 32-bit systems and converting floating points to integers
+                // yields inconsistent behavior depending on how php is compiled.  so we left shift -1 (which, in
+                // two's compliment, consists of all 1 bits) by 31.  on 64-bit systems this'll yield 0xFFFFFFFF80000000.
+                // that's not a problem, however, and 'anded' and a 32-bit number, as all the leading 1 bits are ignored.
+                (PHP_INT_SIZE == 4 ? (-1 << 31) : 0x80000000) => 'NET_SFTP_ATTR_EXTENDED'
+            ];
+            // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-6.3
+            // the flag definitions change somewhat in SFTPv5+.  if SFTPv5+ support is added to this library, maybe name
+            // the array for that $this->open5_flags and similarly alter the constant names.
+            self::$open_flags = [
+                0x00000001 => 'NET_SFTP_OPEN_READ',
+                0x00000002 => 'NET_SFTP_OPEN_WRITE',
+                0x00000004 => 'NET_SFTP_OPEN_APPEND',
+                0x00000008 => 'NET_SFTP_OPEN_CREATE',
+                0x00000010 => 'NET_SFTP_OPEN_TRUNCATE',
+                0x00000020 => 'NET_SFTP_OPEN_EXCL',
+                0x00000040 => 'NET_SFTP_OPEN_TEXT' // defined in SFTPv4
+            ];
+            // SFTPv5+ changed the flags up:
+            // https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-8.1.1.3
+            self::$open_flags5 = [
+                // when SSH_FXF_ACCESS_DISPOSITION is a 3 bit field that controls how the file is opened
+                0x00000000 => 'NET_SFTP_OPEN_CREATE_NEW',
+                0x00000001 => 'NET_SFTP_OPEN_CREATE_TRUNCATE',
+                0x00000002 => 'NET_SFTP_OPEN_OPEN_EXISTING',
+                0x00000003 => 'NET_SFTP_OPEN_OPEN_OR_CREATE',
+                0x00000004 => 'NET_SFTP_OPEN_TRUNCATE_EXISTING',
+                // the rest of the flags are not supported
+                0x00000008 => 'NET_SFTP_OPEN_APPEND_DATA', // "the offset field of SS_FXP_WRITE requests is ignored"
+                0x00000010 => 'NET_SFTP_OPEN_APPEND_DATA_ATOMIC',
+                0x00000020 => 'NET_SFTP_OPEN_TEXT_MODE',
+                0x00000040 => 'NET_SFTP_OPEN_BLOCK_READ',
+                0x00000080 => 'NET_SFTP_OPEN_BLOCK_WRITE',
+                0x00000100 => 'NET_SFTP_OPEN_BLOCK_DELETE',
+                0x00000200 => 'NET_SFTP_OPEN_BLOCK_ADVISORY',
+                0x00000400 => 'NET_SFTP_OPEN_NOFOLLOW',
+                0x00000800 => 'NET_SFTP_OPEN_DELETE_ON_CLOSE',
+                0x00001000 => 'NET_SFTP_OPEN_ACCESS_AUDIT_ALARM_INFO',
+                0x00002000 => 'NET_SFTP_OPEN_ACCESS_BACKUP',
+                0x00004000 => 'NET_SFTP_OPEN_BACKUP_STREAM',
+                0x00008000 => 'NET_SFTP_OPEN_OVERRIDE_OWNER',
+            ];
+            // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-5.2
+            // see \phpseclib3\Net\SFTP::_parseLongname() for an explanation
+            self::$file_types = [
+                1 => 'NET_SFTP_TYPE_REGULAR',
+                2 => 'NET_SFTP_TYPE_DIRECTORY',
+                3 => 'NET_SFTP_TYPE_SYMLINK',
+                4 => 'NET_SFTP_TYPE_SPECIAL',
+                5 => 'NET_SFTP_TYPE_UNKNOWN',
+                // the following types were first defined for use in SFTPv5+
+                // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-05#section-5.2
+                6 => 'NET_SFTP_TYPE_SOCKET',
+                7 => 'NET_SFTP_TYPE_CHAR_DEVICE',
+                8 => 'NET_SFTP_TYPE_BLOCK_DEVICE',
+                9 => 'NET_SFTP_TYPE_FIFO'
+            ];
+            self::define_array(
+                self::$packet_types,
+                self::$status_codes,
+                self::$attributes,
+                self::$open_flags,
+                self::$open_flags5,
+                self::$file_types
+            );
+        }
 
         if (!defined('NET_SFTP_QUEUE_SIZE')) {
             define('NET_SFTP_QUEUE_SIZE', 32);
@@ -543,22 +547,7 @@ class SFTP extends SSH2
      */
     private function partial_init_sftp_connection()
     {
-        $this->window_size_server_to_client[self::CHANNEL] = $this->window_size;
-
-        $packet = Strings::packSSH2(
-            'CsN3',
-            NET_SSH2_MSG_CHANNEL_OPEN,
-            'session',
-            self::CHANNEL,
-            $this->window_size,
-            0x4000
-        );
-
-        $this->send_binary_packet($packet);
-
-        $this->channel_status[self::CHANNEL] = NET_SSH2_MSG_CHANNEL_OPEN;
-
-        $response = $this->get_channel_packet(self::CHANNEL, true);
+        $response = $this->open_channel(self::CHANNEL, true);
         if ($response === true && $this->isTimeout()) {
             return false;
         }
@@ -815,7 +804,7 @@ class SFTP extends SSH2
             list($status) = Strings::unpackSSH2('N', $response);
         }
 
-        $error = $this->status_codes[$status];
+        $error = self::$status_codes[$status];
 
         if ($this->version > 2) {
             list($message) = Strings::unpackSSH2('s', $response);
@@ -2138,10 +2127,10 @@ class SFTP extends SSH2
 
         if ($start >= 0) {
             $offset = $start;
-        } elseif ($mode & self::RESUME) {
+        } elseif ($mode & (self::RESUME | self::RESUME_START)) {
             // if NET_SFTP_OPEN_APPEND worked as it should _size() wouldn't need to be called
-            $size = $this->stat($remote_file)['size'];
-            $offset = $size !== false ? $size : 0;
+            $stat = $this->stat($remote_file);
+            $offset = $stat !== false && $stat['size'] ? $stat['size'] : 0;
         } else {
             $offset = 0;
             if ($this->version >= 5) {
@@ -2210,6 +2199,9 @@ class SFTP extends SSH2
             if ($local_start >= 0) {
                 fseek($fp, $local_start);
                 $size -= $local_start;
+            } elseif ($mode & self::RESUME) {
+                fseek($fp, $offset);
+                $size -= $offset;
             }
         } elseif ($dataCallback) {
             $size = 0;
@@ -2497,14 +2489,6 @@ class SFTP extends SSH2
             }
         }
 
-        if ($length > 0 && $length <= $offset - $start) {
-            if ($local_file === false) {
-                $content = substr($content, 0, $length);
-            } else {
-                ftruncate($fp, $length + $res_offset);
-            }
-        }
-
         if ($fclose_check) {
             fclose($fp);
 
@@ -2840,15 +2824,37 @@ class SFTP extends SSH2
         return $this->get_stat_cache_prop($path, 'gid');
     }
 
+    /**
+     * Recursively go through rawlist() output to get the total filesize
+     *
+     * @return int
+     */
+    private static function recursiveFilesize(array $files)
+    {
+        $size = 0;
+        foreach ($files as $name => $file) {
+            if ($name == '.' || $name == '..') {
+                continue;
+            }
+            $size += is_array($file) ?
+                self::recursiveFilesize($file) :
+                $file->size;
+        }
+        return $size;
+    }
+
     /**
      * Gets file size
      *
      * @param string $path
+     * @param bool $recursive
      * @return mixed
      */
-    public function filesize($path)
+    public function filesize($path, $recursive = false)
     {
-        return $this->get_stat_cache_prop($path, 'size');
+        return !$recursive || $this->filetype($path) != 'dir' ?
+            $this->get_stat_cache_prop($path, 'size') :
+            self::recursiveFilesize($this->rawlist($path, true));
     }
 
     /**
@@ -3041,7 +3047,7 @@ class SFTP extends SSH2
             list($flags) = Strings::unpackSSH2('N', $response);
         }
 
-        foreach ($this->attributes as $key => $value) {
+        foreach (self::$attributes as $key => $value) {
             switch ($flags & $key) {
                 case NET_SFTP_ATTR_UIDGID:
                     if ($this->version > 3) {
@@ -3272,7 +3278,7 @@ class SFTP extends SSH2
         $stop = microtime(true);
 
         if (defined('NET_SFTP_LOGGING')) {
-            $packet_type = '-> ' . $this->packet_types[$type] .
+            $packet_type = '-> ' . self::$packet_types[$type] .
                            ' (' . round($stop - $start, 4) . 's)';
             $this->append_log($packet_type, $data);
         }
@@ -3289,6 +3295,7 @@ class SFTP extends SSH2
         $this->use_request_id = false;
         $this->pwd = false;
         $this->requestBuffer = [];
+        $this->partial_init = false;
     }
 
     /**
@@ -3376,7 +3383,7 @@ class SFTP extends SSH2
         $packet = Strings::shift($this->packet_buffer, $length);
 
         if (defined('NET_SFTP_LOGGING')) {
-            $packet_type = '<- ' . $this->packet_types[$this->packet_type] .
+            $packet_type = '<- ' . self::$packet_types[$this->packet_type] .
                            ' (' . round($stop - $start, 4) . 's)';
             $this->append_log($packet_type, $packet);
         }
@@ -3420,7 +3427,7 @@ class SFTP extends SSH2
      *
      * Returns a string if NET_SFTP_LOGGING == self::LOG_COMPLEX, an array if NET_SFTP_LOGGING == self::LOG_SIMPLE and false if !defined('NET_SFTP_LOGGING')
      *
-     * @return array|string
+     * @return array|string|false
      */
     public function getSFTPLog()
     {
@@ -3439,7 +3446,7 @@ class SFTP extends SSH2
     }
 
     /**
-     * Returns all errors
+     * Returns all errors on the SFTP layer
      *
      * @return array
      */
@@ -3449,7 +3456,7 @@ class SFTP extends SSH2
     }
 
     /**
-     * Returns the last error
+     * Returns the last error on the SFTP layer
      *
      * @return string
      */
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php
index 9a0133fd..eee2e108 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php
@@ -553,7 +553,7 @@ class SSH2
      * @var array
      * @access private
      */
-    private $message_numbers = [];
+    private static $message_numbers = [];
 
     /**
      * Disconnection Message 'reason codes' defined in RFC4253
@@ -562,7 +562,7 @@ class SSH2
      * @var array
      * @access private
      */
-    private $disconnect_reasons = [];
+    private static $disconnect_reasons = [];
 
     /**
      * SSH_MSG_CHANNEL_OPEN_FAILURE 'reason codes', defined in RFC4254
@@ -571,7 +571,7 @@ class SSH2
      * @var array
      * @access private
      */
-    private $channel_open_failure_reasons = [];
+    private static $channel_open_failure_reasons = [];
 
     /**
      * Terminal Modes
@@ -581,7 +581,7 @@ class SSH2
      * @var array
      * @access private
      */
-    private $terminal_modes = [];
+    private static $terminal_modes = [];
 
     /**
      * SSH_MSG_CHANNEL_EXTENDED_DATA's data_type_codes
@@ -591,7 +591,7 @@ class SSH2
      * @var array
      * @access private
      */
-    private $channel_extended_data_type_codes = [];
+    private static $channel_extended_data_type_codes = [];
 
     /**
      * Send Sequence Number
@@ -646,6 +646,14 @@ class SSH2
      */
     protected $channel_status = [];
 
+    /**
+     * The identifier of the interactive channel which was opened most recently
+     *
+     * @see self::getInteractiveChannelId()
+     * @var int
+     */
+    private $channel_id_last_interactive = 0;
+
     /**
      * Packet Size
      *
@@ -837,20 +845,6 @@ class SSH2
      */
     private $request_pty = false;
 
-    /**
-     * Flag set while exec() is running when using enablePTY()
-     *
-     * @var bool
-     */
-    private $in_request_pty_exec = false;
-
-    /**
-     * Flag set after startSubsystem() is called
-     *
-     * @var bool
-     */
-    private $in_subsystem;
-
     /**
      * Contents of stdError
      *
@@ -1093,10 +1087,37 @@ class SSH2
      */
     private $smartMFA = true;
 
+    /**
+     * How many channels are currently opened
+     *
+     * @var int
+     */
+    private $channelCount = 0;
+
+    /**
+     * Does the server support multiple channels? If not then error out
+     * when multiple channels are attempted to be opened
+     *
+     * @var bool
+     */
+    private $errorOnMultipleChannels;
+
+    /**
+     * Terrapin Countermeasure
+     *
+     * "During initial KEX, terminate the connection if any unexpected or out-of-sequence packet is received"
+     * -- https://github.com/openssh/openssh-portable/commit/1edb00c58f8a6875fad6a497aa2bacf37f9e6cd5
+     *
+     * @var int
+     */
+    private $extra_packets;
+
     /**
      * Default Constructor.
      *
      * $host can either be a string, representing the host, or a stream resource.
+     * If $host is a stream resource then $port doesn't do anything, altho $timeout
+     * still will be used
      *
      * @param mixed $host
      * @param int $port
@@ -1105,84 +1126,87 @@ class SSH2
      */
     public function __construct($host, $port = 22, $timeout = 10)
     {
-        $this->message_numbers = [
-            1 => 'NET_SSH2_MSG_DISCONNECT',
-            2 => 'NET_SSH2_MSG_IGNORE',
-            3 => 'NET_SSH2_MSG_UNIMPLEMENTED',
-            4 => 'NET_SSH2_MSG_DEBUG',
-            5 => 'NET_SSH2_MSG_SERVICE_REQUEST',
-            6 => 'NET_SSH2_MSG_SERVICE_ACCEPT',
-            20 => 'NET_SSH2_MSG_KEXINIT',
-            21 => 'NET_SSH2_MSG_NEWKEYS',
-            30 => 'NET_SSH2_MSG_KEXDH_INIT',
-            31 => 'NET_SSH2_MSG_KEXDH_REPLY',
-            50 => 'NET_SSH2_MSG_USERAUTH_REQUEST',
-            51 => 'NET_SSH2_MSG_USERAUTH_FAILURE',
-            52 => 'NET_SSH2_MSG_USERAUTH_SUCCESS',
-            53 => 'NET_SSH2_MSG_USERAUTH_BANNER',
+        if (empty(self::$message_numbers)) {
+            self::$message_numbers = [
+                1 => 'NET_SSH2_MSG_DISCONNECT',
+                2 => 'NET_SSH2_MSG_IGNORE',
+                3 => 'NET_SSH2_MSG_UNIMPLEMENTED',
+                4 => 'NET_SSH2_MSG_DEBUG',
+                5 => 'NET_SSH2_MSG_SERVICE_REQUEST',
+                6 => 'NET_SSH2_MSG_SERVICE_ACCEPT',
+                7 => 'NET_SSH2_MSG_EXT_INFO', // RFC 8308
+                20 => 'NET_SSH2_MSG_KEXINIT',
+                21 => 'NET_SSH2_MSG_NEWKEYS',
+                30 => 'NET_SSH2_MSG_KEXDH_INIT',
+                31 => 'NET_SSH2_MSG_KEXDH_REPLY',
+                50 => 'NET_SSH2_MSG_USERAUTH_REQUEST',
+                51 => 'NET_SSH2_MSG_USERAUTH_FAILURE',
+                52 => 'NET_SSH2_MSG_USERAUTH_SUCCESS',
+                53 => 'NET_SSH2_MSG_USERAUTH_BANNER',
 
-            80 => 'NET_SSH2_MSG_GLOBAL_REQUEST',
-            81 => 'NET_SSH2_MSG_REQUEST_SUCCESS',
-            82 => 'NET_SSH2_MSG_REQUEST_FAILURE',
-            90 => 'NET_SSH2_MSG_CHANNEL_OPEN',
-            91 => 'NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION',
-            92 => 'NET_SSH2_MSG_CHANNEL_OPEN_FAILURE',
-            93 => 'NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST',
-            94 => 'NET_SSH2_MSG_CHANNEL_DATA',
-            95 => 'NET_SSH2_MSG_CHANNEL_EXTENDED_DATA',
-            96 => 'NET_SSH2_MSG_CHANNEL_EOF',
-            97 => 'NET_SSH2_MSG_CHANNEL_CLOSE',
-            98 => 'NET_SSH2_MSG_CHANNEL_REQUEST',
-            99 => 'NET_SSH2_MSG_CHANNEL_SUCCESS',
-            100 => 'NET_SSH2_MSG_CHANNEL_FAILURE'
-        ];
-        $this->disconnect_reasons = [
-            1 => 'NET_SSH2_DISCONNECT_HOST_NOT_ALLOWED_TO_CONNECT',
-            2 => 'NET_SSH2_DISCONNECT_PROTOCOL_ERROR',
-            3 => 'NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED',
-            4 => 'NET_SSH2_DISCONNECT_RESERVED',
-            5 => 'NET_SSH2_DISCONNECT_MAC_ERROR',
-            6 => 'NET_SSH2_DISCONNECT_COMPRESSION_ERROR',
-            7 => 'NET_SSH2_DISCONNECT_SERVICE_NOT_AVAILABLE',
-            8 => 'NET_SSH2_DISCONNECT_PROTOCOL_VERSION_NOT_SUPPORTED',
-            9 => 'NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE',
-            10 => 'NET_SSH2_DISCONNECT_CONNECTION_LOST',
-            11 => 'NET_SSH2_DISCONNECT_BY_APPLICATION',
-            12 => 'NET_SSH2_DISCONNECT_TOO_MANY_CONNECTIONS',
-            13 => 'NET_SSH2_DISCONNECT_AUTH_CANCELLED_BY_USER',
-            14 => 'NET_SSH2_DISCONNECT_NO_MORE_AUTH_METHODS_AVAILABLE',
-            15 => 'NET_SSH2_DISCONNECT_ILLEGAL_USER_NAME'
-        ];
-        $this->channel_open_failure_reasons = [
-            1 => 'NET_SSH2_OPEN_ADMINISTRATIVELY_PROHIBITED'
-        ];
-        $this->terminal_modes = [
-            0 => 'NET_SSH2_TTY_OP_END'
-        ];
-        $this->channel_extended_data_type_codes = [
-            1 => 'NET_SSH2_EXTENDED_DATA_STDERR'
-        ];
+                80 => 'NET_SSH2_MSG_GLOBAL_REQUEST',
+                81 => 'NET_SSH2_MSG_REQUEST_SUCCESS',
+                82 => 'NET_SSH2_MSG_REQUEST_FAILURE',
+                90 => 'NET_SSH2_MSG_CHANNEL_OPEN',
+                91 => 'NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION',
+                92 => 'NET_SSH2_MSG_CHANNEL_OPEN_FAILURE',
+                93 => 'NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST',
+                94 => 'NET_SSH2_MSG_CHANNEL_DATA',
+                95 => 'NET_SSH2_MSG_CHANNEL_EXTENDED_DATA',
+                96 => 'NET_SSH2_MSG_CHANNEL_EOF',
+                97 => 'NET_SSH2_MSG_CHANNEL_CLOSE',
+                98 => 'NET_SSH2_MSG_CHANNEL_REQUEST',
+                99 => 'NET_SSH2_MSG_CHANNEL_SUCCESS',
+                100 => 'NET_SSH2_MSG_CHANNEL_FAILURE'
+            ];
+            self::$disconnect_reasons = [
+                1 => 'NET_SSH2_DISCONNECT_HOST_NOT_ALLOWED_TO_CONNECT',
+                2 => 'NET_SSH2_DISCONNECT_PROTOCOL_ERROR',
+                3 => 'NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED',
+                4 => 'NET_SSH2_DISCONNECT_RESERVED',
+                5 => 'NET_SSH2_DISCONNECT_MAC_ERROR',
+                6 => 'NET_SSH2_DISCONNECT_COMPRESSION_ERROR',
+                7 => 'NET_SSH2_DISCONNECT_SERVICE_NOT_AVAILABLE',
+                8 => 'NET_SSH2_DISCONNECT_PROTOCOL_VERSION_NOT_SUPPORTED',
+                9 => 'NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE',
+                10 => 'NET_SSH2_DISCONNECT_CONNECTION_LOST',
+                11 => 'NET_SSH2_DISCONNECT_BY_APPLICATION',
+                12 => 'NET_SSH2_DISCONNECT_TOO_MANY_CONNECTIONS',
+                13 => 'NET_SSH2_DISCONNECT_AUTH_CANCELLED_BY_USER',
+                14 => 'NET_SSH2_DISCONNECT_NO_MORE_AUTH_METHODS_AVAILABLE',
+                15 => 'NET_SSH2_DISCONNECT_ILLEGAL_USER_NAME'
+            ];
+            self::$channel_open_failure_reasons = [
+                1 => 'NET_SSH2_OPEN_ADMINISTRATIVELY_PROHIBITED'
+            ];
+            self::$terminal_modes = [
+                0 => 'NET_SSH2_TTY_OP_END'
+            ];
+            self::$channel_extended_data_type_codes = [
+                1 => 'NET_SSH2_EXTENDED_DATA_STDERR'
+            ];
 
-        $this->define_array(
-            $this->message_numbers,
-            $this->disconnect_reasons,
-            $this->channel_open_failure_reasons,
-            $this->terminal_modes,
-            $this->channel_extended_data_type_codes,
-            [60 => 'NET_SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ'],
-            [60 => 'NET_SSH2_MSG_USERAUTH_PK_OK'],
-            [60 => 'NET_SSH2_MSG_USERAUTH_INFO_REQUEST',
-                  61 => 'NET_SSH2_MSG_USERAUTH_INFO_RESPONSE'],
-            // RFC 4419 - diffie-hellman-group-exchange-sha{1,256}
-            [30 => 'NET_SSH2_MSG_KEXDH_GEX_REQUEST_OLD',
-                  31 => 'NET_SSH2_MSG_KEXDH_GEX_GROUP',
-                  32 => 'NET_SSH2_MSG_KEXDH_GEX_INIT',
-                  33 => 'NET_SSH2_MSG_KEXDH_GEX_REPLY',
-                  34 => 'NET_SSH2_MSG_KEXDH_GEX_REQUEST'],
-            // RFC 5656 - Elliptic Curves (for curve25519-sha256@libssh.org)
-            [30 => 'NET_SSH2_MSG_KEX_ECDH_INIT',
-                  31 => 'NET_SSH2_MSG_KEX_ECDH_REPLY']
-        );
+            self::define_array(
+                self::$message_numbers,
+                self::$disconnect_reasons,
+                self::$channel_open_failure_reasons,
+                self::$terminal_modes,
+                self::$channel_extended_data_type_codes,
+                [60 => 'NET_SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ'],
+                [60 => 'NET_SSH2_MSG_USERAUTH_PK_OK'],
+                [60 => 'NET_SSH2_MSG_USERAUTH_INFO_REQUEST',
+                      61 => 'NET_SSH2_MSG_USERAUTH_INFO_RESPONSE'],
+                // RFC 4419 - diffie-hellman-group-exchange-sha{1,256}
+                [30 => 'NET_SSH2_MSG_KEXDH_GEX_REQUEST_OLD',
+                      31 => 'NET_SSH2_MSG_KEXDH_GEX_GROUP',
+                      32 => 'NET_SSH2_MSG_KEXDH_GEX_INIT',
+                      33 => 'NET_SSH2_MSG_KEXDH_GEX_REPLY',
+                      34 => 'NET_SSH2_MSG_KEXDH_GEX_REQUEST'],
+                // RFC 5656 - Elliptic Curves (for curve25519-sha256@libssh.org)
+                [30 => 'NET_SSH2_MSG_KEX_ECDH_INIT',
+                      31 => 'NET_SSH2_MSG_KEX_ECDH_REPLY']
+            );
+        }
 
         /**
          * Typehint is required due to a bug in Psalm: https://github.com/vimeo/psalm/issues/7508
@@ -1192,6 +1216,8 @@ class SSH2
             ? \WeakReference::create($this)
             : $this;
 
+        $this->timeout = $timeout;
+
         if (is_resource($host)) {
             $this->fsock = $host;
             return;
@@ -1200,7 +1226,6 @@ class SSH2
         if (Strings::is_stringable($host)) {
             $this->host = $host;
             $this->port = $port;
-            $this->timeout = $timeout;
         }
     }
 
@@ -1269,6 +1294,32 @@ class SSH2
         $this->send_kex_first = false;
     }
 
+    /**
+     * stream_select wrapper
+     *
+     * Quoting https://stackoverflow.com/a/14262151/569976,
+     * "The general approach to `EINTR` is to simply handle the error and retry the operation again"
+     *
+     * This wrapper does that loop
+     */
+    private static function stream_select(&$read, &$write, &$except, $seconds, $microseconds = null)
+    {
+        $remaining = $seconds + $microseconds / 1000000;
+        $start = microtime(true);
+        while (true) {
+            $result = @stream_select($read, $write, $except, $seconds, $microseconds);
+            if ($result !== false) {
+                return $result;
+            }
+            $elapsed = microtime(true) - $start;
+            $seconds = (int) ($remaining - floor($elapsed));
+            $microseconds = (int) (1000000 * ($remaining - $seconds));
+            if ($elapsed >= $remaining) {
+                return false;
+            }
+        }
+    }
+
     /**
      * Connect to an SSHv2 server
      *
@@ -1333,7 +1384,7 @@ class SSH2
                     $start = microtime(true);
                     $sec = (int) floor($this->curTimeout);
                     $usec = (int) (1000000 * ($this->curTimeout - $sec));
-                    if (@stream_select($read, $write, $except, $sec, $usec) === false) {
+                    if (static::stream_select($read, $write, $except, $sec, $usec) === false) {
                         throw new \RuntimeException('Connection timed out whilst receiving server identification string');
                     }
                     $elapsed = microtime(true) - $start;
@@ -1388,6 +1439,18 @@ class SSH2
             throw new UnableToConnectException("Cannot connect to SSH $matches[3] servers");
         }
 
+        // Ubuntu's OpenSSH from 5.8 to 6.9 didn't work with multiple channels. see
+        // https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/1334916 for more info.
+        // https://lists.ubuntu.com/archives/oneiric-changes/2011-July/005772.html discusses
+        // when consolekit was incorporated.
+        // https://marc.info/?l=openssh-unix-dev&m=163409903417589&w=2 discusses some of the
+        // issues with how Ubuntu incorporated consolekit
+        $pattern = '#^SSH-2\.0-OpenSSH_([\d.]+)[^ ]* Ubuntu-.*$#';
+        $match = preg_match($pattern, $this->server_identifier, $matches);
+        $match = $match && version_compare('5.8', $matches[1], '<=');
+        $match = $match && version_compare('6.9', $matches[1], '>=');
+        $this->errorOnMultipleChannels = $match;
+
         if (!$this->send_id_string_first) {
             fputs($this->fsock, $this->identifier . "\r\n");
         }
@@ -1486,6 +1549,8 @@ class SSH2
             $preferred['client_to_server']['comp'] :
             SSH2::getSupportedCompressionAlgorithms();
 
+        $kex_algorithms = array_merge($kex_algorithms, ['ext-info-c', 'kex-strict-c-v00@openssh.com']);
+
         // some SSH servers have buggy implementations of some of the above algorithms
         switch (true) {
             case $this->server_identifier == 'SSH-2.0-SSHD':
@@ -1502,6 +1567,20 @@ class SSH2
                         ['hmac-sha1-96', 'hmac-md5-96']
                     ));
                 }
+                break;
+            case substr($this->server_identifier, 0, 24) == 'SSH-2.0-TurboFTP_SERVER_':
+                if (!isset($preferred['server_to_client']['crypt'])) {
+                    $s2c_encryption_algorithms = array_values(array_diff(
+                        $s2c_encryption_algorithms,
+                        ['aes128-gcm@openssh.com', 'aes256-gcm@openssh.com']
+                    ));
+                }
+                if (!isset($preferred['client_to_server']['crypt'])) {
+                    $c2s_encryption_algorithms = array_values(array_diff(
+                        $c2s_encryption_algorithms,
+                        ['aes128-gcm@openssh.com', 'aes256-gcm@openssh.com']
+                    ));
+                }
         }
 
         $client_cookie = Random::string(16);
@@ -1526,6 +1605,7 @@ class SSH2
         if ($kexinit_payload_server === false) {
             $this->send_binary_packet($kexinit_payload_client);
 
+            $this->extra_packets = 0;
             $kexinit_payload_server = $this->get_binary_packet();
 
             if (
@@ -1557,6 +1637,11 @@ class SSH2
             $this->languages_server_to_client,
             $first_kex_packet_follows
         ) = Strings::unpackSSH2('L10C', $response);
+        if (in_array('kex-strict-s-v00@openssh.com', $this->kex_algorithms)) {
+            if ($this->session_id === false && $this->extra_packets) {
+                throw new \UnexpectedValueException('Possible Terrapin Attack detected');
+            }
+        }
 
         $this->supported_private_key_algorithms = $this->server_host_key_algorithms;
 
@@ -1815,6 +1900,10 @@ class SSH2
             throw new \UnexpectedValueException('Expected SSH_MSG_NEWKEYS');
         }
 
+        if (in_array('kex-strict-s-v00@openssh.com', $this->kex_algorithms)) {
+            $this->get_seq_no = $this->send_seq_no = 0;
+        }
+
         $keyBytes = pack('Na*', strlen($keyBytes), $keyBytes);
 
         $this->encrypt = self::encryption_algorithm_to_crypt_instance($encrypt);
@@ -2121,13 +2210,15 @@ class SSH2
      * The $password parameter can be a plaintext password, a \phpseclib3\Crypt\RSA|EC|DSA object, a \phpseclib3\System\SSH\Agent object or an array
      *
      * @param string $username
-     * @param string|AsymmetricKey|array[]|Agent|null ...$args
+     * @param string|PrivateKey|array[]|Agent|null ...$args
      * @return bool
      * @see self::_login()
      */
     public function login($username, ...$args)
     {
-        $this->auth[] = func_get_args();
+        if (!$this->retry_connect) {
+            $this->auth[] = func_get_args();
+        }
 
         // try logging with 'none' as an authentication method first since that's what
         // PuTTY does
@@ -2146,7 +2237,7 @@ class SSH2
      * Login Helper
      *
      * @param string $username
-     * @param string ...$args
+     * @param string|PrivateKey|array[]|Agent|null ...$args
      * @return bool
      * @see self::_login_helper()
      */
@@ -2266,10 +2357,26 @@ class SSH2
                     return $this->login_helper($username, $password);
                 }
                 $this->disconnect_helper(NET_SSH2_DISCONNECT_CONNECTION_LOST);
-                throw new ConnectionClosedException('Connection closed by server');
+                throw $e;
             }
 
-            list($type, $service) = Strings::unpackSSH2('Cs', $response);
+            list($type) = Strings::unpackSSH2('C', $response);
+
+            if ($type == NET_SSH2_MSG_EXT_INFO) {
+                list($nr_extensions) = Strings::unpackSSH2('N', $response);
+                for ($i = 0; $i < $nr_extensions; $i++) {
+                    list($extension_name, $extension_value) = Strings::unpackSSH2('ss', $response);
+                    if ($extension_name == 'server-sig-algs') {
+                        $this->supported_private_key_algorithms = explode(',', $extension_value);
+                    }
+                }
+
+                $response = $this->get_binary_packet();
+                list($type) = Strings::unpackSSH2('C', $response);
+            }
+
+            list($service) = Strings::unpackSSH2('s', $response);
+
             if ($type != NET_SSH2_MSG_SERVICE_ACCEPT || $service != 'ssh-userauth') {
                 $this->disconnect_helper(NET_SSH2_DISCONNECT_PROTOCOL_ERROR);
                 throw new \UnexpectedValueException('Expected SSH_MSG_SERVICE_ACCEPT');
@@ -2545,7 +2652,7 @@ class SSH2
             $privatekey = $privatekey->withPadding(RSA::SIGNATURE_PKCS1);
             $algos = ['rsa-sha2-256', 'rsa-sha2-512', 'ssh-rsa'];
             if (isset($this->preferred['hostkey'])) {
-                $algos = array_intersect($this->preferred['hostkey'], $algos);
+                $algos = array_intersect($algos, $this->preferred['hostkey']);
             }
             $algo = self::array_intersect_first($algos, $this->supported_private_key_algorithms);
             switch ($algo) {
@@ -2729,32 +2836,11 @@ class SSH2
             return false;
         }
 
-        if ($this->in_request_pty_exec) {
-            throw new \RuntimeException('If you want to run multiple exec()\'s you will need to disable (and re-enable if appropriate) a PTY for each one.');
-        }
+        //if ($this->isPTYOpen()) {
+        //    throw new \RuntimeException('If you want to run multiple exec()\'s you will need to disable (and re-enable if appropriate) a PTY for each one.');
+        //}
 
-        // RFC4254 defines the (client) window size as "bytes the other party can send before it must wait for the window to
-        // be adjusted".  0x7FFFFFFF is, at 2GB, the max size.  technically, it should probably be decremented, but,
-        // honestly, if you're transferring more than 2GB, you probably shouldn't be using phpseclib, anyway.
-        // see http://tools.ietf.org/html/rfc4254#section-5.2 for more info
-        $this->window_size_server_to_client[self::CHANNEL_EXEC] = $this->window_size;
-        // 0x8000 is the maximum max packet size, per http://tools.ietf.org/html/rfc4253#section-6.1, although since PuTTy
-        // uses 0x4000, that's what will be used here, as well.
-        $packet_size = 0x4000;
-
-        $packet = Strings::packSSH2(
-            'CsN3',
-            NET_SSH2_MSG_CHANNEL_OPEN,
-            'session',
-            self::CHANNEL_EXEC,
-            $this->window_size_server_to_client[self::CHANNEL_EXEC],
-            $packet_size
-        );
-        $this->send_binary_packet($packet);
-
-        $this->channel_status[self::CHANNEL_EXEC] = NET_SSH2_MSG_CHANNEL_OPEN;
-
-        $this->get_channel_packet(self::CHANNEL_EXEC);
+        $this->open_channel(self::CHANNEL_EXEC);
 
         if ($this->request_pty === true) {
             $terminal_modes = pack('C', NET_SSH2_TTY_OP_END);
@@ -2779,8 +2865,6 @@ class SSH2
                 $this->disconnect_helper(NET_SSH2_DISCONNECT_BY_APPLICATION);
                 throw new \RuntimeException('Unable to request pseudo-terminal');
             }
-
-            $this->in_request_pty_exec = true;
         }
 
         // sending a pty-req SSH_MSG_CHANNEL_REQUEST message is unnecessary and, in fact, in most cases, slows things
@@ -2810,7 +2894,8 @@ class SSH2
 
         $this->channel_status[self::CHANNEL_EXEC] = NET_SSH2_MSG_CHANNEL_DATA;
 
-        if ($this->in_request_pty_exec) {
+        if ($this->request_pty === true) {
+            $this->channel_id_last_interactive = self::CHANNEL_EXEC;
             return true;
         }
 
@@ -2836,37 +2921,80 @@ class SSH2
     }
 
     /**
-     * Creates an interactive shell
+     * How many channels are currently open?
      *
-     * @see self::read()
-     * @see self::write()
-     * @return bool
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @throws \RuntimeException on other errors
+     * @return int
      */
-    private function initShell()
+    public function getOpenChannelCount()
     {
-        if ($this->in_request_pty_exec === true) {
-            return true;
+        return $this->channelCount;
+    }
+
+    /**
+     * Opens a channel
+     *
+     * @param string $channel
+     * @param bool $skip_extended
+     * @return bool
+     */
+    protected function open_channel($channel, $skip_extended = false)
+    {
+        if (isset($this->channel_status[$channel]) && $this->channel_status[$channel] != NET_SSH2_MSG_CHANNEL_CLOSE) {
+            throw new \RuntimeException('Please close the channel (' . $channel . ') before trying to open it again');
         }
 
-        $this->window_size_server_to_client[self::CHANNEL_SHELL] = $this->window_size;
+        $this->channelCount++;
+
+        if ($this->channelCount > 1 && $this->errorOnMultipleChannels) {
+            throw new \RuntimeException("Ubuntu's OpenSSH from 5.8 to 6.9 doesn't work with multiple channels");
+        }
+
+        // RFC4254 defines the (client) window size as "bytes the other party can send before it must wait for the window to
+        // be adjusted".  0x7FFFFFFF is, at 2GB, the max size.  technically, it should probably be decremented, but,
+        // honestly, if you're transferring more than 2GB, you probably shouldn't be using phpseclib, anyway.
+        // see http://tools.ietf.org/html/rfc4254#section-5.2 for more info
+        $this->window_size_server_to_client[$channel] = $this->window_size;
+        // 0x8000 is the maximum max packet size, per http://tools.ietf.org/html/rfc4253#section-6.1, although since PuTTy
+        // uses 0x4000, that's what will be used here, as well.
         $packet_size = 0x4000;
 
         $packet = Strings::packSSH2(
             'CsN3',
             NET_SSH2_MSG_CHANNEL_OPEN,
             'session',
-            self::CHANNEL_SHELL,
-            $this->window_size_server_to_client[self::CHANNEL_SHELL],
+            $channel,
+            $this->window_size_server_to_client[$channel],
             $packet_size
         );
 
         $this->send_binary_packet($packet);
 
-        $this->channel_status[self::CHANNEL_SHELL] = NET_SSH2_MSG_CHANNEL_OPEN;
+        $this->channel_status[$channel] = NET_SSH2_MSG_CHANNEL_OPEN;
 
-        $this->get_channel_packet(self::CHANNEL_SHELL);
+        return $this->get_channel_packet($channel, $skip_extended);
+    }
+
+    /**
+     * Creates an interactive shell
+     *
+     * Returns bool(true) if the shell was opened.
+     * Returns bool(false) if the shell was already open.
+     *
+     * @see self::isShellOpen()
+     * @see self::read()
+     * @see self::write()
+     * @return bool
+     * @throws InsufficientSetupException if not authenticated
+     * @throws \UnexpectedValueException on receipt of unexpected packets
+     * @throws \RuntimeException on other errors
+     */
+    public function openShell()
+    {
+        if (!$this->isAuthenticated()) {
+            throw new InsufficientSetupException('Operation disallowed prior to login()');
+        }
+
+        $this->open_channel(self::CHANNEL_SHELL);
 
         $terminal_modes = pack('C', NET_SSH2_TTY_OP_END);
         $packet = Strings::packSSH2(
@@ -2907,14 +3035,18 @@ class SSH2
 
         $this->channel_status[self::CHANNEL_SHELL] = NET_SSH2_MSG_CHANNEL_DATA;
 
+        $this->channel_id_last_interactive = self::CHANNEL_SHELL;
+
         $this->bitmap |= self::MASK_SHELL;
 
         return true;
     }
 
     /**
-     * Return the channel to be used with read() / write()
-     *
+     * Return the channel to be used with read(), write(), and reset(), if none were specified
+     * @deprecated for lack of transparency in intended channel target, to be potentially replaced
+     *             with method which guarantees open-ness of all yielded channels and throws
+     *             error for multiple open channels
      * @see self::read()
      * @see self::write()
      * @return int
@@ -2922,15 +3054,26 @@ class SSH2
     private function get_interactive_channel()
     {
         switch (true) {
-            case $this->in_subsystem:
+            case $this->is_channel_status_data(self::CHANNEL_SUBSYSTEM):
                 return self::CHANNEL_SUBSYSTEM;
-            case $this->in_request_pty_exec:
+            case $this->is_channel_status_data(self::CHANNEL_EXEC):
                 return self::CHANNEL_EXEC;
             default:
                 return self::CHANNEL_SHELL;
         }
     }
 
+    /**
+     * Indicates the DATA status on the given channel
+     *
+     * @param int $channel The channel number to evaluate
+     * @return bool
+     */
+    private function is_channel_status_data($channel)
+    {
+        return isset($this->channel_status[$channel]) && $this->channel_status[$channel] == NET_SSH2_MSG_CHANNEL_DATA;
+    }
+
     /**
      * Return an available open channel
      *
@@ -2987,26 +3130,41 @@ class SSH2
      * Returns when there's a match for $expect, which can take the form of a string literal or,
      * if $mode == self::READ_REGEX, a regular expression.
      *
+     * If not specifying a channel, an open interactive channel will be selected, or, if there are
+     * no open channels, an interactive shell will be created. If there are multiple open
+     * interactive channels, a legacy behavior will apply in which channel selection prioritizes
+     * an active subsystem, the exec pty, and, lastly, the shell. If using multiple interactive
+     * channels, callers are discouraged from relying on this legacy behavior and should specify
+     * the intended channel.
+     *
      * @see self::write()
      * @param string $expect
-     * @param int $mode
+     * @param int $mode One of the self::READ_* constants
+     * @param int|null $channel Channel id returned by self::getInteractiveChannelId()
      * @return string|bool|null
      * @throws \RuntimeException on connection error
+     * @throws InsufficientSetupException on unexpected channel status, possibly due to closure
      */
-    public function read($expect = '', $mode = self::READ_SIMPLE)
+    public function read($expect = '', $mode = self::READ_SIMPLE, $channel = null)
     {
-        $this->curTimeout = $this->timeout;
-        $this->is_timeout = false;
-
         if (!$this->isAuthenticated()) {
             throw new InsufficientSetupException('Operation disallowed prior to login()');
         }
 
-        if (!($this->bitmap & self::MASK_SHELL) && !$this->initShell()) {
-            throw new \RuntimeException('Unable to initiate an interactive shell session');
+        $this->curTimeout = $this->timeout;
+        $this->is_timeout = false;
+
+        if ($channel === null) {
+            $channel = $this->get_interactive_channel();
         }
 
-        $channel = $this->get_interactive_channel();
+        if (!$this->is_channel_status_data($channel) && empty($this->channel_buffers[$channel])) {
+            if ($channel != self::CHANNEL_SHELL) {
+                throw new InsufficientSetupException('Data is not available on channel');
+            } elseif (!$this->openShell()) {
+                throw new \RuntimeException('Unable to initiate an interactive shell session');
+            }
+        }
 
         if ($mode == self::READ_NEXT) {
             return $this->get_channel_packet($channel);
@@ -3024,7 +3182,6 @@ class SSH2
             }
             $response = $this->get_channel_packet($channel);
             if ($response === true) {
-                $this->in_request_pty_exec = false;
                 return Strings::shift($this->interactiveBuffer, strlen($this->interactiveBuffer));
             }
 
@@ -3035,22 +3192,39 @@ class SSH2
     /**
      * Inputs a command into an interactive shell.
      *
+     * If not specifying a channel, an open interactive channel will be selected, or, if there are
+     * no open channels, an interactive shell will be created. If there are multiple open
+     * interactive channels, a legacy behavior will apply in which channel selection prioritizes
+     * an active subsystem, the exec pty, and, lastly, the shell. If using multiple interactive
+     * channels, callers are discouraged from relying on this legacy behavior and should specify
+     * the intended channel.
+     *
      * @see SSH2::read()
      * @param string $cmd
+     * @param int|null $channel Channel id returned by self::getInteractiveChannelId()
      * @return void
      * @throws \RuntimeException on connection error
+     * @throws InsufficientSetupException on unexpected channel status, possibly due to closure
      */
-    public function write($cmd)
+    public function write($cmd, $channel = null)
     {
         if (!$this->isAuthenticated()) {
             throw new InsufficientSetupException('Operation disallowed prior to login()');
         }
 
-        if (!($this->bitmap & self::MASK_SHELL) && !$this->initShell()) {
-            throw new \RuntimeException('Unable to initiate an interactive shell session');
+        if ($channel === null) {
+            $channel = $this->get_interactive_channel();
         }
 
-        $this->send_channel_packet($this->get_interactive_channel(), $cmd);
+        if (!$this->is_channel_status_data($channel)) {
+            if ($channel != self::CHANNEL_SHELL) {
+                throw new InsufficientSetupException('Data is not available on channel');
+            } elseif (!$this->openShell()) {
+                throw new \RuntimeException('Unable to initiate an interactive shell session');
+            }
+        }
+
+        $this->send_channel_packet($channel, $cmd);
     }
 
     /**
@@ -3068,22 +3242,7 @@ class SSH2
      */
     public function startSubsystem($subsystem)
     {
-        $this->window_size_server_to_client[self::CHANNEL_SUBSYSTEM] = $this->window_size;
-
-        $packet = Strings::packSSH2(
-            'CsN3',
-            NET_SSH2_MSG_CHANNEL_OPEN,
-            'session',
-            self::CHANNEL_SUBSYSTEM,
-            $this->window_size,
-            0x4000
-        );
-
-        $this->send_binary_packet($packet);
-
-        $this->channel_status[self::CHANNEL_SUBSYSTEM] = NET_SSH2_MSG_CHANNEL_OPEN;
-
-        $this->get_channel_packet(self::CHANNEL_SUBSYSTEM);
+        $this->open_channel(self::CHANNEL_SUBSYSTEM);
 
         $packet = Strings::packSSH2(
             'CNsCs',
@@ -3103,8 +3262,7 @@ class SSH2
 
         $this->channel_status[self::CHANNEL_SUBSYSTEM] = NET_SSH2_MSG_CHANNEL_DATA;
 
-        $this->bitmap |= self::MASK_SHELL;
-        $this->in_subsystem = true;
+        $this->channel_id_last_interactive = self::CHANNEL_SUBSYSTEM;
 
         return true;
     }
@@ -3117,8 +3275,9 @@ class SSH2
      */
     public function stopSubsystem()
     {
-        $this->in_subsystem = false;
-        $this->close_channel(self::CHANNEL_SUBSYSTEM);
+        if ($this->isInteractiveChannelOpen(self::CHANNEL_SUBSYSTEM)) {
+            $this->close_channel(self::CHANNEL_SUBSYSTEM);
+        }
         return true;
     }
 
@@ -3127,10 +3286,23 @@ class SSH2
      *
      * If read() timed out you might want to just close the channel and have it auto-restart on the next read() call
      *
+     * If not specifying a channel, an open interactive channel will be selected. If there are
+     * multiple open interactive channels, a legacy behavior will apply in which channel selection
+     * prioritizes an active subsystem, the exec pty, and, lastly, the shell. If using multiple
+     * interactive channels, callers are discouraged from relying on this legacy behavior and
+     * should specify the intended channel.
+     *
+     * @param int|null $channel Channel id returned by self::getInteractiveChannelId()
+     * @return void
      */
-    public function reset()
+    public function reset($channel = null)
     {
-        $this->close_channel($this->get_interactive_channel());
+        if ($channel === null) {
+            $channel = $this->get_interactive_channel();
+        }
+        if ($this->isInteractiveChannelOpen($channel)) {
+            $this->close_channel($channel);
+        }
     }
 
     /**
@@ -3172,11 +3344,38 @@ class SSH2
     /**
      * Is the connection still active?
      *
+     * $level has 3x possible values:
+     * 0 (default): phpseclib takes a passive approach to see if the connection is still active by calling feof()
+     *    on the socket
+     * 1: phpseclib takes an active approach to see if the connection is still active by sending an SSH_MSG_IGNORE
+     *    packet that doesn't require a response
+     * 2: phpseclib takes an active approach to see if the connection is still active by sending an SSH_MSG_CHANNEL_OPEN
+     *    packet and imediately trying to close that channel. some routers, in particular, however, will only let you
+     *    open one channel, so this approach could yield false positives
+     *
+     * @param int $level
      * @return bool
      */
-    public function isConnected()
+    public function isConnected($level = 0)
     {
-        return (bool) ($this->bitmap & self::MASK_CONNECTED);
+        if (!is_int($level) || $level < 0 || $level > 2) {
+            throw new \InvalidArgumentException('$level must be 0, 1 or 2');
+        }
+
+        if ($level == 0) {
+            return ($this->bitmap & self::MASK_CONNECTED) && is_resource($this->fsock) && !feof($this->fsock);
+        }
+        try {
+            if ($level == 1) {
+                $this->send_binary_packet(pack('CN', NET_SSH2_MSG_IGNORE, 0));
+            } else {
+                $this->open_channel(self::CHANNEL_KEEP_ALIVE);
+                $this->close_channel(self::CHANNEL_KEEP_ALIVE);
+            }
+            return true;
+        } catch (\Exception $e) {
+            return false;
+        }
     }
 
     /**
@@ -3189,6 +3388,49 @@ class SSH2
         return (bool) ($this->bitmap & self::MASK_LOGIN);
     }
 
+    /**
+     * Is the interactive shell active?
+     *
+     * @return bool
+     */
+    public function isShellOpen()
+    {
+        return $this->isInteractiveChannelOpen(self::CHANNEL_SHELL);
+    }
+
+    /**
+     * Is the exec pty active?
+     *
+     * @return bool
+     */
+    public function isPTYOpen()
+    {
+        return $this->isInteractiveChannelOpen(self::CHANNEL_EXEC);
+    }
+
+    /**
+     * Is the given interactive channel active?
+     *
+     * @param int $channel Channel id returned by self::getInteractiveChannelId()
+     * @return bool
+     */
+    public function isInteractiveChannelOpen($channel)
+    {
+        return $this->isAuthenticated() && $this->is_channel_status_data($channel);
+    }
+
+    /**
+     * Returns a channel identifier, presently of the last interactive channel opened, regardless of current status.
+     * Returns 0 if no interactive channel has been opened.
+     *
+     * @see self::isInteractiveChannelOpen()
+     * @return int
+     */
+    public function getInteractiveChannelId()
+    {
+        return $this->channel_id_last_interactive;
+    }
+
     /**
      * Pings a server connection, or tries to reconnect if the connection has gone down
      *
@@ -3205,23 +3447,8 @@ class SSH2
             return false;
         }
 
-        $this->window_size_server_to_client[self::CHANNEL_KEEP_ALIVE] = $this->window_size;
-        $packet_size = 0x4000;
-        $packet = Strings::packSSH2(
-            'CsN3',
-            NET_SSH2_MSG_CHANNEL_OPEN,
-            'session',
-            self::CHANNEL_KEEP_ALIVE,
-            $this->window_size_server_to_client[self::CHANNEL_KEEP_ALIVE],
-            $packet_size
-        );
-
         try {
-            $this->send_binary_packet($packet);
-
-            $this->channel_status[self::CHANNEL_KEEP_ALIVE] = NET_SSH2_MSG_CHANNEL_OPEN;
-
-            $response = $this->get_channel_packet(self::CHANNEL_KEEP_ALIVE);
+            $this->open_channel(self::CHANNEL_KEEP_ALIVE);
         } catch (\RuntimeException $e) {
             return $this->reconnect();
         }
@@ -3261,6 +3488,8 @@ class SSH2
         $this->session_id = false;
         $this->retry_connect = true;
         $this->get_seq_no = $this->send_seq_no = 0;
+        $this->channel_status = [];
+        $this->channel_id_last_interactive = 0;
     }
 
     /**
@@ -3283,9 +3512,9 @@ class SSH2
 
             if (!$this->curTimeout) {
                 if ($this->keepAlive <= 0) {
-                    @stream_select($read, $write, $except, null);
+                    static::stream_select($read, $write, $except, null);
                 } else {
-                    if (!@stream_select($read, $write, $except, $this->keepAlive)) {
+                    if (!static::stream_select($read, $write, $except, $this->keepAlive)) {
                         $this->send_binary_packet(pack('CN', NET_SSH2_MSG_IGNORE, 0));
                         return $this->get_binary_packet(true);
                     }
@@ -3299,7 +3528,7 @@ class SSH2
                 $start = microtime(true);
 
                 if ($this->keepAlive > 0 && $this->keepAlive < $this->curTimeout) {
-                    if (!@stream_select($read, $write, $except, $this->keepAlive)) {
+                    if (!static::stream_select($read, $write, $except, $this->keepAlive)) {
                         $this->send_binary_packet(pack('CN', NET_SSH2_MSG_IGNORE, 0));
                         $elapsed = microtime(true) - $start;
                         $this->curTimeout -= $elapsed;
@@ -3313,7 +3542,7 @@ class SSH2
                 $usec = (int) (1000000 * ($this->curTimeout - $sec));
 
                 // this can return a "stream_select(): unable to select [4]: Interrupted system call" error
-                if (!@stream_select($read, $write, $except, $sec, $usec)) {
+                if (!static::stream_select($read, $write, $except, $sec, $usec)) {
                     $this->is_timeout = true;
                     return true;
                 }
@@ -3332,6 +3561,11 @@ class SSH2
         }
 
         $start = microtime(true);
+        if ($this->curTimeout) {
+            $sec = (int) floor($this->curTimeout);
+            $usec = (int) (1000000 * ($this->curTimeout - $sec));
+            stream_set_timeout($this->fsock, $sec, $usec);
+        }
         $raw = stream_get_contents($this->fsock, $this->decrypt_block_size);
 
         if (!strlen($raw)) {
@@ -3504,7 +3738,7 @@ class SSH2
 
         if (defined('NET_SSH2_LOGGING')) {
             $current = microtime(true);
-            $message_number = isset($this->message_numbers[ord($payload[0])]) ? $this->message_numbers[ord($payload[0])] : 'UNKNOWN (' . ord($payload[0]) . ')';
+            $message_number = isset(self::$message_numbers[ord($payload[0])]) ? self::$message_numbers[ord($payload[0])] : 'UNKNOWN (' . ord($payload[0]) . ')';
             $message_number = '<- ' . $message_number .
                               ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)';
             $this->append_log($message_number, $payload);
@@ -3586,13 +3820,15 @@ class SSH2
             case NET_SSH2_MSG_DISCONNECT:
                 Strings::shift($payload, 1);
                 list($reason_code, $message) = Strings::unpackSSH2('Ns', $payload);
-                $this->errors[] = 'SSH_MSG_DISCONNECT: ' . $this->disconnect_reasons[$reason_code] . "\r\n$message";
+                $this->errors[] = 'SSH_MSG_DISCONNECT: ' . self::$disconnect_reasons[$reason_code] . "\r\n$message";
                 $this->bitmap = 0;
                 return false;
             case NET_SSH2_MSG_IGNORE:
+                $this->extra_packets++;
                 $payload = $this->get_binary_packet($skip_channel_filter);
                 break;
             case NET_SSH2_MSG_DEBUG:
+                $this->extra_packets++;
                 Strings::shift($payload, 2); // second byte is "always_display"
                 list($message) = Strings::unpackSSH2('s', $payload);
                 $this->errors[] = "SSH_MSG_DEBUG: $message";
@@ -3601,6 +3837,7 @@ class SSH2
             case NET_SSH2_MSG_UNIMPLEMENTED:
                 return false;
             case NET_SSH2_MSG_KEXINIT:
+                // this is here for key re-exchanges after the initial key exchange
                 if ($this->session_id !== false) {
                     if (!$this->key_exchange($payload)) {
                         $this->bitmap = 0;
@@ -3773,9 +4010,8 @@ class SSH2
      */
     public function disablePTY()
     {
-        if ($this->in_request_pty_exec) {
+        if ($this->isPTYOpen()) {
             $this->close_channel(self::CHANNEL_EXEC);
-            $this->in_request_pty_exec = false;
         }
         $this->request_pty = false;
     }
@@ -3801,6 +4037,7 @@ class SSH2
      * - if the connection times out
      * - if the channel status is CHANNEL_OPEN and the response was CHANNEL_OPEN_CONFIRMATION
      * - if the channel status is CHANNEL_REQUEST and the response was CHANNEL_SUCCESS
+     * - if the channel status is CHANNEL_CLOSE and the response was CHANNEL_CLOSE
      *
      * bool(false) is returned if:
      *
@@ -3968,7 +4205,10 @@ class SSH2
                                 throw new \RuntimeException('Unable to fulfill channel request');
                         }
                     case NET_SSH2_MSG_CHANNEL_CLOSE:
-                        return $type == NET_SSH2_MSG_CHANNEL_CLOSE ? true : $this->get_channel_packet($client_channel, $skip_extended);
+                        if ($client_channel == $channel && $type == NET_SSH2_MSG_CHANNEL_CLOSE) {
+                            return true;
+                        }
+                        return $this->get_channel_packet($client_channel, $skip_extended);
                 }
             }
 
@@ -4003,14 +4243,15 @@ class SSH2
                 case NET_SSH2_MSG_CHANNEL_CLOSE:
                     $this->curTimeout = 5;
 
-                    if ($this->bitmap & self::MASK_SHELL) {
-                        $this->bitmap &= ~self::MASK_SHELL;
-                    }
+                    $this->close_channel_bitmap($channel);
+
                     if ($this->channel_status[$channel] != NET_SSH2_MSG_CHANNEL_EOF) {
                         $this->send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$channel]));
                     }
 
                     $this->channel_status[$channel] = NET_SSH2_MSG_CHANNEL_CLOSE;
+                    $this->channelCount--;
+
                     if ($client_channel == $channel) {
                         return true;
                     }
@@ -4157,7 +4398,7 @@ class SSH2
 
         if (defined('NET_SSH2_LOGGING')) {
             $current = microtime(true);
-            $message_number = isset($this->message_numbers[ord($logged[0])]) ? $this->message_numbers[ord($logged[0])] : 'UNKNOWN (' . ord($logged[0]) . ')';
+            $message_number = isset(self::$message_numbers[ord($logged[0])]) ? self::$message_numbers[ord($logged[0])] : 'UNKNOWN (' . ord($logged[0]) . ')';
             $message_number = '-> ' . $message_number .
                               ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)';
             $this->append_log($message_number, $logged);
@@ -4166,7 +4407,10 @@ class SSH2
 
         if (strlen($packet) != $sent) {
             $this->bitmap = 0;
-            throw new \RuntimeException("Only $sent of " . strlen($packet) . " bytes were sent");
+            $message = $sent === false ?
+                'Unable to write ' . strlen($packet) . ' bytes' :
+                "Only $sent of " . strlen($packet) . " bytes were sent";
+            throw new \RuntimeException($message);
         }
     }
 
@@ -4342,22 +4586,36 @@ class SSH2
         }
 
         $this->channel_status[$client_channel] = NET_SSH2_MSG_CHANNEL_CLOSE;
+        $this->channelCount--;
 
         $this->curTimeout = 5;
 
         while (!is_bool($this->get_channel_packet($client_channel))) {
         }
 
-        if ($this->is_timeout) {
-            $this->disconnect();
-        }
-
         if ($want_reply) {
             $this->send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$client_channel]));
         }
 
-        if ($this->bitmap & self::MASK_SHELL) {
-            $this->bitmap &= ~self::MASK_SHELL;
+        $this->close_channel_bitmap($client_channel);
+    }
+
+    /**
+     * Maintains execution state bitmap in response to channel closure
+     *
+     * @param int $client_channel The channel number to maintain closure status of
+     * @return void
+     */
+    private function close_channel_bitmap($client_channel)
+    {
+        switch ($client_channel) {
+            case self::CHANNEL_SHELL:
+                // Shell status has been maintained in the bitmap for backwards
+                //  compatibility sake, but can be removed going forward
+                if ($this->bitmap & self::MASK_SHELL) {
+                    $this->bitmap &= ~self::MASK_SHELL;
+                }
+                break;
         }
     }
 
@@ -4395,7 +4653,7 @@ class SSH2
      * @param mixed[] ...$args
      * @access protected
      */
-    protected function define_array(...$args)
+    protected static function define_array(...$args)
     {
         foreach ($args as $arg) {
             foreach ($arg as $key => $value) {
@@ -4501,7 +4759,9 @@ class SSH2
     }
 
     /**
-     * Returns all errors
+     * Returns all errors / debug messages on the SSH layer
+     *
+     * If you are looking for messages from the SFTP layer, please see SFTP::getSFTPErrors()
      *
      * @return string[]
      */
@@ -4511,7 +4771,9 @@ class SSH2
     }
 
     /**
-     * Returns the last error
+     * Returns the last error received on the SSH layer
+     *
+     * If you are looking for messages from the SFTP layer, please see SFTP::getLastSFTPError()
      *
      * @return string
      */
@@ -4800,6 +5062,14 @@ class SSH2
         ];
     }
 
+    /**
+     * Force multiple channels (even if phpseclib has decided to disable them)
+     */
+    public function forceMultipleChannels()
+    {
+        $this->errorOnMultipleChannels = false;
+    }
+
     /**
      * Allows you to set the terminal
      *

From 04ce1fd2b44304587a4f86f4805c909e2fe2d464 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 21 Mar 2024 07:40:46 +0000
Subject: [PATCH 067/294] Bluesky: Support Restrictions / Updated Friendica
 handle description

---
 bluesky/bluesky.php        | 49 ++++++++++++++++++++++++++++++++++++--
 bluesky/lang/C/messages.po | 10 ++++----
 2 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index fe66d9a4..2cd2d263 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -323,7 +323,7 @@ function bluesky_addon_admin(string &$o)
 
 	$o = Renderer::replaceMacros($t, [
 		'$submit' => DI::l10n()->t('Save Settings'),
-		'$friendica_handles'    => ['friendica_handles', DI::l10n()->t('Allow your users to use your hostname for their Bluesky handles'), DI::config()->get('bluesky', 'friendica_handles'), DI::l10n()->t('Before enabling this option, you have to download and configure the bluesky-handles repository on your system. See https://git.friendi.ca/heluecht/bluesky-handles')],
+		'$friendica_handles'    => ['friendica_handles', DI::l10n()->t('Allow your users to use your hostname for their Bluesky handles'), DI::config()->get('bluesky', 'friendica_handles'), DI::l10n()->t('Before enabling this option, you have to setup a wildcard domain configuration and you have to enable wildcard requests in your webserver configuration. On Apache this is done by adding "ServerAlias *.%s" to your HTTP configuration. You don\'t need to change the HTTPS configuration.', DI::baseUrl()->getHost())],
 	]);
 }
 
@@ -525,8 +525,8 @@ function bluesky_cron()
 		// Refresh the token now, so that it doesn't need to be refreshed in parallel by the following workers
 		bluesky_get_token($pconfig['uid']);
 
-		Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_timeline.php', $pconfig['uid'], $last);
 		Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_notifications.php', $pconfig['uid'], $last);
+		Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_timeline.php', $pconfig['uid'], $last);
 
 		if (DI::pConfig()->get($pconfig['uid'], 'bluesky', 'import_feeds')) {
 			$feeds = bluesky_get_feeds($pconfig['uid']);
@@ -1176,6 +1176,8 @@ function bluesky_process_post(stdClass $post, int $uid, int $fetch_uid, int $pos
 		$item = bluesky_add_media($post->embed, $item, $uid, $level, $last_poll);
 	}
 
+	$item['restrictions'] = bluesky_get_restrictions_for_user($post, $item, $post_reason);
+
 	if (empty($item['post-reason'])) {
 		$item['post-reason'] = $post_reason;
 	}
@@ -1223,6 +1225,49 @@ function bluesky_get_header(stdClass $post, string $uri, int $uid, int $fetch_ui
 	return $item;
 }
 
+function bluesky_get_restrictions_for_user(stdClass $post, array $item, int $post_reason): ?int
+{
+	if (!empty($post->viewer->replyDisabled)) {
+		return Item::CANT_REPLY;
+	}
+
+	if(empty($post->threadgate)) {
+		return null;
+	}
+
+	if (!isset($post->threadgate->record->allow)) {
+		return null;
+	}
+
+	if ($item['uid'] == 0) {
+		return Item::CANT_REPLY;
+	}
+
+	$restrict = true;
+	$type = '$type';
+	foreach ($post->threadgate->record->allow as $allow) {
+		switch ($allow->$type) {
+			case 'app.bsky.feed.threadgate#followingRule':
+				// Only followers can reply.
+				if (Contact::isFollower($item['author-id'], $item['uid'])) {
+					$restrict = false;
+				}
+				break;
+			case 'app.bsky.feed.threadgate#mentionRule':
+				// Only mentioned accounts can reply.
+				if ($post_reason == Item::PR_TO) {
+					$restrict = false;
+				}
+				break;
+			case 'app.bsky.feed.threadgate#listRule';
+				// Only accounts in the provided list can reply. We don't support this at the moment.
+				break;
+		}
+	}
+
+	return $restrict ? Item::CANT_REPLY : null;
+}
+
 function bluesky_get_content(array $item, stdClass $record, string $uri, int $uid, int $fetch_uid, int $level, int $last_poll): array
 {
 	if (empty($item)) {
diff --git a/bluesky/lang/C/messages.po b/bluesky/lang/C/messages.po
index 0d69cc10..9521ab89 100644
--- a/bluesky/lang/C/messages.po
+++ b/bluesky/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-28 03:05+0000\n"
+"POT-Creation-Date: 2024-03-22 05:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,10 +26,12 @@ msgid "Allow your users to use your hostname for their Bluesky handles"
 msgstr ""
 
 #: bluesky.php:326
+#, php-format
 msgid ""
-"Before enabling this option, you have to download and configure the bluesky-"
-"handles repository on your system. See https://git.friendi.ca/heluecht/"
-"bluesky-handles"
+"Before enabling this option, you have to setup a wildcard domain "
+"configuration and you have to enable wildcard requests in your webserver "
+"configuration. On Apache this is done by adding \"ServerAlias *.%s\" to your "
+"HTTP configuration. You don't need to change the HTTPS configuration."
 msgstr ""
 
 #: bluesky.php:354

From 3f26f9785ed9d08abe8b1234a4a54a96a0196cc7 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Fri, 22 Mar 2024 15:53:47 +0100
Subject: [PATCH 068/294] [Hotfix] Fix REPO_URL for woodpecker

---
 .woodpecker/.code_standards_check.yml  | 2 +-
 .woodpecker/.continuous-deployment.yml | 2 +-
 .woodpecker/.messages.po_check.yml     | 2 +-
 .woodpecker/.phpunit.yml               | 2 +-
 .woodpecker/.releaser.yml              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.woodpecker/.code_standards_check.yml b/.woodpecker/.code_standards_check.yml
index 9d59dc08..8e0f7dc7 100644
--- a/.woodpecker/.code_standards_check.yml
+++ b/.woodpecker/.code_standards_check.yml
@@ -13,7 +13,7 @@ pipeline:
     commands:
       - git config --global user.email "no-reply@friendi.ca"
       - git config --global user.name "Friendica"
-      - git clone $CI_REPO_LINK addon
+      - git clone $CI_REPO_CLONE_URL addon
       - cd addon/
       - git checkout $CI_COMMIT_BRANCH
       - git fetch origin $CI_COMMIT_REF
diff --git a/.woodpecker/.continuous-deployment.yml b/.woodpecker/.continuous-deployment.yml
index 3756a8bf..d1202978 100644
--- a/.woodpecker/.continuous-deployment.yml
+++ b/.woodpecker/.continuous-deployment.yml
@@ -20,7 +20,7 @@ pipeline:
     commands:
       - git config --global user.email "no-reply@friendi.ca"
       - git config --global user.name "Friendica"
-      - git clone $CI_REPO_LINK addon
+      - git clone $CI_REPO_CLONE_URL addon
       - cd addon/
       - git checkout $CI_COMMIT_BRANCH
       - git fetch origin $CI_COMMIT_REF
diff --git a/.woodpecker/.messages.po_check.yml b/.woodpecker/.messages.po_check.yml
index f5691e00..ea9fa4d5 100644
--- a/.woodpecker/.messages.po_check.yml
+++ b/.woodpecker/.messages.po_check.yml
@@ -13,7 +13,7 @@ pipeline:
     commands:
       - git config --global user.email "no-reply@friendi.ca"
       - git config --global user.name "Friendica"
-      - git clone $CI_REPO_LINK addon
+      - git clone $CI_REPO_CLONE_URL addon
       - cd addon/
       - git checkout $CI_COMMIT_BRANCH
       - git fetch origin $CI_COMMIT_REF
diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml
index 1e6189d3..0c25a2bd 100644
--- a/.woodpecker/.phpunit.yml
+++ b/.woodpecker/.phpunit.yml
@@ -28,7 +28,7 @@ pipeline:
     commands:
       - git config --global user.email "no-reply@friendi.ca"
       - git config --global user.name "Friendica"
-      - git clone $CI_REPO_LINK addon
+      - git clone $CI_REPO_CLONE_URL addon
       - cd addon/
       - git checkout $CI_COMMIT_BRANCH
       - git fetch origin $CI_COMMIT_REF
diff --git a/.woodpecker/.releaser.yml b/.woodpecker/.releaser.yml
index 5751f07f..68bdfb21 100644
--- a/.woodpecker/.releaser.yml
+++ b/.woodpecker/.releaser.yml
@@ -19,7 +19,7 @@ pipeline:
     commands:
       - git config --global user.email "no-reply@friendi.ca"
       - git config --global user.name "Friendica"
-      - git clone $CI_REPO_LINK addon
+      - git clone $CI_REPO_CLONE_URL addon
       - cd addon/
       - git checkout $CI_COMMIT_BRANCH
       - git fetch origin $CI_COMMIT_REF

From 3bdbcd3b0248dd9a6f6fa277db14f1935a1a690b Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Fri, 22 Mar 2024 15:53:47 +0100
Subject: [PATCH 069/294] [Hotfix] Fix REPO_URL for woodpecker

---
 .woodpecker/.code_standards_check.yml  | 2 +-
 .woodpecker/.continuous-deployment.yml | 2 +-
 .woodpecker/.messages.po_check.yml     | 2 +-
 .woodpecker/.phpunit.yml               | 2 +-
 .woodpecker/.releaser.yml              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.woodpecker/.code_standards_check.yml b/.woodpecker/.code_standards_check.yml
index 9d59dc08..8e0f7dc7 100644
--- a/.woodpecker/.code_standards_check.yml
+++ b/.woodpecker/.code_standards_check.yml
@@ -13,7 +13,7 @@ pipeline:
     commands:
       - git config --global user.email "no-reply@friendi.ca"
       - git config --global user.name "Friendica"
-      - git clone $CI_REPO_LINK addon
+      - git clone $CI_REPO_CLONE_URL addon
       - cd addon/
       - git checkout $CI_COMMIT_BRANCH
       - git fetch origin $CI_COMMIT_REF
diff --git a/.woodpecker/.continuous-deployment.yml b/.woodpecker/.continuous-deployment.yml
index 3756a8bf..d1202978 100644
--- a/.woodpecker/.continuous-deployment.yml
+++ b/.woodpecker/.continuous-deployment.yml
@@ -20,7 +20,7 @@ pipeline:
     commands:
       - git config --global user.email "no-reply@friendi.ca"
       - git config --global user.name "Friendica"
-      - git clone $CI_REPO_LINK addon
+      - git clone $CI_REPO_CLONE_URL addon
       - cd addon/
       - git checkout $CI_COMMIT_BRANCH
       - git fetch origin $CI_COMMIT_REF
diff --git a/.woodpecker/.messages.po_check.yml b/.woodpecker/.messages.po_check.yml
index f5691e00..ea9fa4d5 100644
--- a/.woodpecker/.messages.po_check.yml
+++ b/.woodpecker/.messages.po_check.yml
@@ -13,7 +13,7 @@ pipeline:
     commands:
       - git config --global user.email "no-reply@friendi.ca"
       - git config --global user.name "Friendica"
-      - git clone $CI_REPO_LINK addon
+      - git clone $CI_REPO_CLONE_URL addon
       - cd addon/
       - git checkout $CI_COMMIT_BRANCH
       - git fetch origin $CI_COMMIT_REF
diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml
index 1e6189d3..0c25a2bd 100644
--- a/.woodpecker/.phpunit.yml
+++ b/.woodpecker/.phpunit.yml
@@ -28,7 +28,7 @@ pipeline:
     commands:
       - git config --global user.email "no-reply@friendi.ca"
       - git config --global user.name "Friendica"
-      - git clone $CI_REPO_LINK addon
+      - git clone $CI_REPO_CLONE_URL addon
       - cd addon/
       - git checkout $CI_COMMIT_BRANCH
       - git fetch origin $CI_COMMIT_REF
diff --git a/.woodpecker/.releaser.yml b/.woodpecker/.releaser.yml
index 5751f07f..68bdfb21 100644
--- a/.woodpecker/.releaser.yml
+++ b/.woodpecker/.releaser.yml
@@ -19,7 +19,7 @@ pipeline:
     commands:
       - git config --global user.email "no-reply@friendi.ca"
       - git config --global user.name "Friendica"
-      - git clone $CI_REPO_LINK addon
+      - git clone $CI_REPO_CLONE_URL addon
       - cd addon/
       - git checkout $CI_COMMIT_BRANCH
       - git fetch origin $CI_COMMIT_REF

From 340f5e627c85c29fceebe5a6bff2fa373f29d07d Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 23 Mar 2024 06:59:13 +0000
Subject: [PATCH 070/294] Bluesky: Added support for sensitive posts

---
 bluesky/bluesky.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 2cd2d263..4a1f4f60 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1222,6 +1222,17 @@ function bluesky_get_header(stdClass $post, string $uri, int $uid, int $fetch_ui
 		$item['post-reason'] = Item::PR_FOLLOWER;
 	}
 
+	if (!empty($post->labels)) {
+		foreach ($post->labels as $label) {
+			// Only flag posts as sensitive based on labels that had been provided by the author.
+			// When "ver" is set to "1" it was flagged by some automated process.
+			if (empty($label->ver)) {
+				$item['sensitive'] = true;
+				Logger::debug('Sensitive content', ['uri-id' => $item['uri-id'], 'label' => $label]);
+			}
+		}
+	}
+
 	return $item;
 }
 

From 9627e95b1964a23f833ee3efb6b81810bc040240 Mon Sep 17 00:00:00 2001
From: loma-one <loma-one@noreply.git.friendi.ca>
Date: Sun, 14 Apr 2024 19:45:06 +0200
Subject: [PATCH 071/294] invidious/invidious.php aktualisiert

Now intercepts YouTube links without a leading "www".
---
 invidious/invidious.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/invidious/invidious.php b/invidious/invidious.php
index 1078d26d..6ae9bc78 100644
--- a/invidious/invidious.php
+++ b/invidious/invidious.php
@@ -2,7 +2,7 @@
 /*
  * Name: invidious
  * Description: Replaces links to youtube.com to an invidious instance in all displays of postings on a node.
- * Version: 0.3
+ * Version: 0.4
  * Author: Matthias Ebers <https://loma.ml/profile/feb>
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  * Status: Unsupported
@@ -96,6 +96,9 @@ function invidious_render(array &$b)
 	$b['html'] = preg_replace("/https?:\/\/www.youtube.com\/watch\?v\=(.*?)/ism", $server . '/watch?v=$1', $b['html']);
 	$b['html'] = preg_replace("/https?:\/\/www.youtube.com\/embed\/(.*?)/ism", $server . '/embed/$1', $b['html']);
 	$b['html'] = preg_replace("/https?:\/\/www.youtube.com\/shorts\/(.*?)/ism", $server . '/shorts/$1', $b['html']);
+	$b['html'] = preg_replace("/https?:\/\/youtube.com\/watch\?v\=(.*?)/ism", $server . '/watch?v=$1', $b['html']);
+	$b['html'] = preg_replace("/https?:\/\/youtube.com\/embed\/(.*?)/ism", $server . '/embed/$1', $b['html']);
+	$b['html'] = preg_replace("/https?:\/\/youtube.com\/shorts\/(.*?)/ism", $server . '/shorts/$1', $b['html']);
 	$b['html'] = preg_replace("/https?:\/\/youtu.be\/(.*?)/ism", $server . '/watch?v=$1', $b['html']);
 
 	if ($original != $b['html']) {

From 3bf547ee6e778fff9137bd9fc11a8f2dd6ec8d39 Mon Sep 17 00:00:00 2001
From: loma-one <loma-one@noreply.git.friendi.ca>
Date: Mon, 15 Apr 2024 06:02:58 +0200
Subject: [PATCH 072/294] invidious/invidious.php aktualisiert

Note taken from @MrPetovan
---
 invidious/invidious.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/invidious/invidious.php b/invidious/invidious.php
index 6ae9bc78..7153aab9 100644
--- a/invidious/invidious.php
+++ b/invidious/invidious.php
@@ -93,12 +93,9 @@ function invidious_render(array &$b)
 	$original = $b['html'];
 	$server   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'invidious', 'server', DI::config()->get('invidious', 'server', INVIDIOUS_DEFAULT));
 
-	$b['html'] = preg_replace("/https?:\/\/www.youtube.com\/watch\?v\=(.*?)/ism", $server . '/watch?v=$1', $b['html']);
-	$b['html'] = preg_replace("/https?:\/\/www.youtube.com\/embed\/(.*?)/ism", $server . '/embed/$1', $b['html']);
-	$b['html'] = preg_replace("/https?:\/\/www.youtube.com\/shorts\/(.*?)/ism", $server . '/shorts/$1', $b['html']);
-	$b['html'] = preg_replace("/https?:\/\/youtube.com\/watch\?v\=(.*?)/ism", $server . '/watch?v=$1', $b['html']);
-	$b['html'] = preg_replace("/https?:\/\/youtube.com\/embed\/(.*?)/ism", $server . '/embed/$1', $b['html']);
-	$b['html'] = preg_replace("/https?:\/\/youtube.com\/shorts\/(.*?)/ism", $server . '/shorts/$1', $b['html']);
+	$b['html'] = preg_replace("~https?://(?:www\.)?youtube\.com/watch\?v=(.*?)~ism", $server . '/watch?v=$1', $b['html']);
+	$b['html'] = preg_replace("~https?://(?:www\.)?youtube\.com/embed/(.*?)~ism", $server . '/embed/$1', $b['html']);
+	$b['html'] = preg_replace("~https?://(?:www\.)?youtube\.com/shorts/(.*?)~ism", $server . '/shorts/$1', $b['html']);
 	$b['html'] = preg_replace("/https?:\/\/youtu.be\/(.*?)/ism", $server . '/watch?v=$1', $b['html']);
 
 	if ($original != $b['html']) {

From 9c6a86ffaa569ed4e1b059ca9f2c13c1b5807cdd Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 15 Apr 2024 19:34:07 +0000
Subject: [PATCH 073/294] Proxify functionality is removed

---
 curweather/curweather.php                     | 4 +---
 mastodoncustomemojis/mastodoncustomemojis.php | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/curweather/curweather.php b/curweather/curweather.php
index f614840a..5a14a9cf 100644
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -9,12 +9,10 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Util\Proxy as ProxyUtils;
 
 function curweather_install()
 {
@@ -127,7 +125,7 @@ function curweather_network_mod_init(string &$body)
 		$t = Renderer::getMarkupTemplate("widget.tpl", "addon/curweather/" );
 		$curweather = Renderer::replaceMacros($t, [
 			'$title' => DI::l10n()->t("Current Weather"),
-			'$icon' => ProxyUtils::proxifyUrl('http://openweathermap.org/img/w/'.$res['icon'].'.png'),
+			'$icon' => 'http://openweathermap.org/img/w/'.$res['icon'].'.png',
 			'$city' => $res['city'],
 			'$lon' => $res['lon'],
 			'$lat' => $res['lat'],
diff --git a/mastodoncustomemojis/mastodoncustomemojis.php b/mastodoncustomemojis/mastodoncustomemojis.php
index f67054a1..561262f1 100644
--- a/mastodoncustomemojis/mastodoncustomemojis.php
+++ b/mastodoncustomemojis/mastodoncustomemojis.php
@@ -15,7 +15,6 @@ use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Hook;
 use Friendica\Core\Protocol;
 use Friendica\DI;
-use Friendica\Util\Proxy as ProxyUtils;
 
 function mastodoncustomemojis_install()
 {
@@ -88,7 +87,7 @@ function mastodoncustomemojis_fetch_custom_emojis_for_url($api_base_url)
 			foreach ($emojis_array as $emoji) {
 				if (!empty($emoji['shortcode']) && !empty($emoji['static_url'])) {
 					$return['texts'][] = ':' . $emoji['shortcode'] . ':';
-					$return['icons'][] = '<img class="emoji mastodon" src="' . ProxyUtils::proxifyUrl($emoji['static_url']) . '" alt=":' . $emoji['shortcode'] . ':" title=":' . $emoji['shortcode'] . ':"/>';
+					$return['icons'][] = '<img class="emoji mastodon" src="' . $emoji['static_url'] . '" alt=":' . $emoji['shortcode'] . ':" title=":' . $emoji['shortcode'] . ':"/>';
 				}
 			}
 		}

From dc7a8adf292f3ebd83a70470056b5f9f06e13856 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 16 Apr 2024 04:43:54 +0000
Subject: [PATCH 074/294] Issue 13812: Public groups with manual request
 approval

---
 forumdirectory/forumdirectory.php | 8 ++++----
 groupdirectory/groupdirectory.php | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index 79267c4e..114da1da 100644
--- a/forumdirectory/forumdirectory.php
+++ b/forumdirectory/forumdirectory.php
@@ -104,8 +104,8 @@ function forumdirectory_content()
 	$total = 0;
 	$cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total` FROM `profile`
 				INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
-				WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` = ? $sql_extra",
-				User::PAGE_FLAGS_COMMUNITY);
+				WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` IN (?, ?) $sql_extra",
+				User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_COMM_MAN);
 	if (DBA::isResult($cnt)) {
 		$total = $cnt['total'];
 	}
@@ -120,8 +120,8 @@ function forumdirectory_content()
 			`contact`.`addr`, `contact`.`url` FROM `profile`
 			INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
 			INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid`
-			WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` = ? AND `contact`.`self`
-			$sql_extra $order LIMIT $limit", User::PAGE_FLAGS_COMMUNITY
+			WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` IN (?, ?) AND `contact`.`self`
+			$sql_extra $order LIMIT $limit", User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_COMM_MAN
 	);
 
 	if (DBA::isResult($r)) {
diff --git a/groupdirectory/groupdirectory.php b/groupdirectory/groupdirectory.php
index 7bad1ef9..6d562cdc 100644
--- a/groupdirectory/groupdirectory.php
+++ b/groupdirectory/groupdirectory.php
@@ -101,8 +101,8 @@ function groupdirectory_content()
 	$total = 0;
 	$cnt   = DBA::fetchFirst("SELECT COUNT(*) AS `total` FROM `profile`
 				INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
-				WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` = ? $sql_extra",
-		User::PAGE_FLAGS_COMMUNITY);
+				WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` IN (?, ?) $sql_extra",
+		User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_COMM_MAN);
 	if (DBA::isResult($cnt)) {
 		$total = $cnt['total'];
 	}
@@ -117,8 +117,8 @@ function groupdirectory_content()
 			`contact`.`addr`, `contact`.`url` FROM `profile`
 			INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
 			INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid`
-			WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` = ? AND `contact`.`self`
-			$sql_extra $order LIMIT $limit", User::PAGE_FLAGS_COMMUNITY
+			WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` IN (?, ?)  AND `contact`.`self`
+			$sql_extra $order LIMIT $limit", User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_COMM_MAN
 	);
 
 	if (DBA::isResult($r)) {

From b9d0cece0a64c41da428694df74ea9d49726ac4b Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 28 Apr 2024 10:36:47 +0000
Subject: [PATCH 075/294] Bluesky: Improved fetching of the user DID

---
 bluesky/bluesky.php | 67 +++++++++++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 26 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 4a1f4f60..3e658bef 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -97,7 +97,7 @@ function bluesky_load_config(ConfigFileManager $loader)
 
 function bluesky_check_item_notification(array &$notification_data)
 {
-	$did = DI::pConfig()->get($notification_data['uid'], 'bluesky', 'did');
+	$did = bluesky_get_user_did($notification_data['uid']);
 
 	if (!empty($did)) {
 		$notification_data['profiles'][] = $did;
@@ -342,7 +342,7 @@ function bluesky_settings(array &$data)
 	$def_enabled   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default') ?? false;
 	$pds           = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'pds');
 	$handle        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'handle');
-	$did           = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'did');
+	$did           = bluesky_get_user_did(DI::userSession()->getLocalUserId());
 	$token         = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'access_token');
 	$import        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'import') ?? false;
 	$import_feeds  = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'import_feeds') ?? false;
@@ -438,15 +438,7 @@ function bluesky_settings_post(array &$b)
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'friendica_handle', intval($_POST['bluesky_friendica_handle']));
 
 	if (!empty($handle)) {
-		if (empty($old_did) || $old_handle != $handle) {
-			$did = bluesky_get_did(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'handle'));
-			if (empty($did)) {
-				DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'status', BLUEKSY_STATUS_DID_FAIL);
-			}
-			DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'did', $did);
-		} else {
-			$did = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'did');
-		}
+		$did = bluesky_get_user_did(DI::userSession()->getLocalUserId(), empty($old_did) || $old_handle != $handle);
 		if (!empty($did) && (empty($old_pds) || $old_handle != $handle)) {
 			$pds = bluesky_get_pds($did);
 			if (empty($pds)) {
@@ -664,7 +656,7 @@ function bluesky_create_activity(array $item, stdClass $parent = null)
 		return;
 	}
 
-	$did  = DI::pConfig()->get($uid, 'bluesky', 'did');
+	$did = bluesky_get_user_did($uid);
 
 	if ($item['verb'] == Activity::LIKE) {
 		$record = [
@@ -724,7 +716,7 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
 			$item['body'] .= "\n[url]" . $media['url'] . "[/url]\n";
 		}
 	}
-	
+
 	if (!empty($item['quote-uri-id'])) {
 		$quote = Post::selectFirstPost(['uri', 'plink'], ['uri-id' => $item['quote-uri-id']]);
 		if (!empty($quote)) {
@@ -733,7 +725,7 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
 			}
 		}
 	}
-	
+
 	$urls = bluesky_get_urls($item['body']);
 	$item['body'] = $urls['body'];
 
@@ -1242,7 +1234,7 @@ function bluesky_get_restrictions_for_user(stdClass $post, array $item, int $pos
 		return Item::CANT_REPLY;
 	}
 
-	if(empty($post->threadgate)) {
+	if (empty($post->threadgate)) {
 		return null;
 	}
 
@@ -1725,7 +1717,7 @@ function bluesky_get_did_by_wellknown(string $handle): string
 	if ($curlResult->isSuccess() && substr($curlResult->getBodyString(), 0, 4) == 'did:') {
 		$did = $curlResult->getBodyString();
 		if (!bluesky_valid_did($did, $handle)) {
-			Logger::notice('Invalid DID', ['handle' => $handle, 'did' => $did]);	
+			Logger::notice('Invalid DID', ['handle' => $handle, 'did' => $did]);
 			return '';
 		}
 		Logger::debug('Got DID by wellknown', ['handle' => $handle, 'did' => $did]);
@@ -1744,7 +1736,7 @@ function bluesky_get_did_by_dns(string $handle): string
 		if (!empty($record['txt']) && substr($record['txt'], 0, 4) == 'did=') {
 			$did = substr($record['txt'], 4);
 			if (!bluesky_valid_did($did, $handle)) {
-				Logger::notice('Invalid DID', ['handle' => $handle, 'did' => $did]);	
+				Logger::notice('Invalid DID', ['handle' => $handle, 'did' => $did]);
 				return '';
 			}
 			Logger::debug('Got DID by DNS', ['handle' => $handle, 'did' => $did]);
@@ -1761,12 +1753,12 @@ function bluesky_get_did(string $handle): string
 	//if ($did != '') {
 	//	return $did;
 	//}
-	
+
 	//$did = bluesky_get_did_by_wellknown($handle);
 	//if ($did != '') {
 	//	return $did;
 	//}
-	
+
 	$data = bluesky_get(BLUESKY_PDS . '/xrpc/com.atproto.identity.resolveHandle?handle=' . urlencode($handle));
 	if (empty($data) || empty($data->did)) {
 		return '';
@@ -1775,18 +1767,41 @@ function bluesky_get_did(string $handle): string
 	return $data->did;
 }
 
+function bluesky_get_user_did(int $uid, bool $refresh = false): string
+{
+	if (!$refresh) {
+		$did = DI::pConfig()->get($uid, 'bluesky', 'did');
+		if (!empty($did)) {
+			return $did;
+		}
+	}
+
+	$handle = DI::pConfig()->get($uid, 'bluesky', 'handle');
+	$did    = bluesky_get_did($handle);
+	if (empty($did)) {
+		Logger::notice('Error fetching DID for handle', ['uid' => $uid, 'handle' => $handle]);
+		DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_DID_FAIL);
+	}
+	Logger::debug('Got DID for user', ['uid' => $uid, 'handle' => $handle, 'did' => $did]);
+	DI::pConfig()->set($uid, 'bluesky', 'did', $did);
+	return $did;
+}
+
 function bluesky_get_user_pds(int $uid): string
 {
 	$pds = DI::pConfig()->get($uid, 'bluesky', 'pds');
 	if (!empty($pds)) {
 		return $pds;
 	}
-	$did = DI::pConfig()->get($uid, 'bluesky', 'did');
-	if (empty($did)) {
+	$did = bluesky_get_user_did($uid);
+	if (!empty($did)) {
+		$pds = bluesky_get_pds($did);
+	} else {
 		Logger::notice('Empty did for user', ['uid' => $uid]);
-		return '';
 	}
-	$pds = bluesky_get_pds($did);
+	if (empty($pds)) {
+		return BLUESKY_PDS;
+	}
 	DI::pConfig()->set($uid, 'bluesky', 'pds', $pds);
 	return $pds;
 }
@@ -1849,7 +1864,7 @@ function bluesky_refresh_token(int $uid): string
 
 function bluesky_create_token(int $uid, string $password): string
 {
-	$did = DI::pConfig()->get($uid, 'bluesky', 'did');
+	$did = bluesky_get_user_did($uid);
 
 	$data = bluesky_post($uid, '/xrpc/com.atproto.server.createSession', json_encode(['identifier' => $did, 'password' => $password]), ['Content-type' => 'application/json']);
 	if (empty($data)) {
@@ -1906,12 +1921,12 @@ function bluesky_get(string $url, string $accept_content = HttpClientAccept::DEF
 	try {
 		$curlResult = DI::httpClient()->get($url, $accept_content, $opts);
 	} catch (\Exception $e) {
-		Logger::notice('Exception on get', ['exception' => $e]);
+		Logger::notice('Exception on get', ['url' => $url, 'exception' => $e]);
 		return null;
 	}
 
 	if (!$curlResult->isSuccess()) {
-		Logger::notice('API Error', ['error' => json_decode($curlResult->getBodyString()) ?: $curlResult->getBodyString()]);
+		Logger::notice('API Error', ['url' => $url, 'error' => json_decode($curlResult->getBodyString()) ?: $curlResult->getBodyString()]);
 		return null;
 	}
 

From 6c76139ce179470a9d9ff1b9fe098c0ab9c4bab3 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 3 May 2024 02:58:45 +0000
Subject: [PATCH 076/294] Bluesky: Fixes "bluesky_get_did(): Argument #1
 ($handle) must be of type string, null given"

---
 bluesky/bluesky.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 3e658bef..7577948a 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -97,6 +97,10 @@ function bluesky_load_config(ConfigFileManager $loader)
 
 function bluesky_check_item_notification(array &$notification_data)
 {
+	if (empty($notification_data['uid'])) {
+		return;
+	}
+
 	$did = bluesky_get_user_did($notification_data['uid']);
 
 	if (!empty($did)) {

From 85d254f2f8e0afda89ce459d7d5c68b4ca9fb2e0 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 4 May 2024 01:00:44 +0000
Subject: [PATCH 077/294] Bluesky: Fix error for missing handles

---
 bluesky/bluesky.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 7577948a..d69a9c41 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1771,7 +1771,7 @@ function bluesky_get_did(string $handle): string
 	return $data->did;
 }
 
-function bluesky_get_user_did(int $uid, bool $refresh = false): string
+function bluesky_get_user_did(int $uid, bool $refresh = false): ?string
 {
 	if (!$refresh) {
 		$did = DI::pConfig()->get($uid, 'bluesky', 'did');
@@ -1781,7 +1781,9 @@ function bluesky_get_user_did(int $uid, bool $refresh = false): string
 	}
 
 	$handle = DI::pConfig()->get($uid, 'bluesky', 'handle');
-	$did    = bluesky_get_did($handle);
+	if (!empty($handle)) {
+		$did = bluesky_get_did($handle);
+	}
 	if (empty($did)) {
 		Logger::notice('Error fetching DID for handle', ['uid' => $uid, 'handle' => $handle]);
 		DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_DID_FAIL);

From 67b464cc47a32a5f51a6b6193bed513e0b16fbb7 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 16 Apr 2024 05:00:23 +0000
Subject: [PATCH 078/294] Blockbot: Reworked user agent parsing

---
 blockbot/blockbot.php        | 771 ++++++++++++++++++++++++++++++-----
 blockbot/lang/C/messages.po  |  41 +-
 blockbot/templates/admin.tpl |   6 +-
 3 files changed, 670 insertions(+), 148 deletions(-)

diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php
index e11f23f7..77886edf 100644
--- a/blockbot/blockbot.php
+++ b/blockbot/blockbot.php
@@ -2,7 +2,7 @@
 /**
  * Name: blockbot
  * Description: Blocking bots based on detecting bots/crawlers/spiders via the user agent and http_from header.
- * Version: 0.2
+ * Version: 1.0
  * Author: Philipp Holzer <admin@philipp.info>
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  *
@@ -13,7 +13,9 @@ use Friendica\DI;
 use Jaybizzle\CrawlerDetect\CrawlerDetect;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
+use Friendica\Core\System;
 use Friendica\Network\HTTPException\ForbiddenException;
+use Friendica\Util\Network;
 
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 
@@ -28,115 +30,123 @@ function blockbot_addon_admin(string &$o)
 
 	$o = Renderer::replaceMacros($t, [
 		'$submit'             => DI::l10n()->t('Save Settings'),
-		'$good_crawlers'      => ['good_crawlers', DI::l10n()->t('Allow "good" crawlers'), DI::config()->get('blockbot', 'good_crawlers'), DI::l10n()->t("Don't block fediverse crawlers, relay servers and other bots with good purposes.")],
-		'$socialmedia_agents' => ['socialmedia_agents', DI::l10n()->t('Allow preview agents'), DI::config()->get('blockbot', 'socialmedia_agents'), DI::l10n()->t("Don't block agents from social media systems that want to generate preview data for links that had been set by their users.")],
+		'$security_checker'   => ['security_checker', DI::l10n()->t('Allow security checkers'), DI::config()->get('blockbot', 'security_checker'), DI::l10n()->t("Don't block security checkers. They can be used for good or bad.")],
 		'$http_libraries'     => ['http_libraries', DI::l10n()->t('Allow generic HTTP libraries'), DI::config()->get('blockbot', 'http_libraries'), DI::l10n()->t("Don't block agents from generic HTTP libraries that could be used for good or for bad and that currently can't be traced back to any known Fediverse project.")],
-		'$block_gab'          => ['block_gab', DI::l10n()->t('Block GabSocial'), DI::config()->get('blockbot', 'block_gab'), DI::l10n()->t('Block the software GabSocial. This will block every access for that software. You can block dedicated gab instances in the blocklist settings in the admin section.')],
 		'$training'           => ['training', DI::l10n()->t('Training mode'), DI::config()->get('blockbot', 'training'), DI::l10n()->t("Activates the training mode. This is only meant for developing purposes. Don't activate this on a production machine. This can cut communication with some systems.")],
 	]);
 }
 
 function blockbot_addon_admin_post()
 {
-	DI::config()->set('blockbot', 'good_crawlers', $_POST['good_crawlers'] ?? false);
-	DI::config()->set('blockbot', 'socialmedia_agents', $_POST['socialmedia_agents'] ?? false);
+	DI::config()->set('blockbot', 'security_checker', $_POST['security_checker'] ?? false);
 	DI::config()->set('blockbot', 'http_libraries', $_POST['http_libraries'] ?? false);
-	DI::config()->set('blockbot', 'block_gab', $_POST['block_gab'] ?? false);
 	DI::config()->set('blockbot', 'training', $_POST['training'] ?? false);
 }
 
+function blockbot_reject()
+{
+	throw new ForbiddenException('Bots are not allowed. If you consider this a mistake, create an issue at https://github.com/friendica/friendica');
+}
+
 function blockbot_init_1()
 {
 	if (empty($_SERVER['HTTP_USER_AGENT'])) {
 		return;
 	}
 
-	$logdata = ['agent' => $_SERVER['HTTP_USER_AGENT'], 'uri' => $_SERVER['REQUEST_URI']];
+	$crawlerDetect = new CrawlerDetect();
 
-	// List of known unwanted crawlers.
-	$agents = [
-		'SemrushBot', 's~feedly-nikon3', 'Qwantify/Bleriot/', 'ltx71', 'Sogou web spider/',
-		'Diffbot/', 'YisouSpider', 'evc-batch/', 'LivelapBot/', 'TrendsmapResolver/',
-		'PaperLiBot/', 'Nuzzel', 'um-LN/', 'Google Favicon', 'Datanyze', 'BLEXBot/', '360Spider',
-		'adscanner/', 'HeadlessChrome', 'wpif', 'startmebot/', 'Googlebot/', 'Applebot/',
-		'GoogleImageProxy', 'bingbot/', 'heritrix/', 'ldspider',
-		'AwarioRssBot/', 'TweetmemeBot/', 'dcrawl/', 'PhantomJS/', 'Googlebot-Image/',
-		'CrowdTanglebot/', 'Mediapartners-Google', 'Baiduspider', 'datagnionbot',
-		'MegaIndex.ru/', 'SMUrlExpander', 'Hatena-Favicon/', 'Wappalyzer', 'FlipboardProxy/',
-		'NetcraftSurveyAgent/', 'Dataprovider.com', 'SMTBot/', 'Nimbostratus-Bot/',
-		'DuckDuckGo-Favicons-Bot/', 'IndieWebCards/', 'proximic', 'netEstate NE Crawler',
-		'AhrefsBot/', 'YandexBot/', 'Exabot/', 'Mediumbot-MetaTagFetcher/',
-		'SurdotlyBot/', 'BingPreview/', 'SabsimBot/', 'CCBot/', 'WbSrch/',
-		'DuckDuckBot-Https/', 'HTTP Banner Detection', 'YandexImages/', 'archive.org_bot',
-		'ArchiveTeam ArchiveBot/', 'yacybot', 'https://developers.google.com/+/web/snippet/',
-		'Scrapy/', 'MJ12bot/', 'DotBot/', 'Pinterestbot/', 'Jooblebot/',
-		'Cliqzbot/', 'YaK/', 'Mediatoolkitbot', 'Snacktory', 'FunWebProducts', 'oBot/',
-		'7Siters/', 'KOCMOHABT', 'Google-SearchByImage', 'FemtosearchBot/',
-		'HubSpot Crawler', 'DomainStatsBot/', 'Re-re Studio', 'AwarioSmartBot/',
-		'DNSResearchBot/', 'PetalBot;', 'Nmap Scripting Engine;',
-		'Google-Apps-Script; beanserver;', 'woorankreview/', 'Seekport Crawler;', 'AHC/',
-		'Semanticbot/', 'XoviOnpageCrawler;', 'Pinterest/',
-		'GetHPinfo.com-Bot/', 'BoardReader Favicon Fetcher', 'Google-Adwords-Instant', 'newspaper/',
-		'YurichevBot/', 'Crawling at Home Project', 'InfoTigerBot/', 'AdIdxBot/',
-		'MicrosoftPreview/', 'masscan/', 'Timpibot/', 'everyfeed-spider/', 'AndroidDownloadManager/',
-		'WebZIP/', 'WDG_Validator/', 'Screaming Frog SEO Spider/', ' Bytespider;', 'ISSCyberRiskCrawler/',
-		'BitSightBot/', 'ev-crawler/', 'CensysInspect/1.1', 'Protopage/', 'Gaisbot/', 'WellKnownBot/',
-		'SuperBot/', 'Googlebot-Mobile/', 'GPTBot/', 'GenomeCrawlerd/', '2ip bot/', 'Ocarinabot',
-		'Yahoo! Slurp;', 'AdsBot-Google', 'Gregarius/', 'FAST-WebCrawler/', 'Xenu Link Sleuth/',
-		'Ask Jeeves', 'alexa site audit/', 'Yahoo! Slurp China;', 'Microsoft URL Control',
-		'Facebot', 'Googlebot-Video/', 'msnbot/', 'Offline Explorer/', 'YandexNews/', 'msnbot-media/',
-		'EmailWolf', 'Download Demon/', 'FeedFetcher-Google;', 'WebCopier', '+ONB_Bot_Btrix',
-		'scoopit-crawler/', 'ia_archiver', 'Quora-Bot/', 'WebwikiBot/', 'FullStoryBot/',
-		'wpbot/', 'SearchExpress', 'DuckDuckBot/', 'Google Web Preview',
-	];
+	$isCrawler = $crawlerDetect->isCrawler();
 
-	if (DI::config()->get('blockbot', 'block_gab')) {
-		$agents[] = 'GabSocial/';
+	blockbot_save('all-agents', $_SERVER['HTTP_USER_AGENT']);
+
+	$parts = blockbot_get_parts($_SERVER['HTTP_USER_AGENT']);
+
+	$logdata = ['isCrawler' => $isCrawler, 'agent' => $_SERVER['HTTP_USER_AGENT'], 'uri' => $_SERVER['REQUEST_URI'], 'parts' => $parts];
+
+	if ($isCrawler) {
+		blockbot_check_login_attempt($_SERVER['REQUEST_URI'], $logdata);
 	}
 
-	// List of "good" crawlers, mostly from the fediverse.
-	$good_agents = [
-		'fediverse.space crawler', 'fediverse.network crawler', 'Active_Pods_CheckBot_3.0',
-		'Social-Relay/', 'Test Certificate Info', 'Uptimebot/', 'GNUSocialBot', 'UptimeRobot/',
-		'PTST/', 'Zabbix', 'Poduptime/', 'FediFetcher', 'lemmy-stats-crawler',
-		'FedditLemmyverseCrawler/', 'lemmy-explorer-crawler/', 'URIports Validator',
-		'rss-is-dead.lol web bot;', 'fedistatsCrawler/', 'W3C_CSS_Validator_JFouffa/',
-		'IABot/', 'Slackbot 1', 'BeeperBot/', 'Matrix-Media-Repo/', 'P3P Validator',
-		'KeybaseBot;',
-	];
-
-	if (!DI::config()->get('blockbot', 'good_crawlers')) {
-		$agents = array_merge($agents, $good_agents);
-	} elseif (blockbot_match($good_agents)) {
+	if (empty($parts)) {
+		Logger::debug('Known frontend found', $logdata);
+		if ($isCrawler) {
+			blockbot_save('badly-parsed-agents', $_SERVER['HTTP_USER_AGENT']);
+		}
 		return;
 	}
 
-	// List of agents from social media systems that fetch preview data via opem graph or twitter cards.
-	$socialmedia_agents = ['Twitterbot', 'facebookexternalhit/', 'SkypeUriPreview Preview/',
-		'TelegramBot', 'WhatsApp/', 'github-camo', 'Bluesky Cardyb/', 'XING-contenttabreceiver/', 
-		'LinkedInBot/', 'Instagram ', 'Synapse (bot; ', 'Discordbot/', 'SummalyBot/',
-		'Slackbot-LinkExpanding', 'Slack-ImgProxy', 'Iframely/',
-	];
-
-	if (!DI::config()->get('blockbot', 'socialmedia_agents')) {
-		$agents = array_merge($agents, $socialmedia_agents);
-	} elseif (blockbot_match($socialmedia_agents)) {
-		return;
+	if (blockbot_is_crawler($parts)) {
+		Logger::debug('Crawler found', $logdata);
+		blockbot_reject();
 	}
-	
-	// HTTP Libraries
-	$http_libraries = ['ReactorNetty/', 'GuzzleHttp/', 'Embed PHP library', 'python-urllib3/',
-		'EventMachine HttpClient', 'HTMLParser/'
-	];
 
-	if (!DI::config()->get('blockbot', 'http_libraries')) {
-		$agents = array_merge($agents, $http_libraries);
-	} elseif (blockbot_match($http_libraries)) {
+	if (blockbot_is_searchbot($parts)) {
+		Logger::debug('Search bot found', $logdata);
+		blockbot_reject();
+	}
+
+	if (blockbot_is_unwanted($parts)) {
+		Logger::debug('Uncategorized unwanted agent found', $logdata);
+		blockbot_reject();
+	}
+
+	if (blockbot_is_security_checker($parts)) {
+		Logger::debug('Security checker found', $logdata);
+		if (!DI::config()->get('blockbot', 'security_checker')) {
+			blockbot_reject();
+		}
 		return;
 	}
 
-	if (blockbot_match($agents)) {
-		throw new ForbiddenException('Bots are not allowed. If you consider this a mistake, create an issue at https://github.com/friendica/friendica');
+	if (blockbot_is_social_media($parts)) {
+		Logger::debug('Social media service found', $logdata);
+		return;
+	}
+
+	if (blockbot_is_fediverse_client($parts)) {
+		Logger::debug('Fediverse client found', $logdata);
+		return;
+	}
+
+	if (blockbot_is_feed_reader($parts)) {
+		Logger::debug('Feed reader found', $logdata);
+		return;
+	}
+
+	if (blockbot_is_fediverse_tool($parts)) {
+		Logger::debug('Fediverse tool found', $logdata);
+		return;
+	}
+
+	if (blockbot_is_service_agent($parts)) {
+		Logger::debug('Service agent found', $logdata);
+		return;
+	}
+
+	if (blockbot_is_monitor($parts)) {
+		Logger::debug('Monitoring service found', $logdata);
+		return;
+	}
+
+	if (blockbot_is_validator($parts)) {
+		Logger::debug('Validation service found', $logdata);
+		return;
+	}
+
+	if (blockbot_is_good_tool($parts)) {
+		Logger::debug('Uncategorized helpful service found', $logdata);
+		return;
+	}
+
+	// Needs to be checked at the end, since other services might use these libraries
+	if (blockbot_is_http_library($parts)) {
+		blockbot_check_login_attempt($_SERVER['REQUEST_URI'], $logdata);
+		Logger::debug('HTTP Library found', $logdata);
+		if (!DI::config()->get('blockbot', 'http_libraries')) {
+			blockbot_reject();
+		}
+		return;
 	}
 
 	// This switch here is only meant for developers who want to add more bots to the list above, it is not safe for production.
@@ -144,44 +154,581 @@ function blockbot_init_1()
 		return;
 	}
 
-	$crawlerDetect = new CrawlerDetect();
-
-	if (!$crawlerDetect->isCrawler()) {
-		logger::debug('Good user agent detected', $logdata);
+	if (!$isCrawler) {
+		blockbot_save('good-agents', $_SERVER['HTTP_USER_AGENT']);
+		Logger::debug('Non-bot user agent detected', $logdata);
 		return;
 	}
 
-	// List of known "good" agents, mostly used by Fediverse systems, feed readers, ...
-	$agents = [
-		'curl', 'zgrab', 'Go-http-client', 'curb', 'github.com', 'reqwest', 'Feedly/',
-		'Python-urllib/', 'Liferea/', 'aiohttp/', 'WordPress.com Reader', 'hackney/',
-		'Faraday v', 'okhttp', 'UniversalFeedParser', 'PixelFedBot', 'python-requests',
-		'WordPress/', 'http.rb/', 'Apache-HttpClient/', 'WordPress.com;', 'Pleroma',
-		'Dispatch/', 'Ruby', 'Java/', 'libwww-perl/', 'Mastodon/', 'FeedlyApp/',
-		'lua-resty-http/', 'Tiny Tiny RSS/', 'Wget/', 'PostmanRuntime/',
-		'W3C_Validator/', 'NetNewsWire', 'FeedValidator/', 'theoldreader.com', 'axios/',
-		'Paw/', 'PeerTube/', 'fedi.inex.dev', 'FediDB/', 'index.community crawler',
-		'Slackbot-LinkExpanding', 'Firefish/', 'Takahe/', 'Akkoma ', 'Misskey/', 'Lynx/',
-		'camo-rs asset proxy', 'gotosocial/', 'incestoma ', 'SpaceCowboys Android RSS Reader',
-		'NewsBlur Feed Finder', 'Lemmy/', 'enby-town/', 'rss2tg bot;', '; HTTrack ',
-		'MbinBot', 'kbinBot', 'Pixelfed/', 'NewsBlur Feed Fetcher', 'NewsBlur Page Fetcher',
-	];
-
-	if (blockbot_match($agents)) {
-		logger::info('False positive', $logdata);
-		return;
-	}
-
-	logger::notice('Blocked bot', $logdata);
-	throw new ForbiddenException('Bots are not allowed. If you consider this a mistake, create an issue at https://github.com/friendica/friendica');
+	blockbot_save('bad-agents', $_SERVER['HTTP_USER_AGENT']);
+	Logger::notice('Blocked bot', $logdata);
+	blockbot_reject();
 }
 
-function blockbot_match(array $agents)
+function blockbot_save($database, $userAgent)
 {
-	foreach ($agents as $agent) {
-		if (stristr($_SERVER['HTTP_USER_AGENT'], $agent)) {
+	if (!DI::config()->get('blockbot', 'training') || !function_exists('dba_open')) {
+		return;
+	}
+
+	$resource = dba_open(System::getTempPath() . '/' . $database, 'cl');
+	$result = dba_fetch($userAgent, $resource);
+	if ($result === false) {
+		dba_insert($userAgent, true, $resource);
+	}
+	dba_close($resource);
+}
+
+function blockbot_check_login_attempt(string $url, array $logdata)
+{
+	if (in_array(trim(parse_url($url, PHP_URL_PATH), '/'), ['login', 'lostpass', 'register'])) {
+		Logger::debug('Login attempt detected', $logdata);
+		blockbot_reject();
+	}
+}
+
+/**
+ * Uncategorized and unwanted services
+ *
+ * @param array $parts
+ * @return boolean
+ */
+function blockbot_is_unwanted(array $parts): bool
+{
+	$agents = [
+		'oii-research', 'yisouspider', 'bots.retroverse.social', 'gaisbot', 'bloglines', 'emailwolf',
+		'webtech', 'facebookscraper', 'www.ecsl.cs.sunysb.edu/~maxim/cgi-bin/link',
+		'gulper', 'magellan', 'linkcheck', 'nerdybot',  'ms search robot', 'fast-webcrawler',
+		'yioopbot', 'webster', 'www.admantx.com', 'openhosebot', 'lssrocketcrawler', 'dow jones searchbot',
+		'gomezagent', 'domainsigmacrawler', 'netseer crawler', 'gptbot', 'superbot', 'searchexpress',
+		'alittle client', 'amazon-kendra', 'scanner.ducks.party', 'isscyberriskcrawler',
+		'google wireless transcoder',
+	];
+
+	foreach ($parts as $part) {
+		if (in_array($part, $agents)) {
 			return true;
 		}
 	}
 	return false;
-}
\ No newline at end of file
+}
+
+/**
+ * Services defined as "crawlers"
+ *
+ * @param array $parts
+ * @return boolean
+ */
+function blockbot_is_crawler(array $parts): bool
+{
+	$agents = [
+		'ahrefsbot', 'pinterest', 'proximic', 'applebot', 'synapseworkstation.3.2.1',
+		'slackbot-linkexpanding', 'semrushbot-sa', 'qwantify', 'google search console',
+		'tbot-nutch', 'screaming frog seo spider', 'exaleadcloudview', 'dotbot', 'exabot',
+		'spbot', 'surdotlybot', 'tweetmemebot', 'cliqzbot', 'startmebot', 'ccbot', 'zoombot',
+		'domain re-animator bot', 'nutch', 'archive.org_bot http://www.archive.org/details',
+		'yahoo link preview', 'mxt', 'grapeshotcrawler', 'maxpointcrawler', 'vagabondo',
+		'archive.org_bot', 'infegyatlas', '2ip bot', 'accompanybot', 'antbot', 'anthropic-ai',
+		'aspiegelbot', 'cispa web analyzer', 'claudebot', 'colly', 'petalbot', 'ioncrawl',
+		'embedly +support@embed.ly', 'gitcrawlerbot', 'google favicon', 'httpx', 'seokicks',
+		'kocmohabt', 'masscan-ng', 'mixnodecache', 'nicecrawler', 'birdcrawlerbot', 'seolyt',
+		'dataprovider.com', 'dnsresearchbot', 'domains project', 'evc-batch', 'ev-crawler',
+		'example3', 'geedobot', 'internetmeasurement', 'ips-agent', 'semanticscholarbot',
+		'sputnikfaviconbot', 't3versionsbot', 'tchelebi', 'thinkchaos', 'velenpublicwebcrawler',
+		'webwikibot', 'woobot', 'project-resonance', 'mtrobot', 'webprosbot', 'youbot',
+		'queryseekerspider', 'scanning for research', 'semrushbot', 'senutobot', 'spawning-ai',
+		'statista.com publication finder crawler', 'turnitin', 'who.is bot', 'zaldamosearchbot',
+		'nuzzel', 'boardreader blog indexer', 'hatena-favicon', 'nbertaupete95', 'scrapy',
+		"electronic frontier foundation's do not track verifier", 'synapse', 'trendsmapresolver',
+		'pinterestbot', 'um-ln', 'slack-imgproxy', 'diffbot', 'dataforseobot', 'bw', 'bitlybot',
+		'twingly recon-klondike', 'imagesiftbot', 'google', 'rogerbot', 'yahoocachesystem',
+		'vkshare', 'appid: s~virustotalcloud', 'clickagy intelligence bot v2',
+	];
+
+	foreach ($parts as $part) {
+		if (substr($part, -13) == ' accompanybot') {
+			return true;
+		}
+
+		if (in_array($part, $agents)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * Services defined as search bots
+ *
+ * @param array $parts
+ * @return boolean
+ */
+function blockbot_is_searchbot(array $parts): bool
+{
+	$agents = [
+		'yahoo! slurp', 'linkcheck by siteimprove.com', 'googlebot', '360spider', 'haosouspider',
+		'mj12bot', 'feedfetcher-google', 'mediapartners-google', 'duckduckgo-favicons-bot',
+		'googlebot-mobile', 'gigablastopensource', 'bingbot', 'surveybot', 'yandexbot',
+		'baiduspider', 'google web preview', 'meanpathbot', 'wesee_bot:we_help_monitize_your_site',
+		'seznambot', 'sogou web spider', 'linkdexbot', 'msnbot', 'smtbot', 'yandexmetrika',
+		'google-site-verification', 'netcraft ssl server survey - contact info@netcraft.com',
+		'orangebot', 'google-adwords-instant', 'googlebot-richsnippets', 'google-lens',
+		'googleother', 'google-test', 'linkdex.com', 'mail.ru', 'awariobot', 'bytespider',
+		'coccocbot-image', 'discobot', 'google-inspectiontool', 'netcraftsurveyagent',
+		'tineye-bot', 'tineye-bot-live', 'bingpreview', 'ask jeeves', 'adsbot-google', "msnbot-media ",
+		'googlebot-image', 'googlebot-news', 'googlebot-video', 'msnbot-media', 'yahoo! slurp china',
+		'inoreader.com-like feedfetcher-google', 'google-amphtml', 'duckduckbot', 'coccocbot-web',
+		'googleassociationservice', 'yandexwebmaster', 'yacybot', 'duckduckbot-https', 'yandexmobilebot',
+		'mail.ru_bot/fast', 'yandeximages', 'mail.ru_bot/img', 'ia_archiver', 'yandexblogs',
+		'yandexaccessibilitybot', 'yandeximageresizer', 'mail.ru_bot', 'yeti', 'obot', 'baiduspider-render',
+	];
+
+	foreach ($parts as $part) {
+		if (in_array($part, $agents)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * Services in the "security" context
+ *
+ * @param array $parts
+ * @return boolean
+ */
+function blockbot_is_security_checker(array $parts): bool
+{
+	$agents = [
+		'http banner detection', 'l9explore', 'l9tcpid', 'lkx-apache2449traversalplugin',
+		'bitsightbot', 'censysinspect', 'pathspider', 'repolookoutbot', 'sqlmap', 'ltx71',
+		'netsystemsresearch studies the availability of various services across the internet. our website is netsystemsresearch.com',
+		'expanse a palo alto networks company searches across the global ipv4 space multiple times per day to identify customers&#39',
+		'zgrab', 'nmap scripting engine', 'l9scan', 'riddler',
+	];
+
+	foreach ($parts as $part) {
+		if (in_array($part, $agents)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * Services that check pages for e.g. valid HTML
+ *
+ * @param array $parts
+ * @return boolean
+ */
+function blockbot_is_validator(array $parts): bool
+{
+	$agents = [
+		'jigsaw', 'ssl labs', 'w3c_validator', 'w3c-checklink', 'p3p validator', 'csscheck',
+	];
+
+	foreach ($parts as $part) {
+		if (in_array($part, $agents)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * Services that monitor a page
+ *
+ * @param array $parts
+ * @return boolean
+ */
+function blockbot_is_monitor(array $parts): bool
+{
+	$agents = [
+		'alexa site audit', 'catchpoint', 'google page speed insights', 'checkhost',
+		'poduptime', 'chrome-lighthouse', 'zabbix', 'cloudflare-alwaysonline',
+	];
+
+	foreach ($parts as $part) {
+		if (in_array($part, $agents)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * Services in the centralized and decentralized social media environment 
+ *
+ * @param array $parts
+ * @return boolean
+ */
+function blockbot_is_social_media(array $parts): bool
+{
+	$agents = ['camo-rs asset proxy', 'camo asset proxy'];
+	foreach ($parts as $part) {
+		foreach ($agents as $agent) {
+			if (strpos($part, $agent) !== false) {
+				return true;
+			}
+		}
+	}
+
+	$agents = [
+		'facebookexternalhit', 'twitterbot', 'mastodon', 'facebookexternalua',
+		'friendica', 'diasporafederation', 'buzzrelay', 'activityrelay',
+		'aoderelay', 'ap-relay', 'peertube', 'misskey', 'pleroma', 'foundkey', 'akkoma',
+		'lemmy', 'calckey', 'mobilizon', 'zot', 'camo-rs', 'gotosocial', 'pixelfed',
+		'pixelfedbot', 'app.wafrn.net', 'go-camo', 'http://a.gup.pe', 'iceshrimp',
+		'firefish', 'activity-relay', 'juick', 'camo', 'python/federation', 'nextcloud',
+		'snac', 'bovine', 'takahe', 'freedica', 'gnu social', 'microblogpub',
+		'mbin', 'mammoth', 'kbinbot', 'honksnonk', 'misskeymediaproxy', 'kbinbot', 'jistflow',
+		'mastodon/3.4.1 fedibird', 'fedibird', 'funkwhale',
+		'wafrn-cache-generator', 'simple social network', 'mbinbot', 'wordpress.com',
+		'catnip', 'castopod', 'enby-town', 'vernissage', 'iceshrimp.net', 'plasmatrap',
+		'imgproxy', 'rustypub', 'flipboard activitypub', 'gnu social activitypub plugin',
+		'micro.blog', 'mastodon-bookmark-rss', 'bookwyrm', 'damus', 'primal', 'misskeyadmin',
+		'ruby, mastodon', 'nextcloud social', 'camo asset proxy', 'smithereen', 'sorasns',
+		'cherrypick', 'bonfire activitypub federation', 'upub+0.1.0', 'plume', 'incestoma',
+		'gyptazyfedi', 'apogee', 'quolibet',
+	];
+
+	foreach ($parts as $part) {
+		if (in_array($part, $agents)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * Fediverse clients
+ *
+ * @param array $parts
+ * @return boolean
+ */
+function blockbot_is_fediverse_client(array $parts): bool
+{
+	$agents = [
+		'mastodonandroid', 'tootdeck-worker', 'piefed', 'brighteon', 'pachli', 'tusky', 'mona', 'mitra',
+		'megalodonandroid', 'fedilab', 'mastodonapp', 'toot!', 'intravnews',
+		'pixeldroid', 'greatnews', 'protopage', 'newsfox', 'vienna', 'wp-urldetails', 'husky',
+		'activitypub-go-http-client', 'mobilesafari', 'mastodon-ios', 'mastodonpy', 'techniverse',
+	];
+
+	foreach ($parts as $part) {
+		if (in_array($part, $agents)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * Feed reading clients and services
+ *
+ * @param array $parts
+ * @return boolean
+ */
+function blockbot_is_feed_reader(array $parts): bool
+{
+	$agents = [
+		'tiny tiny rss', 'mlem', 'feedly', 'flipboardproxy',  'reeder', 'netnewswire',
+		'freshrss', 'feedlyapp', 'feedlybot', 'feeddemon', 'rssowl', 'simplepie',
+		'magpierss',  'universalfeedparser', 'newsgatoronline', 'theoldreader.com',
+		'quiterss', 'feedburner', 'digg feed fetcher', 'r6_feedfetcher', 'apple-pubsub',
+		'netvibes', 'newsblur page fetcher', 'newsblur favicon fetcher', 'newsblur favicon fetcher',
+		'liferea', 'http://www.jetbrains.com/omea_reader/', 'feedblitz', 'bloglovin',
+		'windows-rss-platform', 'feedshow', 'feedreader', 'rssbandit', 'everyfeed-spider',
+		'feeeed', 'spacecowboys android rss reader', 'gregarius', 'feedspot',
+		'feedspot ssl asset proxy', 'newsgator', 'newsgator fetchlinks extension',
+		'akregator',
+	];
+
+	foreach ($parts as $part) {
+		if (in_array($part, $agents)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+function blockbot_is_fediverse_tool(array $parts): bool
+{
+	$agents = [
+		'diaspora-connection-tester', 'fediblock.manalejandro.com',
+		'mastodoninstances', 'fedilist agent', 'https://fedilist.com/', 'fedidb',
+		'https://wiki.communitydata.science/communitydata:fediverse_research', 'mastofeed.com',
+		'lemmy-explorer-crawler', 'fedicheck.online v1.0', 'momostr', 'fedditlemmyversecrawler',
+		'fediseer', 'fedistatscrawler', 'gnusocialbot', 'fedifetcher', 'fedineko', 'bird.makeup',
+		'fediverse', 'fedicheck.online', 'https://fed.brid.gy/', 'lemmy-stats-crawler',
+		"fediverse's stats", 'friendicadirectory', 'rss discovery engine',
+		'python-opengraph-jaywink', 'connect.rocks', 'tootsdk',
+	];
+
+
+	foreach ($parts as $part) {
+		if (in_array($part, $agents)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * General services
+ *
+ * @param array $parts
+ * @return boolean
+ */
+function blockbot_is_service_agent(array $parts): bool
+{
+	$agents = [
+		'chrome privacy preserving prefetch proxy', 'http compression test', 'microsoftpreview',
+		'pocketimagecache', 'wordpress', 'skypeuripreview preview', 'wordpress.com', 'discordbot',
+		'summalybot', 'livelapbot', 'whatsapp', 'facebot', 'skypeuripreview',
+		'plasmatrap image proxy server', 'grammarly',
+	];
+
+	foreach ($parts as $part) {
+		if (in_array($part, $agents)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * Libraries that perform HTTP requests
+ *
+ * @param array $parts
+ * @return boolean
+ */
+function blockbot_is_http_library(array $parts): bool
+{
+	if ((count($parts) == 1) && in_array($parts[0], ['okhttp', 'useragent'])) {
+		return true;
+	}
+
+	$agents = [
+		'python-urllib', 'go-http-client', 'axios', 'java', 'undici', 'node', 'ruby',
+		'mint', 'wget', 'dart:io', 'dart', 'caveman-sieve', 'guzzlehttp', 'deno',
+		'aiohttp', 'networkingextension', 'python-asks', 'fasthttp', 't7', 'scalaj-http',
+		'curl', 'python-requests', 'node-fetch', 'offline explorer', 'aria2',
+		'link_thumbnailer', 'python-httpx', 'com.apple.safari.searchhelper',
+		'com.apple.webkit.networking', 'luasocket', 'libwww-perl', 'google-http-java-client',
+		'appengine-google', 'reqwest', 'htmlparser', 'headlesschrome', 'winhttp',
+		'webcopier', 'webzip', 'http.jl', 'got', 'hackney', 'oca\mail\vendor\favicon',
+		'winhttp.winhttprequest.5', 'go package http', 'jakarta commons-httpclient',
+		'cpp-httplib', 'fuzz faster u fool v1.3.1-dev', 'fuzz faster u fool v1.5.0-dev',
+		'go http package', 'go-resty', 'http.rb', 'ivre-masscan', 'java1.0.21.0',
+		'jsdom', 'python-urllib3', 'reactornetty', 'req', 'restsharp', 'ruby-rdf-distiller',
+		'pycurl',
+	];
+
+	foreach ($parts as $part) {
+		if (in_array($part, $agents)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * Uncategorized helpful services
+ *
+ * @param array $parts
+ * @return boolean
+ */
+function blockbot_is_good_tool(array $parts): bool
+{
+	$agents = [
+		'easy-feed-oven', 'cutycapt', 'rss-is-dead.lol web bot', 'dnt-policy@eff.org',
+		'https://socnetv.org', 'opengraphreader', 'trendfetcher', 'iabot', 'rss-is-dead.lol feed bot',
+		'androiddownloadmanager', 'readybot.io', 'hydra', 'httrack', 'vlc', 'wellknownbot', 'wdg_validator', 'download demon',
+	];
+
+
+	foreach ($parts as $part) {
+		if (in_array($part, $agents)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+function blockbot_get_parts(string $agent): array
+{
+	$parts        = [];
+	$level        = 0;
+	$start        = 0;
+	$end          = 0;
+	$has_brackets = false;
+	for ($pos = 0; $pos < strlen($agent); $pos++) {
+		if ((strpos(substr($agent, $pos), '(') === false) && ($level == 0)) {
+			$part = substr($agent, $pos);
+			$parts = array_merge($parts, blockbot_split_parts($part, strpos($part, '/'), !$has_brackets));
+			break;
+		} elseif (substr($agent, $pos, 1) == '(') {
+			$level++;
+			$has_brackets = true;
+			if ($level == 1) {
+				$part = substr($agent, $end, $pos - $end);
+				$parts = array_merge($parts, blockbot_split_parts($part, $start != 0, false));
+				$start = $pos + 1;
+			}
+		} elseif (substr($agent, $pos, 1) == ')') {
+			$level--;
+			if ($level == 0) {
+				$part = substr($agent, $start, $pos - $start);
+				$parts = array_merge($parts, blockbot_split_parts($part, false, true));
+				$end = $pos + 1;
+			}
+		}
+	}
+	return blockbot_remove_browser_parts($parts);
+}
+
+function blockbot_remove_browser_parts(array $parts): array
+{
+	$cleaned = [];
+	foreach ($parts as $part) {
+		if (substr($part, -6) == ' build') {
+			continue;
+		}
+		$known = [
+			'mozilla', 'x11', 'ubuntu', 'linux x86_64', 'gecko', 'firefox', 'windows nt',
+			'win64', 'x64', 'android', 'applewebkit', 'khtml', 'like', 'chrome', 'safari', 'edg',
+			'unsupported', 'compatible', 'macintosh', 'intel mac os x', 'version', 'windows',
+			'u', 'en-us', '.net', '.net', 'wow64', 'linux', 'k', 'mobile', 'opr', 'msie',
+			'dalvik', 'build', 'nt', 'mobile safari', 'gecko/firefox', 'zh-cn', 'en-gb', 'clr',
+			'trident', '.net clr', 'qtwebengine', 'linux i686', 'tablet pc', 'ppc mac os x',
+			'en', 'fedora', 'ppc', 'edge', 'yabrowser', 'yowser', 'media center pc', 'arm_64',
+			'android 9', 'cros x86_64', 'iphone', 'cpu iphone os like mac os x', 'core',
+			'qqbrowser', 'beta', 'khtml like gecko', 'psp (playstation portable)', 'ia64',
+			'firephp', 'live', 'slcc2', 'infopath.2', 'bidubrowser', 'ubrowser', 'baiduboxapp',
+			'waterfox', 'lynx', 'libwww-fm', 'ssl-mm', 'openssl', 'gnutls', '.net4.0c', '.net4.0e',
+			'infopath.3', 'opera', 'palemoon', 'goanna', 'vivaldi', 'presto', 'intrepid', 'ru',
+			'ipad', 'cpu os like mac os x', 'omniweb', 'chromium', 'thunderbird', 'ubuntu lts',
+			'os', 'qupzilla', 'seamonkey', 'warp', 'konqueror', 'meego', 'nokian9', 'nokiabrowser',
+			'profile', 'configuration', 'untrusted', 'samsungbrowser', 'es-us', 'pocophone f1',
+			'sonyericssonw995', 'crios', 'lbbrowser', 'gwx:qualified', 'gwx:red', 'gwx:reserved',
+			'microsoft outlook', 'word', 'microsoft', 'office', 'powerpoint', 'excel',
+			'internet explorer', 'like gecko', 'shuame', 'qianniu', 'khtml, like gecko',
+			'cutycapt version', 'khtml, live gecko', '68k', 'sv1', 'aef', 'gtb7.5', 'gfe',
+			'embedded web browser from: http://bsalsa.com', 'wv', 'malnjs', '2.00',
+			'fsl', 'lcjb', 'malcjs', 'touch', 'masmjs', 'malc', 'maln', 'foxy', 'bri', 'lcte',
+			'embeddedwb from: http://www.bsalsa.com', '2345explorer', 'hpntdfjs', 'h4213',
+			'rb.gy', 'sm-a505fn', 'lenovo tb-8504x', 'silk', 'lya-al00', 'windows xp', 'openbsd',
+			'netbsd amd64', 'sa', 'samsung sm-g950f', 'redmi note', 'hry-lx1', 'cph2205',
+			'16th', 'redmi note pro', 'xiaomi/miuibrowser', 'sk-sk', 'linux i686 on x86_64',
+			'debian iceweasel', 'rmx2101', 'mi note pro', 'rmx1921', 'nokia6100', '04.01',
+			'fr-fr', 'slackware', 'sm-a225f', 'fennec', 'links', 'i386', 'windows phone os',
+			'blackberry', 'maxthon', 'opera mini', 'j2me', 'winnt4.0', 'phoenix', 'avant browser',
+			'iceweasel', 'moto e(7) plus', 'like geckoo', 'wpdesktop', 'nokia', 'lumia', 'arm',
+			'de-at', 'pixel', 'puffin', 'zte blade a7', 'linux armv7l', 'hd1913', 'symbianos',
+			'symbian os', 'de', '452', 'opera [en-us]', 'iemobile', 'windows phone', 'sm-g991b',
+			'sm-j810g', 'da-dk', 'symbian', 'series60', 'nokiax7-00', 'freebsd amd64', 'openbsd amd64',
+			'sm-n920c', 'blazer', 'palmsource', '16;320x320', 'sm-g998b', 'sm-a505g', 'freebsd i386',
+			'jaunty', 'shiretoko', 'playbook', 'rim tablet os', 'asus;galaxy6', 'minimo',
+			'linux arm7tdmi', 'blackberry7520', 'dl1036', '100011886a', 'lt-gtklauncher',
+			'browserng', 'nokiae7-00', 'ubuntu chromium', 'silk-accelerated=true', 'openbsd i386',
+			'windows ce', 'microsoft zunehd', 'epiphany', 'es-es', 'ru-ru', 'netbsd', 'ipod',
+			'safari', 'xbox', 'xbox one', 'fxios', 'opx', 'ucbrowser', 'u3',
+			'webos', 'desktop', 'compatible msie windows nt', 'sm-a525f', 'sm-g991u', 'ze520kl',
+			'cros i686', 'de-de', 'en-ca', 'config', 'i686', 'sm-g970u', 'win95', 'i',
+			'nokia7250', 'oneplus a6003', 'i2126', 'nintendo wii', 'vog-l29', 'msoffice', 'ms-office',
+			'oneplus a5010', 'linux mint', 'blackberry8320', 'observatory', 'qdesk',
+			'alexatoolbar', 'se metasr', 'qqdownload', 'alexa toolbar', 'baiduclient', 'ddg_android',
+			'com.duckduckgo.mobile.android', 'android api', 'duckduckgo', 'googletoolbar', 'amaya',
+		];
+		if (!in_array($part, $known) && !preg_match('=^rv:[\d]+\S*$=', $part)) {
+			$cleaned[] = $part;
+		}
+	}
+	return $cleaned;
+}
+
+function blockbot_clean_part(string $part): string
+{
+	$part = trim($part);
+	$subparts = [];
+	foreach (explode(' ', $part) as $subpart) {
+		$subpart = trim($subpart, ' +,');
+		if (!empty($subpart) && (!preg_match('=^\d+[\w\-\+\.]+$=', $subpart) || empty($subparts))) {
+			$subparts[] = $subpart;
+		}
+	}
+	return implode(' ', $subparts);
+}
+
+function blockbot_split_parts(string $agent, bool $parse_spaces, bool $parse_semicolon): array
+{
+	$agent = strtolower(trim($agent, ' ;'));
+	$cleaned = [];
+
+	while (preg_match('=\w+[\s\w/\._\-]*/\d+[^;\s]*=', $agent, $matches)) {
+		$part = $matches[0];
+		if (preg_match('=/\d+[^;\s]*=', $part, $matches, PREG_OFFSET_CAPTURE)) {
+			$cleaned[] = substr($part, 0, $matches[0][1]);
+			$part = substr($part, 0, $matches[0][1] +  strlen($matches[0][0]));
+		}
+		$agent = trim(str_replace($part, '', $agent));
+	}
+	if ($parse_semicolon && strpos($agent, ';') !== false) {
+		$parse_spaces = false;
+		$parts = [];
+		foreach (explode(';', $agent) as $part) {
+			$parts[] = blockbot_clean_part($part);
+		}
+	} elseif (strpos($agent, ' - ') !== false) {
+		$parts = [];
+		foreach (explode(' - ', $agent) as $part) {
+			$parts[] = blockbot_clean_part($part);
+		}
+	} elseif ($parse_spaces) {
+		$parts = explode(' ', $agent);
+	} else {
+		$parts = [$agent];
+	}
+
+	if ($parse_spaces) {
+		$subparts = [];
+		foreach ($parts as $part) {
+			while (($pos_space = strpos($part, ' ')) !== false && ($pos_slash = strpos($part, '/')) !== false) {
+				if ($pos_space > $pos_slash) {
+					$subparts[] = substr($part, 0, $pos_space);
+					$part = trim(substr($part, $pos_space + 1), ' +,-;');
+				} else {
+					$subparts[] = $part;
+					$part = '';
+				}
+			}
+			if ($part != '') {
+				$subparts[] = $part;
+			}
+		}
+		$parts = $subparts;
+	}
+
+	foreach ($parts as $part) {
+		$part = trim($part, ' +');
+
+		if (!Network::isValidHttpUrl($part) && strpos($part, '/') !== false) {
+			$split = explode('/', $part);
+			array_pop($split);
+			$part = implode('/', $split);
+		}
+
+		$pos1 = strpos($part, "'");
+		$pos2 = strrpos($part, "'");
+		if ($pos1 != $pos2) {
+			$part = substr($part, 0, $pos1 - 1) . substr($part, $pos2 + 1);
+		}
+
+		$part = trim(preg_replace('=(.*) [\d\.]+=', '$1', $part), " +,-;\u{00AD}");
+		if (!empty($part)) {
+			$cleaned[] = $part;
+		}
+	}
+	return $cleaned;
+}
diff --git a/blockbot/lang/C/messages.po b/blockbot/lang/C/messages.po
index a99ccc5a..6926c8a1 100644
--- a/blockbot/lang/C/messages.po
+++ b/blockbot/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-05 04:51+0000\n"
+"POT-Creation-Date: 2024-04-30 12:12+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,52 +17,29 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: blockbot.php:30
+#: blockbot.php:32
 msgid "Save Settings"
 msgstr ""
 
-#: blockbot.php:31
-msgid "Allow \"good\" crawlers"
-msgstr ""
-
-#: blockbot.php:31
-msgid ""
-"Don't block fediverse crawlers, relay servers and other bots with good "
-"purposes."
-msgstr ""
-
-#: blockbot.php:32
-msgid "Allow preview agents"
-msgstr ""
-
-#: blockbot.php:32
-msgid ""
-"Don't block agents from social media systems that want to generate preview "
-"data for links that had been set by their users."
+#: blockbot.php:33
+msgid "Allow security checkers"
 msgstr ""
 
 #: blockbot.php:33
+msgid "Don't block security checkers. They can be used for good or bad."
+msgstr ""
+
+#: blockbot.php:34
 msgid "Allow generic HTTP libraries"
 msgstr ""
 
-#: blockbot.php:33
+#: blockbot.php:34
 msgid ""
 "Don't block agents from generic HTTP libraries that could be used for good "
 "or for bad and that currently can't be traced back to any known Fediverse "
 "project."
 msgstr ""
 
-#: blockbot.php:34
-msgid "Block GabSocial"
-msgstr ""
-
-#: blockbot.php:34
-msgid ""
-"Block the software GabSocial. This will block every access for that "
-"software. You can block dedicated gab instances in the blocklist settings in "
-"the admin section."
-msgstr ""
-
 #: blockbot.php:35
 msgid "Training mode"
 msgstr ""
diff --git a/blockbot/templates/admin.tpl b/blockbot/templates/admin.tpl
index 5f41ae70..86a462da 100644
--- a/blockbot/templates/admin.tpl
+++ b/blockbot/templates/admin.tpl
@@ -1,6 +1,4 @@
-{{include file="field_checkbox.tpl" field=$good_crawlers}}
-{{include file="field_checkbox.tpl" field=$socialmedia_agents}}
+{{include file="field_checkbox.tpl" field=$security_checker}}
 {{include file="field_checkbox.tpl" field=$http_libraries}}
-{{include file="field_checkbox.tpl" field=$block_gab}}
 {{include file="field_checkbox.tpl" field=$training}}
-<div class="submit"><button type="submit" class="btn btn-primary" name="page_site" value="{{$submit}}">{{$submit}}</button></div>
+<div class="submit"><button type="submit" class="btn btn-primary" name="page_site" value="{{$submit}}">{{$submit}}</button></div>
\ No newline at end of file

From c7a6ecb34691abda06c31dc149a66178bf6eebba Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 10 May 2024 09:33:36 +0000
Subject: [PATCH 079/294] Blockbot: More agents added

---
 blockbot/blockbot.php | 138 ++++++++++++++++++++++++++++++++----------
 1 file changed, 106 insertions(+), 32 deletions(-)

diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php
index 77886edf..e5de1ef3 100644
--- a/blockbot/blockbot.php
+++ b/blockbot/blockbot.php
@@ -62,14 +62,14 @@ function blockbot_init_1()
 
 	$parts = blockbot_get_parts($_SERVER['HTTP_USER_AGENT']);
 
-	$logdata = ['isCrawler' => $isCrawler, 'agent' => $_SERVER['HTTP_USER_AGENT'], 'uri' => $_SERVER['REQUEST_URI'], 'parts' => $parts];
+	$logdata = ['isCrawler' => $isCrawler, 'agent' => $_SERVER['HTTP_USER_AGENT'], 'method' => $_SERVER['REQUEST_METHOD'], 'uri' => $_SERVER['REQUEST_URI'], 'parts' => $parts];
 
 	if ($isCrawler) {
 		blockbot_check_login_attempt($_SERVER['REQUEST_URI'], $logdata);
 	}
 
 	if (empty($parts)) {
-		Logger::debug('Known frontend found', $logdata);
+		Logger::debug('Known frontend found - accept', $logdata);
 		if ($isCrawler) {
 			blockbot_save('badly-parsed-agents', $_SERVER['HTTP_USER_AGENT']);
 		}
@@ -77,75 +77,77 @@ function blockbot_init_1()
 	}
 
 	if (blockbot_is_crawler($parts)) {
-		Logger::debug('Crawler found', $logdata);
+		Logger::debug('Crawler found - reject', $logdata);
 		blockbot_reject();
 	}
 
 	if (blockbot_is_searchbot($parts)) {
-		Logger::debug('Search bot found', $logdata);
+		Logger::debug('Search bot found - reject', $logdata);
 		blockbot_reject();
 	}
 
 	if (blockbot_is_unwanted($parts)) {
-		Logger::debug('Uncategorized unwanted agent found', $logdata);
+		Logger::debug('Uncategorized unwanted agent found - reject', $logdata);
 		blockbot_reject();
 	}
 
 	if (blockbot_is_security_checker($parts)) {
-		Logger::debug('Security checker found', $logdata);
 		if (!DI::config()->get('blockbot', 'security_checker')) {
+			Logger::debug('Security checker found - reject', $logdata);
 			blockbot_reject();
 		}
+		Logger::debug('Security checker found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_social_media($parts)) {
-		Logger::debug('Social media service found', $logdata);
+		Logger::debug('Social media service found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_fediverse_client($parts)) {
-		Logger::debug('Fediverse client found', $logdata);
+		Logger::debug('Fediverse client found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_feed_reader($parts)) {
-		Logger::debug('Feed reader found', $logdata);
+		Logger::debug('Feed reader found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_fediverse_tool($parts)) {
-		Logger::debug('Fediverse tool found', $logdata);
+		Logger::debug('Fediverse tool found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_service_agent($parts)) {
-		Logger::debug('Service agent found', $logdata);
+		Logger::debug('Service agent found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_monitor($parts)) {
-		Logger::debug('Monitoring service found', $logdata);
+		Logger::debug('Monitoring service found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_validator($parts)) {
-		Logger::debug('Validation service found', $logdata);
+		Logger::debug('Validation service found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_good_tool($parts)) {
-		Logger::debug('Uncategorized helpful service found', $logdata);
+		Logger::debug('Uncategorized helpful service found - accept', $logdata);
 		return;
 	}
 
 	// Needs to be checked at the end, since other services might use these libraries
 	if (blockbot_is_http_library($parts)) {
 		blockbot_check_login_attempt($_SERVER['REQUEST_URI'], $logdata);
-		Logger::debug('HTTP Library found', $logdata);
 		if (!DI::config()->get('blockbot', 'http_libraries')) {
+			Logger::debug('HTTP Library found - reject', $logdata);
 			blockbot_reject();
 		}
+		Logger::debug('HTTP Library found - accept', $logdata);
 		return;
 	}
 
@@ -161,7 +163,7 @@ function blockbot_init_1()
 	}
 
 	blockbot_save('bad-agents', $_SERVER['HTTP_USER_AGENT']);
-	Logger::notice('Blocked bot', $logdata);
+	Logger::notice('Possible bot found - reject', $logdata);
 	blockbot_reject();
 }
 
@@ -182,7 +184,7 @@ function blockbot_save($database, $userAgent)
 function blockbot_check_login_attempt(string $url, array $logdata)
 {
 	if (in_array(trim(parse_url($url, PHP_URL_PATH), '/'), ['login', 'lostpass', 'register'])) {
-		Logger::debug('Login attempt detected', $logdata);
+		Logger::debug('Login attempt detected - reject', $logdata);
 		blockbot_reject();
 	}
 }
@@ -198,9 +200,9 @@ function blockbot_is_unwanted(array $parts): bool
 	$agents = [
 		'oii-research', 'yisouspider', 'bots.retroverse.social', 'gaisbot', 'bloglines', 'emailwolf',
 		'webtech', 'facebookscraper', 'www.ecsl.cs.sunysb.edu/~maxim/cgi-bin/link',
-		'gulper', 'magellan', 'linkcheck', 'nerdybot',  'ms search robot', 'fast-webcrawler',
+		'gulper', 'magellan', 'linkcheck', 'nerdybot', 'ms search robot', 'fast-webcrawler',
 		'yioopbot', 'webster', 'www.admantx.com', 'openhosebot', 'lssrocketcrawler', 'dow jones searchbot',
-		'gomezagent', 'domainsigmacrawler', 'netseer crawler', 'gptbot', 'superbot', 'searchexpress',
+		'gomezagent', 'domainsigmacrawler', 'netseer crawler', 'superbot', 'searchexpress',
 		'alittle client', 'amazon-kendra', 'scanner.ducks.party', 'isscyberriskcrawler',
 		'google wireless transcoder',
 	];
@@ -221,6 +223,18 @@ function blockbot_is_unwanted(array $parts): bool
  */
 function blockbot_is_crawler(array $parts): bool
 {
+	$agents = [
+		'+http://yourls.org', 'adbeat.com/policy', 'https://gtmetrix.com', 'hubspot', 'nutch-',
+		'openwebspider'
+	];
+	foreach ($parts as $part) {
+		foreach ($agents as $agent) {
+			if (strpos($part, $agent) !== false) {
+				return true;
+			}
+		}
+	}
+
 	$agents = [
 		'ahrefsbot', 'pinterest', 'proximic', 'applebot', 'synapseworkstation.3.2.1',
 		'slackbot-linkexpanding', 'semrushbot-sa', 'qwantify', 'google search console',
@@ -241,8 +255,26 @@ function blockbot_is_crawler(array $parts): bool
 		'nuzzel', 'boardreader blog indexer', 'hatena-favicon', 'nbertaupete95', 'scrapy',
 		"electronic frontier foundation's do not track verifier", 'synapse', 'trendsmapresolver',
 		'pinterestbot', 'um-ln', 'slack-imgproxy', 'diffbot', 'dataforseobot', 'bw', 'bitlybot',
-		'twingly recon-klondike', 'imagesiftbot', 'google', 'rogerbot', 'yahoocachesystem',
-		'vkshare', 'appid: s~virustotalcloud', 'clickagy intelligence bot v2',
+		'twingly recon-klondike', 'imagesiftbot', 'rogerbot', 'yahoocachesystem', 'favicon',
+		'vkshare', 'appid: s~virustotalcloud', 'clickagy intelligence bot v2', 'gptbot',
+		'archive.org_bot http://archive.org/details', 'wellknownbot', 'archiveteam archivebot',
+		'megaindex.ru', 'adbeat_bot', 'masscan', 'embedly', 'cloudflare-amp', 'exabot-thumbnails',
+		'yahoo ad monitoring', 'seokicks-robot', 'trendiction search', 'semrushbot-si', 'plukkie',
+		'hubpages v0.2.2', 'aream.bot', 'safednsbot', 'linkpadbot', 'gluten free crawler',
+		'turnitinbot', 'xovibot', 'domaincrawler', 'nettrack', 'domaincrawler', 'yak', 'bubing',
+		'netestate ne crawler', 'blexbot', 'the knowledge ai', 'optimizer', 'hubspot webcrawler',
+		'venuscrawler', 'adstxtcrawler', 'iframely', 'checkmarknetwork', 'semrushbot-ba',
+		'archive.org bot', 'aihitbot', 'sitesucker', 'adstxtlab.com crawler', 'jobboersebot',
+		'http://www.archive.org/details/archive.org_bot', 'heritrix', 'appid: s~snapchat-proxy',
+		'icc-crawler', 'mbcrawler', 'slackbot', 'trumind-crawler', 'newspaper', 'online-webceo-bot',
+		'haena-pepper', 'y! crawler', 'linkwalker', 'seznamemailproxy', 'seekport crawler',
+		'domainstatsbot', 'qwantify/mermoz', 'sprinklr', 'komodiabot', 'seoscanners.net',
+		'domainappender', 'mixrankbot', 'abonti', 'urlappendbot', 'sistrix crawler',
+		'hatenabookmark', 'metainspector', 'ezooms', 'quora link preview', 'semrushbot-bm',
+		'barkrowler', 'panscient.com', 'http://tweetedtimes.com', 'twingly recon',
+		'collection@infegy.com', 'mediatoolkitbot', 'cloudflare-amphtml', 'ramblermail',
+		'tineye', 'adscanner', 'datagnionbot', 'aa_crawler', 'http://www.profound.net/domainappender',
+		'appid: e~arsnova-filter-system', 'kinglandsystemscorp', 'crmnlcrawlagent', 'techfetch-bot',
 	];
 
 	foreach ($parts as $part) {
@@ -265,11 +297,20 @@ function blockbot_is_crawler(array $parts): bool
  */
 function blockbot_is_searchbot(array $parts): bool
 {
+	$agents = ['baiduspider'];
+	foreach ($parts as $part) {
+		foreach ($agents as $agent) {
+			if (strpos($part, $agent) !== false) {
+				return true;
+			}
+		}
+	}
+
 	$agents = [
 		'yahoo! slurp', 'linkcheck by siteimprove.com', 'googlebot', '360spider', 'haosouspider',
 		'mj12bot', 'feedfetcher-google', 'mediapartners-google', 'duckduckgo-favicons-bot',
 		'googlebot-mobile', 'gigablastopensource', 'bingbot', 'surveybot', 'yandexbot',
-		'baiduspider', 'google web preview', 'meanpathbot', 'wesee_bot:we_help_monitize_your_site',
+		'google web preview', 'meanpathbot', 'wesee_bot:we_help_monitize_your_site',
 		'seznambot', 'sogou web spider', 'linkdexbot', 'msnbot', 'smtbot', 'yandexmetrika',
 		'google-site-verification', 'netcraft ssl server survey - contact info@netcraft.com',
 		'orangebot', 'google-adwords-instant', 'googlebot-richsnippets', 'google-lens',
@@ -281,6 +322,15 @@ function blockbot_is_searchbot(array $parts): bool
 		'googleassociationservice', 'yandexwebmaster', 'yacybot', 'duckduckbot-https', 'yandexmobilebot',
 		'mail.ru_bot/fast', 'yandeximages', 'mail.ru_bot/img', 'ia_archiver', 'yandexblogs',
 		'yandexaccessibilitybot', 'yandeximageresizer', 'mail.ru_bot', 'yeti', 'obot', 'baiduspider-render',
+		'netcraft web server survey', 'yandexnews', 'google', 'yandexrenderresourcesbot',
+		'match by siteimprove.com', 'yandexsitelinks', 'yandexantivirus', 'daum', 'mail.ru_bot/robots',
+		'yandexmedia', 'msnbot-products', 'yandexvideo', 'yandexvertis', 'catexplorador', 'yandexcalendar',
+		'yandexfavicons', 'user-agent\x09baiduspider', 'baiduspider-image', 'yandexpagechecker', 'mojeekbot',
+		'adsbot-google-mobile', 'google-adwords-displayads-webrender', 'seznam screenshot-generator',
+		'yandexscreenshotbot', 'zumbot', 'tracemyfile', 'wotbox', 'google-adwords-express',
+		'google-adwords-displayads', 'google-youtube-links', 'yandexvideoparser', 'paperlibot',
+		'weborama-fetcher', 'googleproducer', 'coccoc', 'acoonbot', 'psbot', 'sosospider', 'voilabot',
+		'blekkobot', 'easouspider', 'omgili', 'yadirectfetcher', 'sogou pic spider', 'daumoa',
 	];
 
 	foreach ($parts as $part) {
@@ -304,7 +354,7 @@ function blockbot_is_security_checker(array $parts): bool
 		'bitsightbot', 'censysinspect', 'pathspider', 'repolookoutbot', 'sqlmap', 'ltx71',
 		'netsystemsresearch studies the availability of various services across the internet. our website is netsystemsresearch.com',
 		'expanse a palo alto networks company searches across the global ipv4 space multiple times per day to identify customers&#39',
-		'zgrab', 'nmap scripting engine', 'l9scan', 'riddler',
+		'zgrab', 'nmap scripting engine', 'l9scan', 'riddler', 'cloud mapping experiment. contact research@pdrlabs.net',
 	];
 
 	foreach ($parts as $part) {
@@ -324,7 +374,8 @@ function blockbot_is_security_checker(array $parts): bool
 function blockbot_is_validator(array $parts): bool
 {
 	$agents = [
-		'jigsaw', 'ssl labs', 'w3c_validator', 'w3c-checklink', 'p3p validator', 'csscheck',
+		'jigsaw', 'ssl labs', 'w3c_validator', 'w3c-checklink', 'p3p validator', 'csscheck', 'validator.nu',
+		'google-structured-data-testing-tool https://search.google.com/structured-data', 'w3c_unicorn',
 	];
 
 	foreach ($parts as $part) {
@@ -345,7 +396,9 @@ function blockbot_is_monitor(array $parts): bool
 {
 	$agents = [
 		'alexa site audit', 'catchpoint', 'google page speed insights', 'checkhost',
-		'poduptime', 'chrome-lighthouse', 'zabbix', 'cloudflare-alwaysonline',
+		'poduptime', 'chrome-lighthouse', 'zabbix', 'cloudflare-alwaysonline', 'ptst',
+		'pingadmin.ru', 'pingdomtms', 'nimbostratus-bot', 'uptimebot', 'uptimerobot',
+		'http://notifyninja.com/monitoring', 'http://www.freewebmonitoring.com',
 	];
 
 	foreach ($parts as $part) {
@@ -382,14 +435,14 @@ function blockbot_is_social_media(array $parts): bool
 		'firefish', 'activity-relay', 'juick', 'camo', 'python/federation', 'nextcloud',
 		'snac', 'bovine', 'takahe', 'freedica', 'gnu social', 'microblogpub',
 		'mbin', 'mammoth', 'kbinbot', 'honksnonk', 'misskeymediaproxy', 'kbinbot', 'jistflow',
-		'mastodon/3.4.1 fedibird', 'fedibird', 'funkwhale',
+		'mastodon/3.4.1 fedibird', 'fedibird', 'funkwhale', 'linkedinbot',
 		'wafrn-cache-generator', 'simple social network', 'mbinbot', 'wordpress.com',
 		'catnip', 'castopod', 'enby-town', 'vernissage', 'iceshrimp.net', 'plasmatrap',
 		'imgproxy', 'rustypub', 'flipboard activitypub', 'gnu social activitypub plugin',
 		'micro.blog', 'mastodon-bookmark-rss', 'bookwyrm', 'damus', 'primal', 'misskeyadmin',
 		'ruby, mastodon', 'nextcloud social', 'camo asset proxy', 'smithereen', 'sorasns',
 		'cherrypick', 'bonfire activitypub federation', 'upub+0.1.0', 'plume', 'incestoma',
-		'gyptazyfedi', 'apogee', 'quolibet',
+		'gyptazyfedi', 'apogee', 'quolibet', 'magpie-crawler', 'redditbot', 'facebookplatform',
 	];
 
 	foreach ($parts as $part) {
@@ -441,7 +494,7 @@ function blockbot_is_feed_reader(array $parts): bool
 		'windows-rss-platform', 'feedshow', 'feedreader', 'rssbandit', 'everyfeed-spider',
 		'feeeed', 'spacecowboys android rss reader', 'gregarius', 'feedspot',
 		'feedspot ssl asset proxy', 'newsgator', 'newsgator fetchlinks extension',
-		'akregator',
+		'akregator', 'appid: s~feedly-nikon3',
 	];
 
 	foreach ($parts as $part) {
@@ -482,11 +535,21 @@ function blockbot_is_fediverse_tool(array $parts): bool
  */
 function blockbot_is_service_agent(array $parts): bool
 {
+	$agents = ['wordpress.com'];
+	foreach ($parts as $part) {
+		foreach ($agents as $agent) {
+			if (strpos($part, $agent) !== false) {
+				return true;
+			}
+		}
+	}
+
 	$agents = [
 		'chrome privacy preserving prefetch proxy', 'http compression test', 'microsoftpreview',
 		'pocketimagecache', 'wordpress', 'skypeuripreview preview', 'wordpress.com', 'discordbot',
 		'summalybot', 'livelapbot', 'whatsapp', 'facebot', 'skypeuripreview',
-		'plasmatrap image proxy server', 'grammarly',
+		'plasmatrap image proxy server', 'grammarly', 'browsershots', 'google-apps-script',
+		'yahoomailproxy', 'pocketparser', 'apachebench',
 	];
 
 	foreach ($parts as $part) {
@@ -505,10 +568,19 @@ function blockbot_is_service_agent(array $parts): bool
  */
 function blockbot_is_http_library(array $parts): bool
 {
-	if ((count($parts) == 1) && in_array($parts[0], ['okhttp', 'useragent'])) {
+	if ((count($parts) == 1) && in_array($parts[0], ['okhttp', 'useragent', 'faraday'])) {
 		return true;
 	}
 
+	$agents = ['faraday '];
+	foreach ($parts as $part) {
+		foreach ($agents as $agent) {
+			if (strpos($part, $agent) !== false) {
+				return true;
+			}
+		}
+	}
+
 	$agents = [
 		'python-urllib', 'go-http-client', 'axios', 'java', 'undici', 'node', 'ruby',
 		'mint', 'wget', 'dart:io', 'dart', 'caveman-sieve', 'guzzlehttp', 'deno',
@@ -522,7 +594,9 @@ function blockbot_is_http_library(array $parts): bool
 		'cpp-httplib', 'fuzz faster u fool v1.3.1-dev', 'fuzz faster u fool v1.5.0-dev',
 		'go http package', 'go-resty', 'http.rb', 'ivre-masscan', 'java1.0.21.0',
 		'jsdom', 'python-urllib3', 'reactornetty', 'req', 'restsharp', 'ruby-rdf-distiller',
-		'pycurl',
+		'pycurl', 'fdm', 'fdmx', 'lua-resty-http', 'python-httplib2', 'anyevent-http',
+		'node-superagent', 'unirest-java', 'gvfs', 'http_request2', 'java browser', 'cakephp',
+		'curly http client', 'lavf', 'typhoeus',
 	];
 
 	foreach ($parts as $part) {
@@ -544,7 +618,7 @@ function blockbot_is_good_tool(array $parts): bool
 	$agents = [
 		'easy-feed-oven', 'cutycapt', 'rss-is-dead.lol web bot', 'dnt-policy@eff.org',
 		'https://socnetv.org', 'opengraphreader', 'trendfetcher', 'iabot', 'rss-is-dead.lol feed bot',
-		'androiddownloadmanager', 'readybot.io', 'hydra', 'httrack', 'vlc', 'wellknownbot', 'wdg_validator', 'download demon',
+		'androiddownloadmanager', 'readybot.io', 'hydra', 'httrack', 'vlc', 'wdg_validator', 'download demon',
 	];
 
 

From e7dd7111aca76ee4436e16212587513422c92b00 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 12 May 2024 00:53:46 +0000
Subject: [PATCH 080/294] Bluesky: fix unneeded check for user PDS

---
 bluesky/bluesky.php | 61 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 43 insertions(+), 18 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index d69a9c41..ed2a8496 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -102,10 +102,11 @@ function bluesky_check_item_notification(array &$notification_data)
 	}
 
 	$did = bluesky_get_user_did($notification_data['uid']);
-
-	if (!empty($did)) {
-		$notification_data['profiles'][] = $did;
+	if (empty($did)) {
+		return;
 	}
+
+	$notification_data['profiles'][] = $did;
 }
 
 function bluesky_probe_detect(array &$hookData)
@@ -233,7 +234,7 @@ function bluesky_follow(array &$hook_data)
 
 	$post = [
 		'collection' => 'app.bsky.graph.follow',
-		'repo'       => DI::pConfig()->get($hook_data['uid'], 'bluesky', 'did'),
+		'repo'       => bluesky_get_user_did($hook_data['uid']),
 		'record'     => $record
 	];
 
@@ -286,7 +287,7 @@ function bluesky_block(array &$hook_data)
 
 	$post = [
 		'collection' => 'app.bsky.graph.block',
-		'repo'       => DI::pConfig()->get($hook_data['uid'], 'bluesky', 'did'),
+		'repo'       => bluesky_get_user_did($hook_data['uid']),
 		'record'     => $record
 	];
 
@@ -511,6 +512,10 @@ function bluesky_cron()
 
 	$pconfigs = DBA::selectToArray('pconfig', [], ['cat' => 'bluesky', 'k' => 'import', 'v' => true]);
 	foreach ($pconfigs as $pconfig) {
+		if (empty(bluesky_get_user_did($pconfig['uid']))) {
+			continue;
+		}
+
 		if ($abandon_days != 0) {
 			if (!DBA::exists('user', ["`uid` = ? AND `login_date` >= ?", $pconfig['uid'], $abandon_limit])) {
 				Logger::notice('abandoned account: timeline from user will not be imported', ['user' => $pconfig['uid']]);
@@ -661,6 +666,9 @@ function bluesky_create_activity(array $item, stdClass $parent = null)
 	}
 
 	$did = bluesky_get_user_did($uid);
+	if (empty($did)) {
+		return;
+	}
 
 	if ($item['verb'] == Activity::LIKE) {
 		$record = [
@@ -768,7 +776,7 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
 
 		$post = [
 			'collection' => 'app.bsky.feed.post',
-			'repo'       => DI::pConfig()->get($uid, 'bluesky', 'did'),
+			'repo'       => bluesky_get_user_did($uid),
 			'record'     => $record
 		];
 
@@ -1781,33 +1789,37 @@ function bluesky_get_user_did(int $uid, bool $refresh = false): ?string
 	}
 
 	$handle = DI::pConfig()->get($uid, 'bluesky', 'handle');
-	if (!empty($handle)) {
-		$did = bluesky_get_did($handle);
+	if (empty($handle)) {
+		return null;
 	}
+
+	$did = bluesky_get_did($handle);
 	if (empty($did)) {
-		Logger::notice('Error fetching DID for handle', ['uid' => $uid, 'handle' => $handle]);
-		DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_DID_FAIL);
+		return null;
 	}
+
 	Logger::debug('Got DID for user', ['uid' => $uid, 'handle' => $handle, 'did' => $did]);
 	DI::pConfig()->set($uid, 'bluesky', 'did', $did);
 	return $did;
 }
 
-function bluesky_get_user_pds(int $uid): string
+function bluesky_get_user_pds(int $uid): ?string
 {
 	$pds = DI::pConfig()->get($uid, 'bluesky', 'pds');
 	if (!empty($pds)) {
 		return $pds;
 	}
+
 	$did = bluesky_get_user_did($uid);
-	if (!empty($did)) {
-		$pds = bluesky_get_pds($did);
-	} else {
-		Logger::notice('Empty did for user', ['uid' => $uid]);
+	if (empty($did)) {
+		return null;
 	}
+
+	$pds = bluesky_get_pds($did);
 	if (empty($pds)) {
-		return BLUESKY_PDS;
+		return null;
 	}
+
 	DI::pConfig()->set($uid, 'bluesky', 'pds', $pds);
 	return $pds;
 }
@@ -1871,6 +1883,9 @@ function bluesky_refresh_token(int $uid): string
 function bluesky_create_token(int $uid, string $password): string
 {
 	$did = bluesky_get_user_did($uid);
+	if (empty($did)) {
+		return '';
+	}
 
 	$data = bluesky_post($uid, '/xrpc/com.atproto.server.createSession', json_encode(['identifier' => $did, 'password' => $password]), ['Content-type' => 'application/json']);
 	if (empty($data)) {
@@ -1893,8 +1908,13 @@ function bluesky_xrpc_post(int $uid, string $url, $parameters): ?stdClass
 
 function bluesky_post(int $uid, string $url, string $params, array $headers): ?stdClass
 {
+	$pds = bluesky_get_user_pds($uid);
+	if (empty($pds)) {
+		return null;
+	}
+
 	try {
-		$curlResult = DI::httpClient()->post(bluesky_get_user_pds($uid) . $url, $params, $headers);
+		$curlResult = DI::httpClient()->post($pds . $url, $params, $headers);
 	} catch (\Exception $e) {
 		Logger::notice('Exception on post', ['exception' => $e]);
 		DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_API_FAIL);
@@ -1917,7 +1937,12 @@ function bluesky_xrpc_get(int $uid, string $url, array $parameters = []): ?stdCl
 		$url .= '?' . http_build_query($parameters);
 	}
 
-	$data = bluesky_get(bluesky_get_user_pds($uid) . '/xrpc/' . $url, HttpClientAccept::JSON, [HttpClientOptions::HEADERS => ['Authorization' => ['Bearer ' . bluesky_get_token($uid)]]]);
+	$pds = bluesky_get_user_pds($uid);
+	if (empty($pds)) {
+		return null;
+	}
+
+	$data = bluesky_get($pds . '/xrpc/' . $url, HttpClientAccept::JSON, [HttpClientOptions::HEADERS => ['Authorization' => ['Bearer ' . bluesky_get_token($uid)]]]);
 	DI::pConfig()->set($uid, 'bluesky', 'status', is_null($data) ? BLUEKSY_STATUS_API_FAIL : BLUEKSY_STATUS_SUCCESS);
 	return $data;
 }

From 2306261ab2962e8e160f36a9785fd6ff98c874f2 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 16 May 2024 12:24:34 +0000
Subject: [PATCH 081/294] Tumblr: "isLocalLink" is now "isLocalUrl" / Bluesky:
 Fix for an empty uri

---
 bluesky/bluesky.php | 4 ++++
 tumblr/tumblr.php   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index ed2a8496..ba7c1d65 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1506,6 +1506,10 @@ function bluesky_fetch_missing_post(string $uri, int $uid, int $fetch_uid, int $
 	}
 
 	$class = bluesky_get_uri_class($uri);
+	if (empty($class)) {
+		return $fallback;
+	}
+
 	$fetch_uri = $class->uri;
 
 	Logger::debug('Fetch missing post', ['level' => $level, 'uid' => $uid, 'uri' => $uri]);
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 78e415ee..04f6a0a4 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -614,7 +614,7 @@ function tumblr_send_legacy(array $b)
 		$params['data'] = [];
 		foreach ($media as $photo) {
 			if ($photo['type'] == Post\Media::IMAGE) {
-				if (Network::isLocalLink($photo['url']) && ($data = Photo::getResourceData($photo['url']))) {
+				if (DI::baseUrl()->isLocalUrl($photo['url']) && ($data = Photo::getResourceData($photo['url']))) {
 					$photo = Photo::selectFirst([], ["`resource-id` = ? AND `scale` > ?", $data['guid'], 0]);
 					if (!empty($photo)) {
 						$params['data'][] = Photo::getImageDataForPhoto($photo);

From 9ae8925069fe87ff35b138668ee91946304593bf Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 19 May 2024 18:08:19 +0000
Subject: [PATCH 082/294] Upload: Fix available file extension check

---
 js_upload/js_upload.php | 43 ++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index 089cb7e2..786fc3c2 100644
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -7,11 +7,11 @@
  * Maintainer: Hypolite Petovan <https://friendica.mrpetovan.com/profile/hypolite>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
+use Friendica\Util\Images;
 use Friendica\Util\Strings;
 
 global $js_upload_jsonresponse;
@@ -20,9 +20,9 @@ global $js_upload_result;
 function js_upload_install()
 {
 	Hook::register('photo_upload_form', __FILE__, 'js_upload_form');
-	Hook::register('photo_post_init', __FILE__, 'js_upload_post_init');
-	Hook::register('photo_post_file', __FILE__, 'js_upload_post_file');
-	Hook::register('photo_post_end', __FILE__, 'js_upload_post_end');
+	Hook::register('photo_post_init',   __FILE__, 'js_upload_post_init');
+	Hook::register('photo_post_file',   __FILE__, 'js_upload_post_file');
+	Hook::register('photo_post_end',    __FILE__, 'js_upload_post_end');
 }
 
 function js_upload_form(array &$b)
@@ -34,11 +34,11 @@ function js_upload_form(array &$b)
 
 	$tpl = Renderer::getMarkupTemplate('js_upload.tpl', 'addon/js_upload');
 	$b['addon_text'] .= Renderer::replaceMacros($tpl, [
-		'$upload_msg' => DI::l10n()->t('Select files for upload'),
-		'$drop_msg' => DI::l10n()->t('Drop files here to upload'),
-		'$cancel' => DI::l10n()->t('Cancel'),
-		'$failed' => DI::l10n()->t('Failed'),
-		'$post_url' => $b['post_url'],
+		'$upload_msg'   => DI::l10n()->t('Select files for upload'),
+		'$drop_msg'     => DI::l10n()->t('Drop files here to upload'),
+		'$cancel'       => DI::l10n()->t('Cancel'),
+		'$failed'       => DI::l10n()->t('Failed'),
+		'$post_url'     => $b['post_url'],
 		'$maximagesize' => Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')),
 	]);
 }
@@ -48,7 +48,10 @@ function js_upload_post_init(array &$b)
 	global $js_upload_result, $js_upload_jsonresponse;
 
 	// list of valid extensions
-	$allowedExtensions = ['jpeg', 'gif', 'png', 'jpg'];
+	$allowedExtensions = [];
+	foreach (Images::IMAGETYPES as $type) {
+		$allowedExtensions[] = image_type_to_extension($type, false);
+	}
 
 	// max file size in bytes
 	$sizeLimit = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
@@ -75,10 +78,9 @@ function js_upload_post_file(array &$b)
 
 	$result = $js_upload_result;
 
-	$b['src'] = $result['path'];
+	$b['src']      = $result['path'];
 	$b['filename'] = $result['filename'];
 	$b['filesize'] = filesize($b['src']);
-
 }
 
 function js_upload_post_end(int &$b)
@@ -179,11 +181,11 @@ class qqUploadedFileForm
 
 class qqFileUploader
 {
-	private $allowedExtensions = [];
-	private $sizeLimit = 10485760;
+	private $allowedExtensions;
+	private $sizeLimit;
 	private $file;
 
-	function __construct(array $allowedExtensions = [], $sizeLimit = 10485760)
+	function __construct(array $allowedExtensions = [], $sizeLimit)
 	{
 		$allowedExtensions = array_map('strtolower', $allowedExtensions);
 
@@ -197,7 +199,6 @@ class qqFileUploader
 		} else {
 			$this->file = false;
 		}
-
 	}
 
 	/**
@@ -216,11 +217,9 @@ class qqFileUploader
 		}
 
 //		if ($size > $this->sizeLimit) {
-
 //			return array('error' => DI::l10n()->t('Uploaded file is too large'));
 //		}
 
-
 		$maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
 
 		if (($maximagesize) && ($size > $maximagesize)) {
@@ -241,14 +240,14 @@ class qqFileUploader
 
 		if ($this->file->save()) {
 			return [
-				'success' => true,
-				'path' => $this->file->getPath(),
+				'success'  => true,
+				'path'     => $this->file->getPath(),
 				'filename' => $filename . '.' . $ext
 			];
 		} else {
 			return [
-				'error' => DI::l10n()->t('Upload was cancelled, or server error encountered'),
-				'path' => $this->file->getPath(),
+				'error'    => DI::l10n()->t('Upload was cancelled, or server error encountered'),
+				'path'     => $this->file->getPath(),
 				'filename' => $filename . '.' . $ext
 			];
 		}

From 084a2a705761f4a21d6e720c267600b92750b700 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 27 May 2024 04:45:17 +0000
Subject: [PATCH 083/294] "zrl" functionility is moved

---
 forumdirectory/forumdirectory.php | 5 ++---
 groupdirectory/groupdirectory.php | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index 114da1da..9c99d63f 100644
--- a/forumdirectory/forumdirectory.php
+++ b/forumdirectory/forumdirectory.php
@@ -8,7 +8,6 @@
  * Note: Please use Group Directory instead
  */
 
-use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Content\Widget;
@@ -16,8 +15,8 @@ use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Profile;
 use Friendica\Model\User;
+use Friendica\Security\OpenWebAuth;
 
 global $forumdirectory_search;
 
@@ -82,7 +81,7 @@ function forumdirectory_content()
 	$gdirpath = '';
 	$dirurl = DI::config()->get('system', 'directory');
 	if (strlen($dirurl)) {
-		$gdirpath = Profile::zrl($dirurl, true);
+		$gdirpath = OpenWebAuth::zrl($dirurl, true);
 	}
 
 	$sql_extra = '';
diff --git a/groupdirectory/groupdirectory.php b/groupdirectory/groupdirectory.php
index 6d562cdc..df4bbb33 100644
--- a/groupdirectory/groupdirectory.php
+++ b/groupdirectory/groupdirectory.php
@@ -13,8 +13,8 @@ use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Profile;
 use Friendica\Model\User;
+use Friendica\Security\OpenWebAuth;
 
 global $groupdirectory_search;
 
@@ -79,7 +79,7 @@ function groupdirectory_content()
 	$gdirpath = '';
 	$dirurl   = DI::config()->get('system', 'directory');
 	if (strlen($dirurl)) {
-		$gdirpath = Profile::zrl($dirurl, true);
+		$gdirpath = OpenWebAuth::zrl($dirurl, true);
 	}
 
 	$sql_extra = '';

From 39247ca28f84ec25b49e41482b7e5ea91bdf8b21 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 29 May 2024 06:07:48 +0000
Subject: [PATCH 084/294] Function renamed

---
 forumdirectory/forumdirectory.php | 2 +-
 groupdirectory/groupdirectory.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index 9c99d63f..9a155a00 100644
--- a/forumdirectory/forumdirectory.php
+++ b/forumdirectory/forumdirectory.php
@@ -81,7 +81,7 @@ function forumdirectory_content()
 	$gdirpath = '';
 	$dirurl = DI::config()->get('system', 'directory');
 	if (strlen($dirurl)) {
-		$gdirpath = OpenWebAuth::zrl($dirurl, true);
+		$gdirpath = OpenWebAuth::getZrlUrl($dirurl, true);
 	}
 
 	$sql_extra = '';
diff --git a/groupdirectory/groupdirectory.php b/groupdirectory/groupdirectory.php
index df4bbb33..615d7024 100644
--- a/groupdirectory/groupdirectory.php
+++ b/groupdirectory/groupdirectory.php
@@ -79,7 +79,7 @@ function groupdirectory_content()
 	$gdirpath = '';
 	$dirurl   = DI::config()->get('system', 'directory');
 	if (strlen($dirurl)) {
-		$gdirpath = OpenWebAuth::zrl($dirurl, true);
+		$gdirpath = OpenWebAuth::getZrlUrl($dirurl, true);
 	}
 
 	$sql_extra = '';

From c7f4d183b18aa55129af46a88179d416f03e5118 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 3 Jun 2024 08:13:08 +0200
Subject: [PATCH 085/294] FR translation updates - nsfw, securemail, tumblr

---
 nsfw/lang/fr/messages.po       |  6 +++---
 nsfw/lang/fr/strings.php       |  2 +-
 securemail/lang/fr/messages.po |  8 ++++----
 securemail/lang/fr/strings.php |  4 ++--
 tumblr/lang/fr/messages.po     | 12 ++++++------
 tumblr/lang/fr/strings.php     |  8 ++++----
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/nsfw/lang/fr/messages.po b/nsfw/lang/fr/messages.po
index 36fd22cc..2af1c3d4 100644
--- a/nsfw/lang/fr/messages.po
+++ b/nsfw/lang/fr/messages.po
@@ -4,7 +4,7 @@
 # 
 # 
 # Translators:
-# Florent C., 2023
+# cracrayol, 2023-2024
 # Nicolas Derive, 2022-2023
 # StefOfficiel <pichard.stephane@free.fr>, 2015
 # Vincent Vindarel <vindarel@mailz.org>, 2018
@@ -14,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-12-10 14:42-0500\n"
 "PO-Revision-Date: 2014-06-23 10:34+0000\n"
-"Last-Translator: Florent C., 2023\n"
+"Last-Translator: cracrayol, 2023-2024\n"
 "Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,7 +42,7 @@ msgstr "Liste de mots-clés - séparés par des virgules - à cacher"
 msgid ""
 "Use /expression/ to provide regular expressions, #tag to specfically match "
 "hashtags (case-insensitive), or regular words (case-sensitive)"
-msgstr "Utiliser /expression/ pour fournir des expressions régulières, #tag pour correspondre à un tag (insensible à la casse), ou des mots classiques (sensible à la casse)"
+msgstr "Utiliser /expression/ pour fournir des expressions régulières, #etiquette pour correspondre à une étiquette (insensible à la casse), ou des mots classiques (sensible à la casse)"
 
 #: nsfw.php:72
 msgid "Content Filter (NSFW and more)"
diff --git a/nsfw/lang/fr/strings.php b/nsfw/lang/fr/strings.php
index fc03d5ad..0f717797 100644
--- a/nsfw/lang/fr/strings.php
+++ b/nsfw/lang/fr/strings.php
@@ -8,7 +8,7 @@ function string_plural_select_fr($n){
 $a->strings['This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view.'] = 'Cette extension recherche des mots/textes spécifiés dans les publications et les masque. Elle peut être utilisée pour filtrer le contenu étiqueté par exemple avec #NSFW qui peut être considéré comme inapproprié à certains moments ou endroits, comme par exemple au travail. Elle est aussi utile pour cacher du contenu non pertinent ou ennuyeux d\'une vue directe.';
 $a->strings['Enable Content filter'] = 'Activer le filtrage de contenu';
 $a->strings['Comma separated list of keywords to hide'] = 'Liste de mots-clés - séparés par des virgules - à cacher';
-$a->strings['Use /expression/ to provide regular expressions, #tag to specfically match hashtags (case-insensitive), or regular words (case-sensitive)'] = 'Utiliser /expression/ pour fournir des expressions régulières, #tag pour correspondre à un tag (insensible à la casse), ou des mots classiques (sensible à la casse)';
+$a->strings['Use /expression/ to provide regular expressions, #tag to specfically match hashtags (case-insensitive), or regular words (case-sensitive)'] = 'Utiliser /expression/ pour fournir des expressions régulières, #etiquette pour correspondre à une étiquette (insensible à la casse), ou des mots classiques (sensible à la casse)';
 $a->strings['Content Filter (NSFW and more)'] = 'Filtre de contenu (NSFW et autres)';
 $a->strings['Regular expression "%s" fails to compile'] = 'La compilation de l\'expression régulière "%s" a échoué';
 $a->strings['Filtered tag: %s'] = 'Tag filtré : %s';
diff --git a/securemail/lang/fr/messages.po b/securemail/lang/fr/messages.po
index 828d507b..6e6cc657 100644
--- a/securemail/lang/fr/messages.po
+++ b/securemail/lang/fr/messages.po
@@ -5,7 +5,7 @@
 # 
 # Translators:
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-# Florent C., 2023
+# cracrayol, 2024
 # 
 #, fuzzy
 msgid ""
@@ -14,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:16-0500\n"
 "PO-Revision-Date: 2018-03-20 07:26+0000\n"
-"Last-Translator: Florent C., 2023\n"
+"Last-Translator: cracrayol, 2024\n"
 "Language-Team: French (https://app.transifex.com/Friendica/teams/12172/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@ msgstr ""
 
 #: securemail.php:50
 msgid "Enable Secure Mail"
-msgstr "Activer l'extension des emails sécurisés"
+msgstr "Activer l'extension des courriels sécurisés"
 
 #: securemail.php:51
 msgid "Public key"
@@ -36,7 +36,7 @@ msgstr "Votre clé publique PGP formatée compatible ASCII"
 
 #: securemail.php:56
 msgid "\"Secure Mail\" Settings"
-msgstr "Paramètres des emails sécurisés"
+msgstr "Paramètres des courriels sécurisés"
 
 #: securemail.php:59
 msgid "Save Settings"
diff --git a/securemail/lang/fr/strings.php b/securemail/lang/fr/strings.php
index 9d40a8e2..b13cc5ce 100644
--- a/securemail/lang/fr/strings.php
+++ b/securemail/lang/fr/strings.php
@@ -5,10 +5,10 @@ function string_plural_select_fr($n){
 	$n = intval($n);
 	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
-$a->strings['Enable Secure Mail'] = 'Activer l\'extension des emails sécurisés';
+$a->strings['Enable Secure Mail'] = 'Activer l\'extension des courriels sécurisés';
 $a->strings['Public key'] = 'Clé publique';
 $a->strings['Your public PGP key, ascii armored format'] = 'Votre clé publique PGP formatée compatible ASCII';
-$a->strings['"Secure Mail" Settings'] = 'Paramètres des emails sécurisés';
+$a->strings['"Secure Mail" Settings'] = 'Paramètres des courriels sécurisés';
 $a->strings['Save Settings'] = 'Enregistrer les paramètres';
 $a->strings['Save and send test'] = 'Enregistrer et envoyer un message de test';
 $a->strings['Test email sent'] = 'Courriel de test envoyé avec succès';
diff --git a/tumblr/lang/fr/messages.po b/tumblr/lang/fr/messages.po
index ef2f0e3c..43dba8e3 100644
--- a/tumblr/lang/fr/messages.po
+++ b/tumblr/lang/fr/messages.po
@@ -5,7 +5,7 @@
 # 
 # Translators:
 # bob lebonche <lebonche@tutanota.com>, 2021
-# Florent C., 2023
+# cracrayol, 2023-2024
 # StefOfficiel <pichard.stephane@free.fr>, 2015
 msgid ""
 msgstr ""
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-04-29 06:56+0000\n"
 "PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Florent C., 2023\n"
+"Last-Translator: cracrayol, 2023-2024\n"
 "Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,13 +39,13 @@ msgstr "Secret utilisateur"
 
 #: tumblr.php:299
 msgid "Maximum tags"
-msgstr "Tags maximum"
+msgstr "Étiquettes maximum"
 
 #: tumblr.php:299
 msgid ""
 "Maximum number of tags that a user can follow. Enter 0 to deactivate the "
 "feature."
-msgstr "Nombre maximum de tags qu'un utilisateur peut suivre. Entrez 0 pour désactiver cette fonctionnalité."
+msgstr "Nombre maximum d'étiquettes qu'un utilisateur peut suivre. Entrez 0 pour désactiver cette fonctionnalité."
 
 #: tumblr.php:336
 msgid "Post to page:"
@@ -73,14 +73,14 @@ msgstr "Importer le flux distant"
 
 #: tumblr.php:351
 msgid "Subscribed tags"
-msgstr "Tags suivis"
+msgstr "Étiquettes suivies"
 
 #: tumblr.php:351
 #, php-format
 msgid ""
 "Comma separated list of up to %d tags that will be imported additionally to "
 "the timeline"
-msgstr "Liste séparée par des virgules contenant jusqu'à %d tags qui seront importés dans le flux"
+msgstr "Liste contenant jusqu'à %d étiquettes, séparées par des virgules, qui seront importées dans le flux"
 
 #: tumblr.php:357
 msgid "Tumblr Import/Export"
diff --git a/tumblr/lang/fr/strings.php b/tumblr/lang/fr/strings.php
index ece76c74..f23c9c44 100644
--- a/tumblr/lang/fr/strings.php
+++ b/tumblr/lang/fr/strings.php
@@ -9,15 +9,15 @@ $a->strings['Permission denied.'] = 'Permission refusée.';
 $a->strings['Save Settings'] = 'Sauvegarder les paramètres';
 $a->strings['Consumer Key'] = 'Clé utilisateur';
 $a->strings['Consumer Secret'] = 'Secret utilisateur';
-$a->strings['Maximum tags'] = 'Tags maximum';
-$a->strings['Maximum number of tags that a user can follow. Enter 0 to deactivate the feature.'] = 'Nombre maximum de tags qu\'un utilisateur peut suivre. Entrez 0 pour désactiver cette fonctionnalité.';
+$a->strings['Maximum tags'] = 'Étiquettes maximum';
+$a->strings['Maximum number of tags that a user can follow. Enter 0 to deactivate the feature.'] = 'Nombre maximum d\'étiquettes qu\'un utilisateur peut suivre. Entrez 0 pour désactiver cette fonctionnalité.';
 $a->strings['Post to page:'] = 'Publier sur la page :';
 $a->strings['(Re-)Authenticate your tumblr page'] = '(re)Authentifiez votre page Tumblr';
 $a->strings['You are not authenticated to tumblr'] = 'Vous n\'êtes pas identifié sur Tumblr';
 $a->strings['Enable Tumblr Post Addon'] = 'Activez l\'extension de publication Tumblr';
 $a->strings['Post to Tumblr by default'] = 'Publier sur Tumblr par défaut';
 $a->strings['Import the remote timeline'] = 'Importer le flux distant';
-$a->strings['Subscribed tags'] = 'Tags suivis';
-$a->strings['Comma separated list of up to %d tags that will be imported additionally to the timeline'] = 'Liste séparée par des virgules contenant jusqu\'à %d tags qui seront importés dans le flux';
+$a->strings['Subscribed tags'] = 'Étiquettes suivies';
+$a->strings['Comma separated list of up to %d tags that will be imported additionally to the timeline'] = 'Liste contenant jusqu\'à %d étiquettes, séparées par des virgules, qui seront importées dans le flux';
 $a->strings['Tumblr Import/Export'] = 'Import/Export Tumblr';
 $a->strings['Post to Tumblr'] = 'Publier vers Tumblr';

From 77c471ab4df90e68f9557df4e2bc37ddccfa2d51 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 5 Jun 2024 03:37:43 +0000
Subject: [PATCH 086/294] Bluesky: Fix error on restricted posts / improve
 performance

---
 bluesky/bluesky.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index ba7c1d65..453c4ead 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1217,7 +1217,11 @@ function bluesky_get_header(stdClass $post, string $uri, int $uid, int $fetch_ui
 		'source'        => json_encode($post),
 	];
 
+	$account = Contact::selectFirstAccountUser(['pid'], ['id' => $contact['id']]);
+
+	$item['author-id'] = $account['pid'];
 	$item['uri-id']       = ItemURI::getIdByURI($uri);
+	$item['owner-id']     = $item['author-id'];
 	$item['owner-name']   = $item['author-name'];
 	$item['owner-link']   = $item['author-link'];
 	$item['owner-avatar'] = $item['author-avatar'];
@@ -1592,7 +1596,7 @@ function bluesky_process_thread(stdClass $thread, int $uid, int $fetch_uid, int
 
 function bluesky_get_contact(stdClass $author, int $uid, int $fetch_uid): array
 {
-	$condition = ['network' => Protocol::BLUESKY, 'uid' => 0, 'url' => $author->did];
+	$condition = ['network' => Protocol::BLUESKY, 'uid' => 0, 'nurl' => $author->did];
 	$contact = Contact::selectFirst(['id', 'updated'], $condition);
 
 	$update = empty($contact) || $contact['updated'] < DateTimeFormat::utc('now -24 hours');
@@ -1610,7 +1614,7 @@ function bluesky_get_contact(stdClass $author, int $uid, int $fetch_uid): array
 	}
 
 	if ($uid != 0) {
-		$condition = ['network' => Protocol::BLUESKY, 'uid' => $uid, 'url' => $author->did];
+		$condition = ['network' => Protocol::BLUESKY, 'uid' => $uid, 'nurl' => $author->did];
 
 		$contact = Contact::selectFirst(['id', 'rel', 'uid'], $condition);
 		if (!isset($fields['rel']) && isset($contact['rel'])) {

From 734d35d22b7a41c0f5bbe7cedea8e5eb9358b6ae Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 5 Jun 2024 03:35:00 +0000
Subject: [PATCH 087/294] Blockbot: Logging of AP actors

---
 blockbot/blockbot.php | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php
index e5de1ef3..eb634b1f 100644
--- a/blockbot/blockbot.php
+++ b/blockbot/blockbot.php
@@ -15,6 +15,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Network\HTTPException\ForbiddenException;
+use Friendica\Util\HTTPSignature;
 use Friendica\Util\Network;
 
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
@@ -76,6 +77,8 @@ function blockbot_init_1()
 		return;
 	}
 
+	blockbot_log_activitypub($_SERVER['REQUEST_URI'], $_SERVER['HTTP_USER_AGENT']);
+
 	if (blockbot_is_crawler($parts)) {
 		Logger::debug('Crawler found - reject', $logdata);
 		blockbot_reject();
@@ -169,7 +172,7 @@ function blockbot_init_1()
 
 function blockbot_save($database, $userAgent)
 {
-	if (!DI::config()->get('blockbot', 'training') || !function_exists('dba_open')) {
+	if (!DI::config()->get('blockbot', 'logging') || !function_exists('dba_open')) {
 		return;
 	}
 
@@ -181,6 +184,36 @@ function blockbot_save($database, $userAgent)
 	dba_close($resource);
 }
 
+function blockbot_log_activitypub(string $url, string $agent)
+{
+	if (!DI::config()->get('blockbot', 'logging')) {
+		return;
+	}
+
+	$bot = ['/.well-known/nodeinfo', '/nodeinfo/2.0', '/nodeinfo/1.0'];
+	if (in_array($url, $bot)) {
+		blockbot_save('activitypub-stats', $agent);
+	}
+
+	$bot = ['/api/v1/instance', '/api/v2/instance', '/api/v1/instance/extended_description',
+		'/api/v1/instance/peers'];
+	if (in_array($url, $bot)) {
+		blockbot_save('activitypub-api-stats', $agent);
+	}
+
+	if (substr($url, 0, 6) == '/api/v') {
+		blockbot_save('activitypub-api', $agent);
+	}
+
+	if (($_SERVER['REQUEST_METHOD'] == 'POST') && in_array('inbox', explode('/', parse_url($url, PHP_URL_PATH)))) {
+		blockbot_save('activitypub-inbox-agents', $agent);
+	}
+
+	if (!empty($_SERVER['HTTP_SIGNATURE']) && !empty(HTTPSignature::getSigner('', $_SERVER))) {
+		blockbot_save('activitypub-signature-agents', $agent);
+	}
+}
+
 function blockbot_check_login_attempt(string $url, array $logdata)
 {
 	if (in_array(trim(parse_url($url, PHP_URL_PATH), '/'), ['login', 'lostpass', 'register'])) {

From 231d830db0929fb0627e075b18da5c0b331e9c18 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 9 Jun 2024 20:32:23 +0000
Subject: [PATCH 088/294] Bluesky: Fix overwritten handle when "friendica
 handles" is selected

---
 bluesky/bluesky.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 453c4ead..fa5ba232 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -355,8 +355,11 @@ function bluesky_settings(array &$data)
 
 	if (DI::config()->get('bluesky', 'friendica_handles')) {
 		$self = User::getById(DI::userSession()->getLocalUserId(), ['nickname']);
-		$handle = $self['nickname'] . '.' . DI::baseUrl()->getHost();
-		$friendica_handle = ['bluesky_friendica_handle', DI::l10n()->t('Allow to use %s as your Bluesky handle.', $handle), $custom_handle, DI::l10n()->t('When enabled, you can use %s as your Bluesky handle. After you enabled this option, please go to https://bsky.app/settings and select to change your handle. Select that you have got your own domain. Then enter %s and select "No DNS Panel". Then select "Verify Text File".', $handle, $handle)];
+		$host_handle = $self['nickname'] . '.' . DI::baseUrl()->getHost();
+		$friendica_handle = ['bluesky_friendica_handle', DI::l10n()->t('Allow to use %s as your Bluesky handle.', $host_handle), $custom_handle, DI::l10n()->t('When enabled, you can use %s as your Bluesky handle. After you enabled this option, please go to https://bsky.app/settings and select to change your handle. Select that you have got your own domain. Then enter %s and select "No DNS Panel". Then select "Verify Text File".', $host_handle, $host_handle)];
+		if ($custom_handle) {
+			$handle = $host_handle;
+		}
 	} else {
 		$friendica_handle = [];
 	}
@@ -369,7 +372,7 @@ function bluesky_settings(array &$data)
 		'$import_feeds' => ['bluesky_import_feeds', DI::l10n()->t('Import the pinned feeds'), $import_feeds, DI::l10n()->t('When activated, Posts will be imported from all the feeds that you pinned in Bluesky.')],
 		'$custom_handle' => $friendica_handle,
 		'$pds'          => ['bluesky_pds', DI::l10n()->t('Personal Data Server'), $pds, DI::l10n()->t('The personal data server (PDS) is the system that hosts your profile.'), '', 'readonly'],
-		'$handle'       => ['bluesky_handle', DI::l10n()->t('Bluesky handle'), $handle],
+		'$handle'       => ['bluesky_handle', DI::l10n()->t('Bluesky handle'), $handle, '', '', $custom_handle ? 'readonly' : ''],
 		'$did'          => ['bluesky_did', DI::l10n()->t('Bluesky DID'), $did, DI::l10n()->t('This is the unique identifier. It will be fetched automatically, when the handle is entered.'), '', 'readonly'],
 		'$password'     => ['bluesky_password', DI::l10n()->t('Bluesky app password'), '', DI::l10n()->t("Please don't add your real password here, but instead create a specific app password in the Bluesky settings.")],
 		'$status'       => bluesky_get_status($handle, $did, $pds, $token),
@@ -440,7 +443,7 @@ function bluesky_settings_post(array &$b)
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'handle',           $handle);
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'import',           intval($_POST['bluesky_import']));
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'import_feeds',     intval($_POST['bluesky_import_feeds']));
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'friendica_handle', intval($_POST['bluesky_friendica_handle']));
+	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'friendica_handle', intval($_POST['bluesky_friendica_handle'] ?? false));
 
 	if (!empty($handle)) {
 		$did = bluesky_get_user_did(DI::userSession()->getLocalUserId(), empty($old_did) || $old_handle != $handle);
@@ -510,7 +513,7 @@ function bluesky_cron()
 
 	$abandon_limit = date(DateTimeFormat::MYSQL, time() - $abandon_days * 86400);
 
-	$pconfigs = DBA::selectToArray('pconfig', [], ['cat' => 'bluesky', 'k' => 'import', 'v' => true]);
+	$pconfigs = DBA::selectToArray('pconfig', [], ["`cat` = ? AND `k` IN (?, ?) AND `v`", 'bluesky', 'import', 'import_feeds']);
 	foreach ($pconfigs as $pconfig) {
 		if (empty(bluesky_get_user_did($pconfig['uid']))) {
 			continue;
@@ -527,8 +530,9 @@ function bluesky_cron()
 		bluesky_get_token($pconfig['uid']);
 
 		Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_notifications.php', $pconfig['uid'], $last);
-		Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_timeline.php', $pconfig['uid'], $last);
-
+		if (DI::pConfig()->get($pconfig['uid'], 'bluesky', 'import')) {
+			Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_timeline.php', $pconfig['uid'], $last);
+		}
 		if (DI::pConfig()->get($pconfig['uid'], 'bluesky', 'import_feeds')) {
 			$feeds = bluesky_get_feeds($pconfig['uid']);
 			foreach ($feeds as $feed) {

From fa16adccaf47f94e7fe29e9e1a7e389e2f767039 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 10 Jun 2024 05:39:58 +0000
Subject: [PATCH 089/294] Bluesky: more logging added

---
 bluesky/bluesky.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index fa5ba232..e9648018 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -516,6 +516,7 @@ function bluesky_cron()
 	$pconfigs = DBA::selectToArray('pconfig', [], ["`cat` = ? AND `k` IN (?, ?) AND `v`", 'bluesky', 'import', 'import_feeds']);
 	foreach ($pconfigs as $pconfig) {
 		if (empty(bluesky_get_user_did($pconfig['uid']))) {
+			Logger::debug('User has got no valid DID', ['uid' => $pconfig['uid']]);
 			continue;
 		}
 
@@ -527,6 +528,7 @@ function bluesky_cron()
 		}
 
 		// Refresh the token now, so that it doesn't need to be refreshed in parallel by the following workers
+		Logger::debug('Refresh the token', ['uid' => $pconfig['uid']]);
 		bluesky_get_token($pconfig['uid']);
 
 		Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_notifications.php', $pconfig['uid'], $last);
@@ -534,13 +536,19 @@ function bluesky_cron()
 			Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_timeline.php', $pconfig['uid'], $last);
 		}
 		if (DI::pConfig()->get($pconfig['uid'], 'bluesky', 'import_feeds')) {
+			Logger::debug('Fetch feeds for user', ['uid' => $pconfig['uid']]);
 			$feeds = bluesky_get_feeds($pconfig['uid']);
 			foreach ($feeds as $feed) {
 				Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_feed.php', $pconfig['uid'], $feed, $last);
 			}
 		}
+		Logger::debug('Polling done for user', ['uid' => $pconfig['uid']]);
 	}
 
+	Logger::notice('Polling done for all users');
+
+	DI::keyValue()->set('bluesky_last_poll', time());
+
 	$last_clean = DI::keyValue()->get('bluesky_last_clean');
 	if (empty($last_clean) || ($last_clean + 86400 < time())) {
 		Logger::notice('Start contact cleanup');
@@ -554,8 +562,6 @@ function bluesky_cron()
 	}
 
 	Logger::notice('cron_end');
-
-	DI::keyValue()->set('bluesky_last_poll', time());
 }
 
 function bluesky_hook_fork(array &$b)

From 6f56932f120fe0a57c8bd9383735c99d7d9b9c5a Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 13 Jun 2024 04:32:00 +0000
Subject: [PATCH 090/294] Bluesky: Handle API error when fetching feeds

---
 bluesky/bluesky.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index e9648018..6994b3e3 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -68,6 +68,7 @@ const BLUEKSY_STATUS_TOKEN_FAIL = 13;
 const BLUESKY_DIRECTORY = 'https://plc.directory'; // Path to the directory server service to fetch the PDS of a given DID
 const BLUESKY_PDS       = 'https://bsky.social';   // Path to the personal data server service (PDS) to fetch the DID for a given handle
 const BLUESKY_WEB       = 'https://bsky.app';      // Path to the web interface with the user profile and posts
+const BLUESKY_HOSTNAME  = 'bsky.social';           // Host name to be added to the handle if incomplete
 
 function bluesky_install()
 {
@@ -1719,6 +1720,9 @@ function bluesky_get_feeds(int $uid): array
 {
 	$type = '$type';
 	$preferences = bluesky_get_preferences($uid);
+	if (empty($preferences) || empty($preferences->preferences)) {
+		return [];
+	}
 	foreach ($preferences->preferences as $preference) {
 		if ($preference->$type == 'app.bsky.actor.defs#savedFeedsPref') {
 			return $preference->pinned ?? [];
@@ -1727,7 +1731,7 @@ function bluesky_get_feeds(int $uid): array
 	return [];
 }
 
-function bluesky_get_preferences(int $uid): stdClass
+function bluesky_get_preferences(int $uid): ?stdClass
 {
 	$cachekey = 'bluesky:preferences:' . $uid;
 	$data = DI::cache()->get($cachekey);
@@ -1736,6 +1740,9 @@ function bluesky_get_preferences(int $uid): stdClass
 	}
 
 	$data = bluesky_xrpc_get($uid, 'app.bsky.actor.getPreferences');
+	if (empty($data)) {
+		return null;
+	}
 
 	DI::cache()->set($cachekey, $data, Duration::HOUR);
 	return $data;
@@ -1778,6 +1785,14 @@ function bluesky_get_did_by_dns(string $handle): string
 
 function bluesky_get_did(string $handle): string
 {
+	if ($handle == '') {
+		return '';
+	}
+
+	if (strpos($handle, '.') === false) {
+		$handle .= '.' . BLUESKY_HOSTNAME;
+	}
+
 	// Deactivated at the moment, since it isn't reliable by now
 	//$did = bluesky_get_did_by_dns($handle);
 	//if ($did != '') {

From 9525259fc8c74b89f2c5d8ac2aaf66392060470d Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 15 Jun 2024 13:51:47 +0000
Subject: [PATCH 091/294] Tumblr: Add link for quoted post

---
 tumblr/tumblr.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 04f6a0a4..f0c68f33 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -608,6 +608,15 @@ function tumblr_send_legacy(array $b)
 	$body = BBCode::removeShareInformation($b['body']);
 	$body = Post\Media::removeFromEndOfBody($body);
 
+	if (!empty($b['quote-uri-id'])) {
+		$quote = Post::selectFirstPost(['uri', 'plink'], ['uri-id' => $b['quote-uri-id']]);
+		if (!empty($quote)) {
+			if ((strpos($body, $quote['plink'] ?: $quote['uri']) === false) && (strpos($body, $quote['uri']) === false)) {
+				$body .= "\n[url]" . ($quote['plink'] ?: $quote['uri']) . "[/url]\n";
+			}
+		}
+	}
+
 	if ($photo !== false) {
 		$params['type'] = 'photo';
 		$params['caption'] = BBCode::convertForUriId($b['uri-id'], $body, BBCode::CONNECTORS);
@@ -648,7 +657,7 @@ function tumblr_send_legacy(array $b)
 	} else {
 		$params['type']  = 'text';
 		$params['title'] = $title;
-		$params['body']  = BBCode::convertForUriId($b['uri-id'], $b['body'], BBCode::CONNECTORS);
+		$params['body']  = BBCode::convertForUriId($b['uri-id'], $body, BBCode::CONNECTORS);
 	}
 
 	if (isset($params['caption']) && (trim($title) != '')) {

From af868f45ab6095a222b2133c210d31c9c220087d Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 16 Jun 2024 14:35:19 +0000
Subject: [PATCH 092/294] JS Uploader: "jpg" added to the list of allowed file
 extensions

---
 js_upload/js_upload.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index 786fc3c2..0d045dee 100644
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -50,7 +50,11 @@ function js_upload_post_init(array &$b)
 	// list of valid extensions
 	$allowedExtensions = [];
 	foreach (Images::IMAGETYPES as $type) {
-		$allowedExtensions[] = image_type_to_extension($type, false);
+		$extension = image_type_to_extension($type, false);
+		if ($extension == 'jpeg') {
+			$allowedExtensions[] = 'jpg';
+		}
+		$allowedExtensions[] = $extension;
 	}
 
 	// max file size in bytes
@@ -216,9 +220,9 @@ class qqFileUploader
 			return ['error' => DI::l10n()->t('Uploaded file is empty')];
 		}
 
-//		if ($size > $this->sizeLimit) {
-//			return array('error' => DI::l10n()->t('Uploaded file is too large'));
-//		}
+		//		if ($size > $this->sizeLimit) {
+		//			return array('error' => DI::l10n()->t('Uploaded file is too large'));
+		//		}
 
 		$maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
 

From 3e1b98d5d97a3c7a4c6e5fb28591293acfc0db89 Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sun, 16 Jun 2024 17:10:28 +0200
Subject: [PATCH 093/294] Leave failed image URLs in place

---
 mailstream/mailstream.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index b513cf36..4056aac6 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -220,6 +220,11 @@ function mailstream_do_images(array &$item, array &$attachments)
 		$cookiejar = tempnam(System::getTempPath(), 'cookiejar-mailstream-');
 		try {
 			$curlResult = DI::httpClient()->fetchFull($url, HttpClientAccept::DEFAULT, 0, $cookiejar);
+			if (!$curlResult->isSuccess()) {
+				Logger::debug('mailstream: fetch image url failed', [
+					'url' => $url, 'item_id' => $item['id'], 'return_code' => $curlResult->getReturnCode()]);
+				continue;
+			}
 		} catch (InvalidArgumentException $e) {
 			Logger::error('mailstream_do_images exception fetching url', ['url' => $url, 'item_id' => $item['id']]);
 			continue;

From 2789e880dc7f3a2614e9811a179dca291ae8a986 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Fri, 21 Jun 2024 20:38:42 +0200
Subject: [PATCH 094/294] translation updates

AR, CS, DE, IT, PL, SV for various addons
---
 advancedcontentfilter/lang/it/messages.po |  6 +-
 advancedcontentfilter/lang/it/strings.php |  1 +
 catavatar/lang/it/messages.po             | 50 ++++++-------
 catavatar/lang/it/strings.php             | 10 +--
 curweather/lang/it/messages.po            | 56 +++++++--------
 curweather/lang/it/strings.php            |  6 +-
 dwpost/lang/it/messages.po                | 46 ++++++------
 dwpost/lang/it/strings.php                | 11 ++-
 libertree/lang/it/messages.po             | 38 +++++-----
 libertree/lang/it/strings.php             |  7 +-
 mailstream/lang/de/messages.po            | 50 +++++++------
 mailstream/lang/de/strings.php            |  3 +-
 tumblr/lang/ar/messages.po                | 85 ++++++++++++++---------
 tumblr/lang/ar/strings.php                |  1 -
 tumblr/lang/cs/messages.po                | 61 ++++++++++------
 tumblr/lang/cs/strings.php                |  4 +-
 tumblr/lang/de/messages.po                | 67 +++++++++++-------
 tumblr/lang/de/strings.php                | 11 +--
 tumblr/lang/it/messages.po                | 63 +++++++++++------
 tumblr/lang/it/strings.php                |  5 +-
 tumblr/lang/pl/messages.po                | 65 ++++++++++-------
 tumblr/lang/pl/strings.php                |  5 +-
 tumblr/lang/sv/messages.po                | 63 +++++++++++------
 tumblr/lang/sv/strings.php                |  1 -
 24 files changed, 405 insertions(+), 310 deletions(-)

diff --git a/advancedcontentfilter/lang/it/messages.po b/advancedcontentfilter/lang/it/messages.po
index f32c5b94..325be52c 100644
--- a/advancedcontentfilter/lang/it/messages.po
+++ b/advancedcontentfilter/lang/it/messages.po
@@ -5,7 +5,7 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2018
-# Sylke Vicious <silkevicious@gmail.com>, 2021
+# Sylke Vicious <silkevicious@gmail.com>, 2023
 # 
 #, fuzzy
 msgid ""
@@ -14,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-05-11 08:54-0400\n"
 "PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2023\n"
 "Language-Team: Italian (https://app.transifex.com/Friendica/teams/12172/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -125,7 +125,7 @@ msgstr "Annulla"
 
 #: advancedcontentfilter.php:295
 msgid "This addon requires this node having at least one post"
-msgstr ""
+msgstr "Questo addon richiede che questo nodo abbia almeno un messaggio"
 
 #: advancedcontentfilter.php:325 advancedcontentfilter.php:336
 #: advancedcontentfilter.php:347 advancedcontentfilter.php:383
diff --git a/advancedcontentfilter/lang/it/strings.php b/advancedcontentfilter/lang/it/strings.php
index 5cc01739..d47d7a5a 100644
--- a/advancedcontentfilter/lang/it/strings.php
+++ b/advancedcontentfilter/lang/it/strings.php
@@ -27,6 +27,7 @@ $a->strings['Add new rule'] = 'Aggiungi nuova regola';
 $a->strings['Rule Name'] = 'Nome Regola';
 $a->strings['Rule Expression'] = 'Espressione Regola';
 $a->strings['Cancel'] = 'Annulla';
+$a->strings['This addon requires this node having at least one post'] = 'Questo addon richiede che questo nodo abbia almeno un messaggio';
 $a->strings['You must be logged in to use this method'] = 'Devi essere autenticato per usare questo metodo';
 $a->strings['Invalid form security token, please refresh the page.'] = 'Token di sicurezza invalido, aggiorna la pagina.';
 $a->strings['The rule name and expression are required.'] = 'Il nome e l\'espressione della regola sono richiesti.';
diff --git a/catavatar/lang/it/messages.po b/catavatar/lang/it/messages.po
index e05bd277..9155bb48 100644
--- a/catavatar/lang/it/messages.po
+++ b/catavatar/lang/it/messages.po
@@ -6,55 +6,55 @@
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2018
 # Davide Pesenti <mrjive@mrjive.it>, 2018
-# Sylke Vicious <silkevicious@gmail.com>, 2021
+# Sylke Vicious <silkevicious@gmail.com>, 2023
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-29 00:53+0000\n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
 "PO-Revision-Date: 2018-04-07 05:23+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
-"Language-Team: Italian (https://www.transifex.com/Friendica/teams/12172/it/)\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2023\n"
+"Language-Team: Italian (https://app.transifex.com/Friendica/teams/12172/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 #: catavatar.php:48
-msgid "Use Cat as Avatar"
-msgstr "Usa il Gatto come avatar"
-
-#: catavatar.php:49
-msgid "More Random Cat!"
-msgstr "Altro Gatto a caso!"
-
-#: catavatar.php:50
-msgid "Reset to email Cat"
-msgstr "Reimposta Gatto"
-
-#: catavatar.php:52
-msgid "Cat Avatar Settings"
-msgstr "Impostazioni Avatar Gatto"
-
-#: catavatar.php:53
 msgid "Set default profile avatar or randomize the cat."
 msgstr "Imposta l'immagine di profilo predefinita o crea un gatto casuale."
 
-#: catavatar.php:78
+#: catavatar.php:53
+msgid "Cat Avatar Settings"
+msgstr "Impostazioni Avatar Gatto"
+
+#: catavatar.php:56
+msgid "Use Cat as Avatar"
+msgstr "Usa il Gatto come avatar"
+
+#: catavatar.php:57
+msgid "Another random Cat!"
+msgstr "Un altro Gatto casuale!"
+
+#: catavatar.php:58
+msgid "Reset to email Cat"
+msgstr "Reimposta Gatto"
+
+#: catavatar.php:77
 msgid "The cat hadn't found itself."
 msgstr "Il gatto non ha trovato sé stesso."
 
-#: catavatar.php:87
+#: catavatar.php:86
 msgid "There was an error, the cat ran away."
 msgstr "Si è verificato un errore, il gatto è scappato."
 
-#: catavatar.php:93
+#: catavatar.php:92
 msgid "Profile Photos"
 msgstr "Foto del profilo"
 
-#: catavatar.php:108
+#: catavatar.php:102
 msgid "Meow!"
 msgstr "Miao!"
diff --git a/catavatar/lang/it/strings.php b/catavatar/lang/it/strings.php
index 3a33374a..8f78b3fe 100644
--- a/catavatar/lang/it/strings.php
+++ b/catavatar/lang/it/strings.php
@@ -3,13 +3,13 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return intval($n != 1);
+	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
-$a->strings['Use Cat as Avatar'] = 'Usa il Gatto come avatar';
-$a->strings['More Random Cat!'] = 'Altro Gatto a caso!';
-$a->strings['Reset to email Cat'] = 'Reimposta Gatto';
-$a->strings['Cat Avatar Settings'] = 'Impostazioni Avatar Gatto';
 $a->strings['Set default profile avatar or randomize the cat.'] = 'Imposta l\'immagine di profilo predefinita o crea un gatto casuale.';
+$a->strings['Cat Avatar Settings'] = 'Impostazioni Avatar Gatto';
+$a->strings['Use Cat as Avatar'] = 'Usa il Gatto come avatar';
+$a->strings['Another random Cat!'] = 'Un altro Gatto casuale!';
+$a->strings['Reset to email Cat'] = 'Reimposta Gatto';
 $a->strings['The cat hadn\'t found itself.'] = 'Il gatto non ha trovato sé stesso.';
 $a->strings['There was an error, the cat ran away.'] = 'Si è verificato un errore, il gatto è scappato.';
 $a->strings['Profile Photos'] = 'Foto del profilo';
diff --git a/curweather/lang/it/messages.po b/curweather/lang/it/messages.po
index 5a7e2cac..c53b3a6e 100644
--- a/curweather/lang/it/messages.po
+++ b/curweather/lang/it/messages.po
@@ -5,27 +5,27 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015
-# Sylke Vicious <silkevicious@gmail.com>, 2021
+# Sylke Vicious <silkevicious@gmail.com>, 2021,2023
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-16 12:57+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-22 11:34+0000\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021,2023\n"
+"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 #: curweather.php:47
 msgid "Error fetching weather data. Error was: "
 msgstr "Errore durante il recupero dei dati meteo. L'errore è stato:"
 
-#: curweather.php:130 curweather.php:192
+#: curweather.php:130
 msgid "Current Weather"
 msgstr "Meteo"
 
@@ -61,66 +61,66 @@ msgstr "C'è stato un problema accedendo ai dati meteo, ma dai un'occhiata"
 msgid "at OpenWeatherMap"
 msgstr "a OpenWeatherMap"
 
-#: curweather.php:179
+#: curweather.php:178
 msgid "No APPID found, please contact your admin to obtain one."
 msgstr "APPID non trovata, contatta il tuo amministratore per averne una."
 
-#: curweather.php:191 curweather.php:229
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
-
-#: curweather.php:192
-msgid "Settings"
-msgstr "Impostazioni"
-
-#: curweather.php:194
+#: curweather.php:188
 msgid "Enter either the name of your location or the zip code."
 msgstr "Inserisci il nome della tua posizione o il CAP"
 
-#: curweather.php:195
+#: curweather.php:189
 msgid "Your Location"
 msgstr "La tua Posizione"
 
-#: curweather.php:195
+#: curweather.php:189
 msgid ""
 "Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
 "<em>14476,DE</em>."
 msgstr "Identificatore della tua posizione (nome o CAP), p.e. <em>Roma, IT</em> or <em>00186,IT</em>."
 
-#: curweather.php:196
+#: curweather.php:190
 msgid "Units"
 msgstr "Unità"
 
-#: curweather.php:196
+#: curweather.php:190
 msgid "select if the temperature should be displayed in &deg;C or &deg;F"
 msgstr "scegli se la temperatura deve essere mostrata in °C o in °F"
 
-#: curweather.php:197
+#: curweather.php:191
 msgid "Show weather data"
 msgstr "Mostra dati meteo"
 
-#: curweather.php:232
+#: curweather.php:196
+msgid "Current Weather Settings"
+msgstr "Impostazioni Meteo"
+
+#: curweather.php:227
+msgid "Save Settings"
+msgstr "Salva Impostazioni"
+
+#: curweather.php:230
 msgid "Caching Interval"
 msgstr "Intervallo di cache"
 
-#: curweather.php:234
+#: curweather.php:232
 msgid ""
 "For how long should the weather data be cached? Choose according your "
 "OpenWeatherMap account type."
 msgstr "Per quanto tempo i dati meteo devono essere memorizzati? Scegli a seconda del tuo tipo di account su OpenWeatherMap."
 
-#: curweather.php:235
+#: curweather.php:233
 msgid "no cache"
 msgstr "nessuna cache"
 
-#: curweather.php:236 curweather.php:237 curweather.php:238 curweather.php:239
+#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
 msgid "minutes"
 msgstr "minuti"
 
-#: curweather.php:242
+#: curweather.php:240
 msgid "Your APPID"
 msgstr "Il tuo APPID"
 
-#: curweather.php:242
+#: curweather.php:240
 msgid "Your API key provided by OpenWeatherMap"
 msgstr "La tua chiave API da OpenWeatherMap"
diff --git a/curweather/lang/it/strings.php b/curweather/lang/it/strings.php
index a497dace..6c651e1b 100644
--- a/curweather/lang/it/strings.php
+++ b/curweather/lang/it/strings.php
@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return intval($n != 1);
+	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
 $a->strings['Error fetching weather data. Error was: '] = 'Errore durante il recupero dei dati meteo. L\'errore è stato:';
 $a->strings['Current Weather'] = 'Meteo';
@@ -16,14 +16,14 @@ $a->strings['Show on map'] = 'Mostra sulla mappa';
 $a->strings['There was a problem accessing the weather data. But have a look'] = 'C\'è stato un problema accedendo ai dati meteo, ma dai un\'occhiata';
 $a->strings['at OpenWeatherMap'] = 'a OpenWeatherMap';
 $a->strings['No APPID found, please contact your admin to obtain one.'] = 'APPID non trovata, contatta il tuo amministratore per averne una.';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
-$a->strings['Settings'] = 'Impostazioni';
 $a->strings['Enter either the name of your location or the zip code.'] = 'Inserisci il nome della tua posizione o il CAP';
 $a->strings['Your Location'] = 'La tua Posizione';
 $a->strings['Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.'] = 'Identificatore della tua posizione (nome o CAP), p.e. <em>Roma, IT</em> or <em>00186,IT</em>.';
 $a->strings['Units'] = 'Unità';
 $a->strings['select if the temperature should be displayed in &deg;C or &deg;F'] = 'scegli se la temperatura deve essere mostrata in °C o in °F';
 $a->strings['Show weather data'] = 'Mostra dati meteo';
+$a->strings['Current Weather Settings'] = 'Impostazioni Meteo';
+$a->strings['Save Settings'] = 'Salva Impostazioni';
 $a->strings['Caching Interval'] = 'Intervallo di cache';
 $a->strings['For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'] = 'Per quanto tempo i dati meteo devono essere memorizzati? Scegli a seconda del tuo tipo di account su OpenWeatherMap.';
 $a->strings['no cache'] = 'nessuna cache';
diff --git a/dwpost/lang/it/messages.po b/dwpost/lang/it/messages.po
index 5f7c2ee2..a5a79d47 100644
--- a/dwpost/lang/it/messages.po
+++ b/dwpost/lang/it/messages.po
@@ -5,45 +5,41 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014,2018
-# Sylke Vicious <silkevicious@gmail.com>, 2020-2021
+# Sylke Vicious <silkevicious@gmail.com>, 2020-2021,2023
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-16 12:55+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"PO-Revision-Date: 2014-06-22 11:41+0000\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2020-2021,2023\n"
+"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: dwpost.php:41
+#: dwpost.php:43
 msgid "Post to Dreamwidth"
 msgstr "Invia a Dreamwidth"
 
-#: dwpost.php:72 dwpost.php:76
-msgid "Dreamwidth Export"
-msgstr "Esporta Dreamwidth"
+#: dwpost.php:63
+msgid "Enable Dreamwidth Post Addon"
+msgstr "Abilita il componente aggiuntivo di pubblicazione Dreamwidth"
 
-#: dwpost.php:80
-msgid "Enable dreamwidth Post Addon"
-msgstr "Abilita il componente aggiuntivo di invio a Dreamwidth"
-
-#: dwpost.php:85
-msgid "dreamwidth username"
+#: dwpost.php:64
+msgid "Dreamwidth username"
 msgstr "Nome utente Dreamwidth"
 
-#: dwpost.php:90
-msgid "dreamwidth password"
-msgstr "password Dreamwidth"
+#: dwpost.php:65
+msgid "Dreamwidth password"
+msgstr "Password Dreamwidth"
 
-#: dwpost.php:95
-msgid "Post to dreamwidth by default"
-msgstr "Invia sempre a Dreamwidth"
+#: dwpost.php:66
+msgid "Post to Dreamwidth by default"
+msgstr "Pubblica su dreamwidth per impostazione predefinita"
 
-#: dwpost.php:100
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
+#: dwpost.php:71
+msgid "Dreamwidth Export"
+msgstr "Esporta Dreamwidth"
diff --git a/dwpost/lang/it/strings.php b/dwpost/lang/it/strings.php
index 0234c1f7..22ecc7b1 100644
--- a/dwpost/lang/it/strings.php
+++ b/dwpost/lang/it/strings.php
@@ -3,12 +3,11 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return intval($n != 1);
+	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
 $a->strings['Post to Dreamwidth'] = 'Invia a Dreamwidth';
+$a->strings['Enable Dreamwidth Post Addon'] = 'Abilita il componente aggiuntivo di pubblicazione Dreamwidth';
+$a->strings['Dreamwidth username'] = 'Nome utente Dreamwidth';
+$a->strings['Dreamwidth password'] = 'Password Dreamwidth';
+$a->strings['Post to Dreamwidth by default'] = 'Pubblica su dreamwidth per impostazione predefinita';
 $a->strings['Dreamwidth Export'] = 'Esporta Dreamwidth';
-$a->strings['Enable dreamwidth Post Addon'] = 'Abilita il componente aggiuntivo di invio a Dreamwidth';
-$a->strings['dreamwidth username'] = 'Nome utente Dreamwidth';
-$a->strings['dreamwidth password'] = 'password Dreamwidth';
-$a->strings['Post to dreamwidth by default'] = 'Invia sempre a Dreamwidth';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
diff --git a/libertree/lang/it/messages.po b/libertree/lang/it/messages.po
index 7c3bc1ec..cc890cc5 100644
--- a/libertree/lang/it/messages.po
+++ b/libertree/lang/it/messages.po
@@ -5,45 +5,41 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2018
-# Sylke Vicious <silkevicious@gmail.com>, 2021
+# Sylke Vicious <silkevicious@gmail.com>, 2021,2023
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-16 12:47+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2023-06-03 15:49-0400\n"
+"PO-Revision-Date: 2014-06-23 09:44+0000\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021,2023\n"
+"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: libertree.php:37
+#: libertree.php:39
 msgid "Post to libertree"
 msgstr "Invia a Libertree"
 
-#: libertree.php:71 libertree.php:75
-msgid "libertree Export"
-msgstr "Esporta libertree"
-
-#: libertree.php:79
+#: libertree.php:59
 msgid "Enable Libertree Post Addon"
 msgstr "Abilita il componente aggiuntivo di invio a Libertree"
 
-#: libertree.php:84
-msgid "Libertree API token"
-msgstr "Token API Libertree"
-
-#: libertree.php:89
+#: libertree.php:60
 msgid "Libertree site URL"
 msgstr "Indirizzo sito Libertree"
 
-#: libertree.php:94
+#: libertree.php:61
+msgid "Libertree API token"
+msgstr "Token API Libertree"
+
+#: libertree.php:62
 msgid "Post to Libertree by default"
 msgstr "Invia sempre a Libertree"
 
-#: libertree.php:100
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
+#: libertree.php:67
+msgid "Libertree Export"
+msgstr "Esporta Libertree"
diff --git a/libertree/lang/it/strings.php b/libertree/lang/it/strings.php
index 02d26542..8abcfa2d 100644
--- a/libertree/lang/it/strings.php
+++ b/libertree/lang/it/strings.php
@@ -3,12 +3,11 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return intval($n != 1);
+	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
 $a->strings['Post to libertree'] = 'Invia a Libertree';
-$a->strings['libertree Export'] = 'Esporta libertree';
 $a->strings['Enable Libertree Post Addon'] = 'Abilita il componente aggiuntivo di invio a Libertree';
-$a->strings['Libertree API token'] = 'Token API Libertree';
 $a->strings['Libertree site URL'] = 'Indirizzo sito Libertree';
+$a->strings['Libertree API token'] = 'Token API Libertree';
 $a->strings['Post to Libertree by default'] = 'Invia sempre a Libertree';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
+$a->strings['Libertree Export'] = 'Esporta Libertree';
diff --git a/mailstream/lang/de/messages.po b/mailstream/lang/de/messages.po
index 236e7d0e..cd55d952 100644
--- a/mailstream/lang/de/messages.po
+++ b/mailstream/lang/de/messages.po
@@ -5,16 +5,18 @@
 # 
 # Translators:
 # Andreas H., 2014
+# foss <oss@disr.it>, 2022
+# Raroun, 2023
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018
 # Ulf Rompe <transifex.com@rompe.org>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-11 19:13+0100\n"
-"PO-Revision-Date: 2019-02-18 15:05+0000\n"
-"Last-Translator: Ulf Rompe <transifex.com@rompe.org>\n"
-"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2021-11-21 19:15-0500\n"
+"PO-Revision-Date: 2014-06-23 09:54+0000\n"
+"Last-Translator: Raroun, 2023\n"
+"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,72 +31,76 @@ msgstr "Absender"
 msgid "Email address that stream items will appear to be from."
 msgstr "E-Mail-Adresse, die in hochgeladenen Artikeln erscheint."
 
-#: mailstream.php:82 mailstream.php:380
+#: mailstream.php:82
 msgid "Save Settings"
 msgstr "Einstellungen speichern"
 
-#: mailstream.php:223
+#: mailstream.php:311
 msgid "Re:"
 msgstr "Re:"
 
-#: mailstream.php:231
+#: mailstream.php:324 mailstream.php:327
 msgid "Friendica post"
 msgstr "Friendica-Veröffentlichung"
 
-#: mailstream.php:234
+#: mailstream.php:330
 msgid "Diaspora post"
 msgstr "Diaspora-Veröffentlichung"
 
-#: mailstream.php:244
+#: mailstream.php:340
 msgid "Feed item"
 msgstr "Artikel-Feed"
 
-#: mailstream.php:247
+#: mailstream.php:343
 msgid "Email"
 msgstr "E-Mail"
 
-#: mailstream.php:249
+#: mailstream.php:345
 msgid "Friendica Item"
 msgstr "Friendica-Artikel"
 
-#: mailstream.php:293
+#: mailstream.php:419
 msgid "Upstream"
 msgstr "Upstream"
 
-#: mailstream.php:294
+#: mailstream.php:420
+msgid "URI"
+msgstr "URI"
+
+#: mailstream.php:421
 msgid "Local"
 msgstr "Lokal"
 
-#: mailstream.php:362
+#: mailstream.php:499
 msgid "Enabled"
-msgstr "eingeschaltet"
+msgstr "Aktiv"
 
-#: mailstream.php:366
+#: mailstream.php:504
 msgid "Email Address"
 msgstr "E-Mail-Adresse"
 
-#: mailstream.php:368
+#: mailstream.php:506
 msgid "Leave blank to use your account email address"
 msgstr "Leer lassen für deine Konto-E-Mail-Addresse"
 
-#: mailstream.php:371
+#: mailstream.php:510
 msgid "Exclude Likes"
 msgstr "Likes ignorieren"
 
-#: mailstream.php:373
+#: mailstream.php:512
 msgid "Check this to omit mailing \"Like\" notifications"
 msgstr "Diese Option verhindert das Versenden von \"Like\"-Benachrichtigungen per E-Mail."
 
-#: mailstream.php:376
+#: mailstream.php:516
 msgid "Attach Images"
 msgstr "Bilder anhängen"
 
-#: mailstream.php:378
+#: mailstream.php:518
 msgid ""
 "Download images in posts and attach them to the email.  Useful for reading "
 "email while offline."
 msgstr "Sollen Bilder, die im Beitrag eingebettet sind, als Dateianhang in den E-Mails verschickt werden?"
 
-#: mailstream.php:379
+#: mailstream.php:525
 msgid "Mail Stream Settings"
 msgstr "Mail-Nachrichten-Einstellungen"
diff --git a/mailstream/lang/de/strings.php b/mailstream/lang/de/strings.php
index 80f9a7a2..e107b7d0 100644
--- a/mailstream/lang/de/strings.php
+++ b/mailstream/lang/de/strings.php
@@ -15,8 +15,9 @@ $a->strings['Feed item'] = 'Artikel-Feed';
 $a->strings['Email'] = 'E-Mail';
 $a->strings['Friendica Item'] = 'Friendica-Artikel';
 $a->strings['Upstream'] = 'Upstream';
+$a->strings['URI'] = 'URI';
 $a->strings['Local'] = 'Lokal';
-$a->strings['Enabled'] = 'eingeschaltet';
+$a->strings['Enabled'] = 'Aktiv';
 $a->strings['Email Address'] = 'E-Mail-Adresse';
 $a->strings['Leave blank to use your account email address'] = 'Leer lassen für deine Konto-E-Mail-Addresse';
 $a->strings['Exclude Likes'] = 'Likes ignorieren';
diff --git a/tumblr/lang/ar/messages.po b/tumblr/lang/ar/messages.po
index 7879231d..48a9e8cb 100644
--- a/tumblr/lang/ar/messages.po
+++ b/tumblr/lang/ar/messages.po
@@ -8,64 +8,81 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-25 13:15+0000\n"
-"PO-Revision-Date: 2021-02-20 00:23+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
+"POT-Creation-Date: 2023-04-29 06:56+0000\n"
+"PO-Revision-Date: 2014-06-23 12:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://app.transifex.com/Friendica/friendica/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: tumblr.php:40
+#: tumblr.php:243
 msgid "Permission denied."
 msgstr "الطلب مرفوض."
 
-#: tumblr.php:70 tumblr.php:284
+#: tumblr.php:296
 msgid "Save Settings"
 msgstr "Save Settings"
 
-#: tumblr.php:72
+#: tumblr.php:297
 msgid "Consumer Key"
 msgstr ""
 
-#: tumblr.php:73
+#: tumblr.php:298
 msgid "Consumer Secret"
 msgstr ""
 
-#: tumblr.php:178
-msgid "You are now authenticated to tumblr."
+#: tumblr.php:299
+msgid "Maximum tags"
 msgstr ""
 
-#: tumblr.php:179
-msgid "return to the connector page"
-msgstr "الرجوع إلى صفحة الموصل"
-
-#: tumblr.php:195
-msgid "Post to Tumblr"
+#: tumblr.php:299
+msgid ""
+"Maximum number of tags that a user can follow. Enter 0 to deactivate the "
+"feature."
 msgstr ""
 
-#: tumblr.php:225 tumblr.php:229
-msgid "Tumblr Export"
-msgstr ""
-
-#: tumblr.php:233
-msgid "(Re-)Authenticate your tumblr page"
-msgstr ""
-
-#: tumblr.php:237
-msgid "Enable Tumblr Post Addon"
-msgstr ""
-
-#: tumblr.php:243
-msgid "Post to Tumblr by default"
-msgstr ""
-
-#: tumblr.php:264
+#: tumblr.php:336
 msgid "Post to page:"
 msgstr ""
 
-#: tumblr.php:278
+#: tumblr.php:342
+msgid "(Re-)Authenticate your tumblr page"
+msgstr ""
+
+#: tumblr.php:343
 msgid "You are not authenticated to tumblr"
 msgstr ""
+
+#: tumblr.php:348
+msgid "Enable Tumblr Post Addon"
+msgstr ""
+
+#: tumblr.php:349
+msgid "Post to Tumblr by default"
+msgstr ""
+
+#: tumblr.php:350
+msgid "Import the remote timeline"
+msgstr ""
+
+#: tumblr.php:351
+msgid "Subscribed tags"
+msgstr ""
+
+#: tumblr.php:351
+#, php-format
+msgid ""
+"Comma separated list of up to %d tags that will be imported additionally to "
+"the timeline"
+msgstr ""
+
+#: tumblr.php:357
+msgid "Tumblr Import/Export"
+msgstr ""
+
+#: tumblr.php:375
+msgid "Post to Tumblr"
+msgstr ""
diff --git a/tumblr/lang/ar/strings.php b/tumblr/lang/ar/strings.php
index ffd3337c..3f7ca4e4 100644
--- a/tumblr/lang/ar/strings.php
+++ b/tumblr/lang/ar/strings.php
@@ -7,4 +7,3 @@ function string_plural_select_ar($n){
 }}
 $a->strings['Permission denied.'] = 'الطلب مرفوض.';
 $a->strings['Save Settings'] = 'Save Settings';
-$a->strings['return to the connector page'] = 'الرجوع إلى صفحة الموصل';
diff --git a/tumblr/lang/cs/messages.po b/tumblr/lang/cs/messages.po
index 4e031be6..cb6f91e6 100644
--- a/tumblr/lang/cs/messages.po
+++ b/tumblr/lang/cs/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"POT-Creation-Date: 2023-04-29 06:56+0000\n"
 "PO-Revision-Date: 2014-06-23 12:58+0000\n"
 "Last-Translator: Aditoo, 2018\n"
 "Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
@@ -21,54 +21,71 @@ msgstr ""
 "Language: cs\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: tumblr.php:39
+#: tumblr.php:243
 msgid "Permission denied."
 msgstr "Přístup odmítnut."
 
-#: tumblr.php:69
+#: tumblr.php:296
 msgid "Save Settings"
 msgstr ""
 
-#: tumblr.php:71
+#: tumblr.php:297
 msgid "Consumer Key"
 msgstr ""
 
-#: tumblr.php:72
+#: tumblr.php:298
 msgid "Consumer Secret"
 msgstr ""
 
-#: tumblr.php:177
-msgid "You are now authenticated to tumblr."
-msgstr "Nyní jste přihlášen/a k Tumblr."
+#: tumblr.php:299
+msgid "Maximum tags"
+msgstr ""
 
-#: tumblr.php:178
-msgid "return to the connector page"
-msgstr "návrat ke stránce konektor"
+#: tumblr.php:299
+msgid ""
+"Maximum number of tags that a user can follow. Enter 0 to deactivate the "
+"feature."
+msgstr ""
 
-#: tumblr.php:194
-msgid "Post to Tumblr"
-msgstr "Posílat na Tumblr"
-
-#: tumblr.php:225
+#: tumblr.php:336
 msgid "Post to page:"
 msgstr "Posílat na stránku:"
 
-#: tumblr.php:231
+#: tumblr.php:342
 msgid "(Re-)Authenticate your tumblr page"
 msgstr "(Znovu) přihlásit k Vaší stránce Tumblr"
 
-#: tumblr.php:232
+#: tumblr.php:343
 msgid "You are not authenticated to tumblr"
 msgstr "Nyní nejste přihlášen/a k Tumblr."
 
-#: tumblr.php:237
+#: tumblr.php:348
 msgid "Enable Tumblr Post Addon"
 msgstr "Povolit doplněk Tumblr Post"
 
-#: tumblr.php:238
+#: tumblr.php:349
 msgid "Post to Tumblr by default"
 msgstr "Ve výchozím stavu posílat příspěvky na Tumblr"
 
-#: tumblr.php:244
-msgid "Tumblr Export"
+#: tumblr.php:350
+msgid "Import the remote timeline"
 msgstr ""
+
+#: tumblr.php:351
+msgid "Subscribed tags"
+msgstr ""
+
+#: tumblr.php:351
+#, php-format
+msgid ""
+"Comma separated list of up to %d tags that will be imported additionally to "
+"the timeline"
+msgstr ""
+
+#: tumblr.php:357
+msgid "Tumblr Import/Export"
+msgstr ""
+
+#: tumblr.php:375
+msgid "Post to Tumblr"
+msgstr "Posílat na Tumblr"
diff --git a/tumblr/lang/cs/strings.php b/tumblr/lang/cs/strings.php
index 2f5f8115..3135b0b8 100644
--- a/tumblr/lang/cs/strings.php
+++ b/tumblr/lang/cs/strings.php
@@ -6,11 +6,9 @@ function string_plural_select_cs($n){
 	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
 }}
 $a->strings['Permission denied.'] = 'Přístup odmítnut.';
-$a->strings['You are now authenticated to tumblr.'] = 'Nyní jste přihlášen/a k Tumblr.';
-$a->strings['return to the connector page'] = 'návrat ke stránce konektor';
-$a->strings['Post to Tumblr'] = 'Posílat na Tumblr';
 $a->strings['Post to page:'] = 'Posílat na stránku:';
 $a->strings['(Re-)Authenticate your tumblr page'] = '(Znovu) přihlásit k Vaší stránce Tumblr';
 $a->strings['You are not authenticated to tumblr'] = 'Nyní nejste přihlášen/a k Tumblr.';
 $a->strings['Enable Tumblr Post Addon'] = 'Povolit doplněk Tumblr Post';
 $a->strings['Post to Tumblr by default'] = 'Ve výchozím stavu posílat příspěvky na Tumblr';
+$a->strings['Post to Tumblr'] = 'Posílat na Tumblr';
diff --git a/tumblr/lang/de/messages.po b/tumblr/lang/de/messages.po
index 8056174d..c41ba45f 100644
--- a/tumblr/lang/de/messages.po
+++ b/tumblr/lang/de/messages.po
@@ -4,6 +4,8 @@
 # 
 # 
 # Translators:
+# Raroun, 2023
+# Raroun, 2023
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014-2015
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021
 # Ulf Rompe <transifex.com@rompe.org>, 2019
@@ -11,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"POT-Creation-Date: 2023-04-29 06:56+0000\n"
 "PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021\n"
+"Last-Translator: Raroun, 2023\n"
 "Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,54 +23,71 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tumblr.php:39
+#: tumblr.php:243
 msgid "Permission denied."
 msgstr "Zugriff verweigert."
 
-#: tumblr.php:69
+#: tumblr.php:296
 msgid "Save Settings"
 msgstr "Einstellungen speichern"
 
-#: tumblr.php:71
+#: tumblr.php:297
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: tumblr.php:72
+#: tumblr.php:298
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: tumblr.php:177
-msgid "You are now authenticated to tumblr."
-msgstr "Du bist nun auf tumblr authentifiziert."
+#: tumblr.php:299
+msgid "Maximum tags"
+msgstr "Maximale Anzahl an Tags"
 
-#: tumblr.php:178
-msgid "return to the connector page"
-msgstr "zurück zur Connector-Seite"
+#: tumblr.php:299
+msgid ""
+"Maximum number of tags that a user can follow. Enter 0 to deactivate the "
+"feature."
+msgstr "Maximale Anzahl von Tags, die ein Benutzer verfolgen kann. Geben Sie 0 ein, um die Funktion zu deaktivieren."
 
-#: tumblr.php:194
-msgid "Post to Tumblr"
-msgstr "Auf Tumblr veröffentlichen"
-
-#: tumblr.php:225
+#: tumblr.php:336
 msgid "Post to page:"
 msgstr "Auf tumblr veröffentlichen"
 
-#: tumblr.php:231
+#: tumblr.php:342
 msgid "(Re-)Authenticate your tumblr page"
 msgstr "(Re-)Authentifizierung deiner tumblr-Seite"
 
-#: tumblr.php:232
+#: tumblr.php:343
 msgid "You are not authenticated to tumblr"
 msgstr "Du bist gegenüber tumblr nicht authentifiziert"
 
-#: tumblr.php:237
+#: tumblr.php:348
 msgid "Enable Tumblr Post Addon"
 msgstr "Tumblr-Post-Addon aktivieren"
 
-#: tumblr.php:238
+#: tumblr.php:349
 msgid "Post to Tumblr by default"
 msgstr "Standardmäßig bei Tumblr veröffentlichen"
 
-#: tumblr.php:244
-msgid "Tumblr Export"
-msgstr "Tumblr Export"
+#: tumblr.php:350
+msgid "Import the remote timeline"
+msgstr "Importiere die entfernte Timeline"
+
+#: tumblr.php:351
+msgid "Subscribed tags"
+msgstr "Abonnierte Tags"
+
+#: tumblr.php:351
+#, php-format
+msgid ""
+"Comma separated list of up to %d tags that will be imported additionally to "
+"the timeline"
+msgstr "Durch Kommata getrennte Liste von bis zu  %d Tags, die zusätzlich in die Timeline importiert werden sollen"
+
+#: tumblr.php:357
+msgid "Tumblr Import/Export"
+msgstr "Tumblr Import/Export"
+
+#: tumblr.php:375
+msgid "Post to Tumblr"
+msgstr "Auf Tumblr veröffentlichen"
diff --git a/tumblr/lang/de/strings.php b/tumblr/lang/de/strings.php
index ce43615c..ed9af957 100644
--- a/tumblr/lang/de/strings.php
+++ b/tumblr/lang/de/strings.php
@@ -9,12 +9,15 @@ $a->strings['Permission denied.'] = 'Zugriff verweigert.';
 $a->strings['Save Settings'] = 'Einstellungen speichern';
 $a->strings['Consumer Key'] = 'Consumer Key';
 $a->strings['Consumer Secret'] = 'Consumer Secret';
-$a->strings['You are now authenticated to tumblr.'] = 'Du bist nun auf tumblr authentifiziert.';
-$a->strings['return to the connector page'] = 'zurück zur Connector-Seite';
-$a->strings['Post to Tumblr'] = 'Auf Tumblr veröffentlichen';
+$a->strings['Maximum tags'] = 'Maximale Anzahl an Tags';
+$a->strings['Maximum number of tags that a user can follow. Enter 0 to deactivate the feature.'] = 'Maximale Anzahl von Tags, die ein Benutzer verfolgen kann. Geben Sie 0 ein, um die Funktion zu deaktivieren.';
 $a->strings['Post to page:'] = 'Auf tumblr veröffentlichen';
 $a->strings['(Re-)Authenticate your tumblr page'] = '(Re-)Authentifizierung deiner tumblr-Seite';
 $a->strings['You are not authenticated to tumblr'] = 'Du bist gegenüber tumblr nicht authentifiziert';
 $a->strings['Enable Tumblr Post Addon'] = 'Tumblr-Post-Addon aktivieren';
 $a->strings['Post to Tumblr by default'] = 'Standardmäßig bei Tumblr veröffentlichen';
-$a->strings['Tumblr Export'] = 'Tumblr Export';
+$a->strings['Import the remote timeline'] = 'Importiere die entfernte Timeline';
+$a->strings['Subscribed tags'] = 'Abonnierte Tags';
+$a->strings['Comma separated list of up to %d tags that will be imported additionally to the timeline'] = 'Durch Kommata getrennte Liste von bis zu  %d Tags, die zusätzlich in die Timeline importiert werden sollen';
+$a->strings['Tumblr Import/Export'] = 'Tumblr Import/Export';
+$a->strings['Post to Tumblr'] = 'Auf Tumblr veröffentlichen';
diff --git a/tumblr/lang/it/messages.po b/tumblr/lang/it/messages.po
index f3d1df55..0f7e2237 100644
--- a/tumblr/lang/it/messages.po
+++ b/tumblr/lang/it/messages.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"POT-Creation-Date: 2023-04-29 06:56+0000\n"
 "PO-Revision-Date: 2014-06-23 12:58+0000\n"
 "Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
 "Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
@@ -20,54 +20,71 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: tumblr.php:39
+#: tumblr.php:243
 msgid "Permission denied."
 msgstr "Permesso negato."
 
-#: tumblr.php:69
+#: tumblr.php:296
 msgid "Save Settings"
 msgstr "Salva Impostazioni"
 
-#: tumblr.php:71
+#: tumblr.php:297
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: tumblr.php:72
+#: tumblr.php:298
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: tumblr.php:177
-msgid "You are now authenticated to tumblr."
-msgstr "Sei autenticato su Tumblr."
+#: tumblr.php:299
+msgid "Maximum tags"
+msgstr ""
 
-#: tumblr.php:178
-msgid "return to the connector page"
-msgstr "ritorna alla pagina del connettore"
+#: tumblr.php:299
+msgid ""
+"Maximum number of tags that a user can follow. Enter 0 to deactivate the "
+"feature."
+msgstr ""
 
-#: tumblr.php:194
-msgid "Post to Tumblr"
-msgstr "Invia a Tumblr"
-
-#: tumblr.php:225
+#: tumblr.php:336
 msgid "Post to page:"
 msgstr "Invia alla pagina:"
 
-#: tumblr.php:231
+#: tumblr.php:342
 msgid "(Re-)Authenticate your tumblr page"
 msgstr "(Ri)Autenticati con la tua pagina Tumblr"
 
-#: tumblr.php:232
+#: tumblr.php:343
 msgid "You are not authenticated to tumblr"
 msgstr "Non sei autenticato su Tumblr"
 
-#: tumblr.php:237
+#: tumblr.php:348
 msgid "Enable Tumblr Post Addon"
 msgstr "Abilita componente aggiuntivo di invio a Tumblr"
 
-#: tumblr.php:238
+#: tumblr.php:349
 msgid "Post to Tumblr by default"
 msgstr "Invia sempre a Tumblr"
 
-#: tumblr.php:244
-msgid "Tumblr Export"
-msgstr "Esporta Tumblr"
+#: tumblr.php:350
+msgid "Import the remote timeline"
+msgstr ""
+
+#: tumblr.php:351
+msgid "Subscribed tags"
+msgstr ""
+
+#: tumblr.php:351
+#, php-format
+msgid ""
+"Comma separated list of up to %d tags that will be imported additionally to "
+"the timeline"
+msgstr ""
+
+#: tumblr.php:357
+msgid "Tumblr Import/Export"
+msgstr ""
+
+#: tumblr.php:375
+msgid "Post to Tumblr"
+msgstr "Invia a Tumblr"
diff --git a/tumblr/lang/it/strings.php b/tumblr/lang/it/strings.php
index d4d4e257..e58ab31c 100644
--- a/tumblr/lang/it/strings.php
+++ b/tumblr/lang/it/strings.php
@@ -9,12 +9,9 @@ $a->strings['Permission denied.'] = 'Permesso negato.';
 $a->strings['Save Settings'] = 'Salva Impostazioni';
 $a->strings['Consumer Key'] = 'Consumer Key';
 $a->strings['Consumer Secret'] = 'Consumer Secret';
-$a->strings['You are now authenticated to tumblr.'] = 'Sei autenticato su Tumblr.';
-$a->strings['return to the connector page'] = 'ritorna alla pagina del connettore';
-$a->strings['Post to Tumblr'] = 'Invia a Tumblr';
 $a->strings['Post to page:'] = 'Invia alla pagina:';
 $a->strings['(Re-)Authenticate your tumblr page'] = '(Ri)Autenticati con la tua pagina Tumblr';
 $a->strings['You are not authenticated to tumblr'] = 'Non sei autenticato su Tumblr';
 $a->strings['Enable Tumblr Post Addon'] = 'Abilita componente aggiuntivo di invio a Tumblr';
 $a->strings['Post to Tumblr by default'] = 'Invia sempre a Tumblr';
-$a->strings['Tumblr Export'] = 'Esporta Tumblr';
+$a->strings['Post to Tumblr'] = 'Invia a Tumblr';
diff --git a/tumblr/lang/pl/messages.po b/tumblr/lang/pl/messages.po
index 27a44e15..a8676455 100644
--- a/tumblr/lang/pl/messages.po
+++ b/tumblr/lang/pl/messages.po
@@ -10,64 +10,81 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"POT-Creation-Date: 2023-04-29 06:56+0000\n"
 "PO-Revision-Date: 2014-06-23 12:58+0000\n"
 "Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
-"Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
+"Language-Team: Polish (http://app.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: tumblr.php:39
+#: tumblr.php:243
 msgid "Permission denied."
 msgstr "Odmowa dostępu."
 
-#: tumblr.php:69
+#: tumblr.php:296
 msgid "Save Settings"
 msgstr "Zapisz ustawienia"
 
-#: tumblr.php:71
+#: tumblr.php:297
 msgid "Consumer Key"
 msgstr "Klucz klienta"
 
-#: tumblr.php:72
+#: tumblr.php:298
 msgid "Consumer Secret"
 msgstr "Tajny klucz klienta"
 
-#: tumblr.php:177
-msgid "You are now authenticated to tumblr."
-msgstr "Jesteś teraz uwierzytelniony na tumblr."
+#: tumblr.php:299
+msgid "Maximum tags"
+msgstr ""
 
-#: tumblr.php:178
-msgid "return to the connector page"
-msgstr "powrót do strony łącza"
+#: tumblr.php:299
+msgid ""
+"Maximum number of tags that a user can follow. Enter 0 to deactivate the "
+"feature."
+msgstr ""
 
-#: tumblr.php:194
-msgid "Post to Tumblr"
-msgstr "Opublikuj w Tumblr"
-
-#: tumblr.php:225
+#: tumblr.php:336
 msgid "Post to page:"
 msgstr "Opublikuj na stronie:"
 
-#: tumblr.php:231
+#: tumblr.php:342
 msgid "(Re-)Authenticate your tumblr page"
 msgstr "(Re-) Uwierzytelnij swoją stronę tumblr"
 
-#: tumblr.php:232
+#: tumblr.php:343
 msgid "You are not authenticated to tumblr"
 msgstr "Nie jesteś uwierzytelniony w tumblr"
 
-#: tumblr.php:237
+#: tumblr.php:348
 msgid "Enable Tumblr Post Addon"
 msgstr "Włącz dodatek Tumblr"
 
-#: tumblr.php:238
+#: tumblr.php:349
 msgid "Post to Tumblr by default"
 msgstr "Wyślij domyślnie do Tumblr"
 
-#: tumblr.php:244
-msgid "Tumblr Export"
-msgstr "Eksportuj do Tumblr"
+#: tumblr.php:350
+msgid "Import the remote timeline"
+msgstr ""
+
+#: tumblr.php:351
+msgid "Subscribed tags"
+msgstr ""
+
+#: tumblr.php:351
+#, php-format
+msgid ""
+"Comma separated list of up to %d tags that will be imported additionally to "
+"the timeline"
+msgstr ""
+
+#: tumblr.php:357
+msgid "Tumblr Import/Export"
+msgstr ""
+
+#: tumblr.php:375
+msgid "Post to Tumblr"
+msgstr "Opublikuj w Tumblr"
diff --git a/tumblr/lang/pl/strings.php b/tumblr/lang/pl/strings.php
index a9f3bfb5..896b21ba 100644
--- a/tumblr/lang/pl/strings.php
+++ b/tumblr/lang/pl/strings.php
@@ -9,12 +9,9 @@ $a->strings['Permission denied.'] = 'Odmowa dostępu.';
 $a->strings['Save Settings'] = 'Zapisz ustawienia';
 $a->strings['Consumer Key'] = 'Klucz klienta';
 $a->strings['Consumer Secret'] = 'Tajny klucz klienta';
-$a->strings['You are now authenticated to tumblr.'] = 'Jesteś teraz uwierzytelniony na tumblr.';
-$a->strings['return to the connector page'] = 'powrót do strony łącza';
-$a->strings['Post to Tumblr'] = 'Opublikuj w Tumblr';
 $a->strings['Post to page:'] = 'Opublikuj na stronie:';
 $a->strings['(Re-)Authenticate your tumblr page'] = '(Re-) Uwierzytelnij swoją stronę tumblr';
 $a->strings['You are not authenticated to tumblr'] = 'Nie jesteś uwierzytelniony w tumblr';
 $a->strings['Enable Tumblr Post Addon'] = 'Włącz dodatek Tumblr';
 $a->strings['Post to Tumblr by default'] = 'Wyślij domyślnie do Tumblr';
-$a->strings['Tumblr Export'] = 'Eksportuj do Tumblr';
+$a->strings['Post to Tumblr'] = 'Opublikuj w Tumblr';
diff --git a/tumblr/lang/sv/messages.po b/tumblr/lang/sv/messages.po
index fe631007..3ff328a8 100644
--- a/tumblr/lang/sv/messages.po
+++ b/tumblr/lang/sv/messages.po
@@ -10,64 +10,81 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2022-01-16 00:55+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
+"POT-Creation-Date: 2023-04-29 06:56+0000\n"
+"PO-Revision-Date: 2014-06-23 12:58+0000\n"
+"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>, 2022\n"
+"Language-Team: Swedish (http://app.transifex.com/Friendica/friendica/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tumblr.php:39
+#: tumblr.php:243
 msgid "Permission denied."
 msgstr "Åtkomst nekad."
 
-#: tumblr.php:69
+#: tumblr.php:296
 msgid "Save Settings"
 msgstr ""
 
-#: tumblr.php:71
+#: tumblr.php:297
 msgid "Consumer Key"
 msgstr ""
 
-#: tumblr.php:72
+#: tumblr.php:298
 msgid "Consumer Secret"
 msgstr ""
 
-#: tumblr.php:177
-msgid "You are now authenticated to tumblr."
-msgstr "Du är nu autentiserad till tumblr."
-
-#: tumblr.php:178
-msgid "return to the connector page"
+#: tumblr.php:299
+msgid "Maximum tags"
 msgstr ""
 
-#: tumblr.php:194
-msgid "Post to Tumblr"
+#: tumblr.php:299
+msgid ""
+"Maximum number of tags that a user can follow. Enter 0 to deactivate the "
+"feature."
 msgstr ""
 
-#: tumblr.php:225
+#: tumblr.php:336
 msgid "Post to page:"
 msgstr ""
 
-#: tumblr.php:231
+#: tumblr.php:342
 msgid "(Re-)Authenticate your tumblr page"
 msgstr ""
 
-#: tumblr.php:232
+#: tumblr.php:343
 msgid "You are not authenticated to tumblr"
 msgstr "Du är inte autentiserad till tumblr"
 
-#: tumblr.php:237
+#: tumblr.php:348
 msgid "Enable Tumblr Post Addon"
 msgstr ""
 
-#: tumblr.php:238
+#: tumblr.php:349
 msgid "Post to Tumblr by default"
 msgstr ""
 
-#: tumblr.php:244
-msgid "Tumblr Export"
+#: tumblr.php:350
+msgid "Import the remote timeline"
+msgstr ""
+
+#: tumblr.php:351
+msgid "Subscribed tags"
+msgstr ""
+
+#: tumblr.php:351
+#, php-format
+msgid ""
+"Comma separated list of up to %d tags that will be imported additionally to "
+"the timeline"
+msgstr ""
+
+#: tumblr.php:357
+msgid "Tumblr Import/Export"
+msgstr ""
+
+#: tumblr.php:375
+msgid "Post to Tumblr"
 msgstr ""
diff --git a/tumblr/lang/sv/strings.php b/tumblr/lang/sv/strings.php
index 4d39d3c2..84a0e774 100644
--- a/tumblr/lang/sv/strings.php
+++ b/tumblr/lang/sv/strings.php
@@ -6,5 +6,4 @@ function string_plural_select_sv($n){
 	return intval($n != 1);
 }}
 $a->strings['Permission denied.'] = 'Åtkomst nekad.';
-$a->strings['You are now authenticated to tumblr.'] = 'Du är nu autentiserad till tumblr.';
 $a->strings['You are not authenticated to tumblr'] = 'Du är inte autentiserad till tumblr';

From 08b46e553645a2e02fd587f65fa76950fc6e1398 Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sat, 22 Jun 2024 18:56:32 +0200
Subject: [PATCH 095/294] New addon providing additional statistics for
 moderation

---
 ratioed/ratioed.php           | 264 ++++++++++++++++++++++++++++++++++
 ratioed/templates/ratioed.tpl | 164 +++++++++++++++++++++
 2 files changed, 428 insertions(+)
 create mode 100644 ratioed/ratioed.php
 create mode 100644 ratioed/templates/ratioed.tpl

diff --git a/ratioed/ratioed.php b/ratioed/ratioed.php
new file mode 100644
index 00000000..3c88705c
--- /dev/null
+++ b/ratioed/ratioed.php
@@ -0,0 +1,264 @@
+<?php
+/**
+ * Name: Ratioed
+ * Description: Additional moderation user table with statistics about user behaviour
+ * Version: 0.1
+ * Author: Matthew Exon <http://mat.exon.name>
+ */
+
+use Friendica\Content\Pager;
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
+use Friendica\Database\DBA;
+use Friendica\DI;
+use Friendica\Model\User;
+use Friendica\Module\Moderation\Users\Active;
+
+/**
+ * Sets up the addon hooks and updates data in the database if needed
+ */
+function ratioed_install()
+{
+	Hook::register('moderation_users_tabs', 'addon/ratioed/ratioed.php', 'ratioed_users_tabs');
+
+	Logger::info("ratioed: installed");
+}
+
+/**
+ * @brief Uninstallation hook for ratioed plugin
+ */
+function ratioed_uninstall() {
+	Hook::unregister('moderation_users_tabs', 'addon/ratioed/ratioed.php', 'ratioed_users_tabs');
+
+	Logger::info("ratioed: uninstalled");
+}
+
+/**
+ * This is a statement rather than an actual function definition. The simple
+ * existence of this method is checked to figure out if the addon offers a
+ * module.
+ */
+function ratioed_module() {}
+
+/**
+ * @brief Adds additional users tab to the moderation panel
+ *
+ * @param array $arr Parameters, including "tabs" which is the list to modify, and "selectedTab", which is the currently selected tab ID
+ */
+function ratioed_users_tabs(array &$arr) {
+	Logger::debug("ratioed: users tabs");
+
+	array_push($arr['tabs'], [
+		'label'	 => DI::l10n()->t('Behaviour'),
+		'url'	   => 'ratioed',
+		'sel'	   => $arr['selectedTab'] == 'ratioed' ? 'active' : '',
+		'title'	 => DI::l10n()->t('Statistics about users behaviour'),
+		'id'		=> 'admin-users-ratioed',
+		'accesskey' => 'r',
+	]);
+}
+
+class Ratioed extends Friendica\Module\Moderation\Users\Active
+{
+	protected function content(array $request = []): string
+	{
+		Friendica\Module\Moderation\Users\Active::content();
+
+		$action = $this->parameters['action'] ?? '';
+		$uid	= $this->parameters['uid']	?? 0;
+
+		if ($uid) {
+			$user = User::getById($uid, ['username', 'blocked']);
+			if (!$user) {
+				$this->systemMessages->addNotice($this->t('User not found'));
+				$this->baseUrl->redirect('moderation/users');
+			}
+		}
+
+		switch ($action) {
+			case 'delete':
+				if ($this->session->getLocalUserId() != $uid) {
+					self::checkFormSecurityTokenRedirectOnError('moderation/users/active', 'moderation_users_active', 't');
+					// delete user
+					User::remove($uid);
+
+					$this->systemMessages->addNotice($this->t('User "%s" deleted', $user['username']));
+				} else {
+					$this->systemMessages->addNotice($this->t('You can\'t remove yourself'));
+				}
+
+				$this->baseUrl->redirect('moderation/users/active');
+				break;
+			case 'block':
+				self::checkFormSecurityTokenRedirectOnError('moderation/users/active', 'moderation_users_active', 't');
+				User::block($uid);
+				$this->systemMessages->addNotice($this->t('User "%s" blocked', $user['username']));
+				$this->baseUrl->redirect('moderation/users/active');
+				break;
+		}
+		$pager = new Pager($this->l10n, $this->args->getQueryString(), 100);
+
+		$valid_orders = [
+			'name',
+			'email',
+			'register_date',
+			'last-activity',
+			'last-item',
+			'page-flags',
+		];
+
+		$order		   = 'last-item';
+		$order_direction = '-';
+		if (!empty($request['o'])) {
+			$new_order = $request['o'];
+			if ($new_order[0] === '-') {
+				$order_direction = '-';
+				$new_order	   = substr($new_order, 1);
+			}
+
+			if (in_array($new_order, $valid_orders)) {
+				$order = $new_order;
+			}
+		}
+
+		$users = User::getList($pager->getStart(), $pager->getItemsPerPage(), 'active', $order, ($order_direction == '-'));
+
+		$users = array_map($this->setupUserCallback(), $users);
+
+		$header_titles = [
+			$this->t('Name'),
+			$this->t('Email'),
+			$this->t('Register date'),
+			$this->t('Last login'),
+			$this->t('Last public item'),
+			$this->t('Type'),
+			$this->t('Blocked by'),
+			$this->t('Comments last 24h'),
+			$this->t('Reactions last 24h'),
+			$this->t('Ratio last 24h'),
+		];
+		$field_names = [
+			'name',
+			'email',
+			'register_date',
+			'login_date',
+			'lastitem_date',
+			'page_flags',
+            'blocked_by',
+			'comments',
+			'reactions',
+			'ratio',
+		];
+		$th_users = array_map(null, $header_titles, $valid_orders, $field_names);
+
+		$count = $this->database->count('user', ["`verified` AND NOT `blocked` AND NOT `account_removed` AND NOT `account_expired` AND `uid` != ?", 0]);
+
+		$t = Renderer::getMarkupTemplate('ratioed.tpl', 'addon/ratioed');
+		return self::getTabsHTML('ratioed') . Renderer::replaceMacros($t, [
+			// strings //
+			'$title'		  => $this->t('Moderation'),
+			'$page'		   => $this->t('Behaviour'),
+			'$select_all'	 => $this->t('select all'),
+			'$delete'		 => $this->t('Delete'),
+			'$block'		  => $this->t('Block'),
+			'$blocked'		=> $this->t('User blocked'),
+			'$siteadmin'	  => $this->t('Site admin'),
+			'$accountexpired' => $this->t('Account expired'),
+			'$h_newuser'	  => $this->t('Create a new user'),
+
+			'$th_users'			  => $th_users,
+			'$order_users'		   => $order,
+			'$order_direction_users' => $order_direction,
+
+			'$confirm_delete_multi' => $this->t('Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'),
+			'$confirm_delete'	   => $this->t('The user {0} will be deleted!\n\nEverything this user has posted on this site will be permanently deleted!\n\nAre you sure?'),
+
+			'$form_security_token' => self::getFormSecurityToken('moderation_users_active'),
+
+			// values //
+			'$baseurl'	  => $this->baseUrl,
+			'$query_string' => $this->args->getQueryString(),
+
+			'$users' => $users,
+			'$count' => $count,
+			'$pager' => $pager->renderFull($count),
+		]);
+	}
+
+	protected function setupUserCallback(): \Closure
+	{
+	Logger::debug("ratioed: setupUserCallback");
+		$parentCallback = parent::setupUserCallback();
+		return function ($user) use ($parentCallback) {
+            $blocked_count = DBA::count('user-contact', ['uid' => $user['uid'], 'is-blocked' => 1]);
+			$user['blocked_by'] = $blocked_count;
+
+            $self_contact_result = DBA::p('SELECT admin_contact.id AS user_contact_uid FROM contact AS admin_contact JOIN contact AS user_contact ON admin_contact.`uri-id` = user_contact.`uri-id` AND admin_contact.self = 0 AND user_contact.self = 1 WHERE user_contact.uid = ?', $user['uid']);
+            if (DBA::isResult($self_contact_result)) {
+                $self_contact_result_row = DBA::fetch($self_contact_result);
+                $user['user_contact_uid'] = $self_contact_result_row['user_contact_uid'];
+            }
+            else {
+                $user['user_contact_uid'] = NULL;
+            }
+
+            if ($user['user_contact_uid']) {
+                $post_engagement_result = DBA::p('SELECT SUM(`comments`) AS `comment_count`, SUM(`activities`) AS `activities_count` FROM `post-engagement` WHERE `post-engagement`.created > DATE_SUB(now(), INTERVAL 1 DAY) AND `post-engagement`.`owner-id` = ?', $user['user_contact_uid']);
+                if (DBA::isResult($post_engagement_result)) {
+                    $post_engagement_result_row = DBA::fetch($post_engagement_result);
+                    $user['comments'] = $post_engagement_result_row['comment_count'];
+                    $user['reactions'] = $post_engagement_result_row['activities_count'];
+                    if ($user['reactions'] > 0) {
+                        $user['ratio'] = number_format($user['comments'] / $user['reactions'], 1, '.', '');
+                        $user['ratioed'] = (float)($user['ratio']) >= 2.0;
+                    }
+                    else {
+                        if ($user['comments'] == 0) {
+                            $user['ratio'] = '0';
+                            $user['ratioed'] = false;
+                        }
+                        else {
+                            $user['ratio'] = '∞';
+                            $user['ratioed'] = false;
+                        }
+                    }
+                }
+                else {
+                    $user['comments'] = 'error';
+                    $user['reactions'] = 'error';
+                    $user['ratio'] = 'error';
+                    $user['ratioed'] = false;
+                }
+            }
+            else {
+                $user['comments'] = 'error';
+                $user['reactions'] = 'error';
+                $user['ratio'] = 'error';
+                $user['ratioed'] = false;
+            }
+
+			$user = $parentCallback($user);
+            Logger::debug("ratioed: setupUserCallback", [
+                'uid' => $user['uid'],
+                'blocked_by' => $user['blocked_by'],
+                'comments' => $user['comments'],
+                'reactions' => $user['reactions'],
+                'ratio' => $user['ratio'],
+                'ratioed' => $user['ratioed'],
+            ]);
+			return $user;
+		};
+	}
+}
+
+/**
+ * @brief Displays the ratioed tab in the moderation panel
+ */
+function ratioed_content() {
+	Logger::debug("ratioed: content");
+
+	$ratioed = DI::getDice()->create(Ratioed::class, [$_SERVER]);
+	$httpException = DI::getDice()->create(Friendica\Module\Special\HTTPException::class);
+	$ratioed->run($httpException);
+}
diff --git a/ratioed/templates/ratioed.tpl b/ratioed/templates/ratioed.tpl
new file mode 100644
index 00000000..0d81b0d7
--- /dev/null
+++ b/ratioed/templates/ratioed.tpl
@@ -0,0 +1,164 @@
+<script type="text/javascript" src="view/theme/frio/js/mod_admin.js?v={{constant('\Friendica\App::VERSION')}}"></script>
+<link rel="stylesheet" href="view/theme/frio/css/mod_admin.css?v={{constant('\Friendica\App::VERSION')}}" type="text/css" media="screen"/>
+
+<div id="admin-users" class="adminpage generic-page-wrapper">
+	<h1>{{$title}} - {{$page}} ({{$count}})</h1>
+	<p>
+		<a href="{{$base_url}}/moderation/users/create" class="btn btn-primary"><i class="fa fa-user-plus"></i> {{$h_newuser}}</a>
+	</p>
+	<form action="{{$baseurl}}/{{$query_string}}" method="post">
+		<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+		<table id="users" class="table table-hover">
+			<thead>
+				<tr>
+					<th>
+						<div class="checkbox">
+							<input type="checkbox" id="admin-settings-users-select" class="selecttoggle" data-select-class="users_ckbx"/>
+							<label for="admin-settings-users-select"></label>
+						</div>
+					</th>
+					<th></th>
+					{{foreach $th_users as $k=>$th}}
+						{{if $k < 2 || $order_users == $th.1 || ($k==5 && !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1])) }}
+						<th class="th-{{$k}}">
+							<a href="{{$baseurl}}/moderation/users/active?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}" class="table-order">
+								{{if $order_users == $th.1}}
+									{{if $order_direction_users == "+"}}
+									&#8595;
+									{{else}}
+									&#8593;
+									{{/if}}
+								{{else}}
+								&#8597;
+								{{/if}}
+								{{$th.0}}
+							</a>
+						</th>
+						{{/if}}
+					{{/foreach}}
+					<th></th>
+				</tr>
+			</thead>
+			<tbody>
+			{{foreach $users as $u}}
+				<tr id="user-{{$u.uid}}" class="{{if $u.ratioed}}blocked{{/if}}">
+					<td>
+						{{if $u.is_deletable}}
+						<div class="checkbox">
+							<input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/>
+							<label for="id_user_{{$u.uid}}"></label>
+						</div>
+						{{else}}
+						&nbsp;
+						{{/if}}
+					</td>
+					<td><img class="avatar-nano" src="{{$u.micro}}" title="{{$u.nickname}}"></td>
+					<td><a href="{{$u.url}}" title="{{$u.nickname}}"> {{$u.name}}</a></td>
+					<td>{{$u.email}}</td>
+				{{if $order_users == $th_users.2.1}}
+					<td>{{$u.register_date}}</td>
+				{{/if}}
+
+				{{if $order_users == $th_users.3.1}}
+					<td>{{$u.login_date}}</td>
+				{{/if}}
+
+				{{if $order_users == $th_users.4.1}}
+					<td>{{$u.lastitem_date}}</td>
+				{{/if}}
+
+				{{if !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1]) }}
+					<td>
+						<i class="fa
+							{{if $u.page_flags_raw==0}}fa-user{{/if}}		{{* PAGE_NORMAL *}}
+							{{if $u.page_flags_raw==1}}fa-bullhorn{{/if}}		{{* PAGE_SOAPBOX *}}
+							{{if $u.page_flags_raw==2}}fa-users{{/if}}		{{* PAGE_COMMUNITY *}}
+							{{if $u.page_flags_raw==3}}fa-heart{{/if}}		{{* PAGE_FREELOVE *}}
+							{{if $u.page_flags_raw==4}}fa-rss{{/if}}		{{* PAGE_BLOG *}}
+							{{if $u.page_flags_raw==5}}fa-user-secret{{/if}}	{{* PAGE_PRVGROUP *}}
+							" title="{{$u.page_flags}}">
+						</i>
+						{{if $u.page_flags_raw==0 && $u.account_type_raw > 0}}
+						<i class="fa
+							{{if $u.account_type_raw==1}}fa-sitemap{{/if}}		{{* ACCOUNT_TYPE_ORGANISATION *}}
+							{{if $u.account_type_raw==2}}fa-newspaper-o{{/if}}	{{* ACCOUNT_TYPE_NEWS *}}
+							{{if $u.account_type_raw==3}}fa-comments{{/if}}		{{* ACCOUNT_TYPE_COMMUNITY *}}
+							" title="{{$u.account_type}}">
+						</i>
+						{{/if}}
+						{{if $u.is_admin}}<i class="fa fa-user-secret text-primary" title="{{$siteadmin}}"></i>{{/if}}
+						{{if $u.account_expired}}<i class="fa fa-clock-o text-warning" title="{{$accountexpired}}"></i>{{/if}}
+					</td>
+				{{/if}}
+
+					<td class="text-right">
+						<button type="button" class="btn-link admin-settings-action-link" onclick="return details({{$u.uid}})"><span class="caret"></span></button>
+					</td>
+				</tr>
+				<tr id="user-{{$u.uid}}-detail" class=" details hidden {{if $u.blocked != 0}}blocked{{/if}}">
+					<td>&nbsp;</td>
+					<td colspan="4">
+					{{if $order_users != $th_users.2.1}}
+						<p>
+							<a href="{{$baseurl}}/ratioed?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.2.1}}" class="btn-link table-order">
+							&#8597; {{$th_users.2.0}}</a> : {{$u.register_date}}
+						</p>
+					{{/if}}
+
+					{{if $order_users != $th_users.3.1}}
+						<p>
+							<a href="{{$baseurl}}/ratioed?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.3.1}}" class="btn-link table-order">
+								&#8597; {{$th_users.3.0}}</a> : {{$u.login_date}}
+						</p>
+					{{/if}}
+
+					{{if $order_users != $th_users.4.1}}
+						<p>
+							<a href="{{$baseurl}}/ratioed?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.4.1}}" class="btn-link table-order">
+								&#8597; {{$th_users.4.0}}</a> : {{$u.lastitem_date}}
+						</p>
+					{{/if}}
+
+					{{if in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1]) }}
+						<p>
+							<a href="{{$baseurl}}/ratioed?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.5.1}}" class="btn-link table-order">
+								&#8597; {{$th_users.5.0}}</a> : {{$u.page_flags}}{{if $u.page_flags_raw==0 && $u.account_type_raw > 0}}, {{$u.account_type}}{{/if}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}
+						</p>
+					{{/if}}
+
+					{{foreach $th_users as $k=>$th}}
+					{{if $order_users != $th.1 && $k > 5}}
+						<p>
+							{{$th.0}} : {{$u[$th.2]}}
+						</p>
+					{{/if}}
+					{{/foreach}}
+
+					</td>
+					<td class="text-right">
+				{{if $u.is_deletable}}
+						<a href="{{$baseurl}}/moderation/users/active/block/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$block}}">
+							<i class="fa fa-ban" aria-hidden="true"></i>
+						</a>
+						<a href="{{$baseurl}}/moderation/users/active/delete/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$delete}}" onclick="return confirm_delete('{{$confirm_delete}}','{{$u.name}}')">
+							<i class="fa fa-trash" aria-hidden="true"></i>
+						</a>
+				{{else}}
+						&nbsp;
+				{{/if}}
+					</td>
+				</tr>
+			{{/foreach}}
+			</tbody>
+		</table>
+		<div class="panel-footer">
+			<button type="submit" name="page_users_block" value="1" class="btn btn-warning">
+				<i class="fa fa-ban" aria-hidden="true"></i> {{$block}}
+			</button>
+			<button type="submit" name="page_users_delete" value="1" class="btn btn-danger" onclick="return confirm_delete('{{$confirm_delete_multi}}')">
+				<i class="fa fa-trash" aria-hidden="true"></i> {{$delete}}
+			</button>
+		</div>
+		{{$pager nofilter}}
+	</form>
+</div>

From 7d5446a778419d67ec4df778c836b59083d5f163 Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sun, 23 Jun 2024 15:15:06 +0200
Subject: [PATCH 096/294] Ratioed: remove unnecessary uninstall function

---
 ratioed/ratioed.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/ratioed/ratioed.php b/ratioed/ratioed.php
index 3c88705c..d8da9ac1 100644
--- a/ratioed/ratioed.php
+++ b/ratioed/ratioed.php
@@ -25,15 +25,6 @@ function ratioed_install()
 	Logger::info("ratioed: installed");
 }
 
-/**
- * @brief Uninstallation hook for ratioed plugin
- */
-function ratioed_uninstall() {
-	Hook::unregister('moderation_users_tabs', 'addon/ratioed/ratioed.php', 'ratioed_users_tabs');
-
-	Logger::info("ratioed: uninstalled");
-}
-
 /**
  * This is a statement rather than an actual function definition. The simple
  * existence of this method is checked to figure out if the addon offers a

From 18e512cc8b0bd79a6be164e7fc06ec4a41f56dcd Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sun, 23 Jun 2024 15:24:43 +0200
Subject: [PATCH 097/294] Ratioed: move panel class into separate file

---
 ratioed/RatioedPanel.php | 206 +++++++++++++++++++++++++++++++++++++++
 ratioed/ratioed.php      | 201 +-------------------------------------
 2 files changed, 208 insertions(+), 199 deletions(-)
 create mode 100644 ratioed/RatioedPanel.php

diff --git a/ratioed/RatioedPanel.php b/ratioed/RatioedPanel.php
new file mode 100644
index 00000000..16f9df6f
--- /dev/null
+++ b/ratioed/RatioedPanel.php
@@ -0,0 +1,206 @@
+<?php
+
+namespace Friendica\Addon\ratioed;
+
+use Friendica\Content\Pager;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
+use Friendica\Database\DBA;
+use Friendica\Model\User;
+use Friendica\Module\Moderation\Users\Active;
+
+/**
+ * This class implements the "Behaviour" panel in Moderation/Users
+ */
+class RatioedPanel extends Active
+{
+	protected function content(array $request = []): string
+	{
+		Active::content();
+
+		$action = $this->parameters['action'] ?? '';
+		$uid	= $this->parameters['uid']	?? 0;
+
+		if ($uid) {
+			$user = User::getById($uid, ['username', 'blocked']);
+			if (!$user) {
+				$this->systemMessages->addNotice($this->t('User not found'));
+				$this->baseUrl->redirect('moderation/users');
+			}
+		}
+
+		switch ($action) {
+			case 'delete':
+				if ($this->session->getLocalUserId() != $uid) {
+					self::checkFormSecurityTokenRedirectOnError('moderation/users/active', 'moderation_users_active', 't');
+					// delete user
+					User::remove($uid);
+
+					$this->systemMessages->addNotice($this->t('User "%s" deleted', $user['username']));
+				} else {
+					$this->systemMessages->addNotice($this->t('You can\'t remove yourself'));
+				}
+
+				$this->baseUrl->redirect('moderation/users/active');
+				break;
+			case 'block':
+				self::checkFormSecurityTokenRedirectOnError('moderation/users/active', 'moderation_users_active', 't');
+				User::block($uid);
+				$this->systemMessages->addNotice($this->t('User "%s" blocked', $user['username']));
+				$this->baseUrl->redirect('moderation/users/active');
+				break;
+		}
+		$pager = new Pager($this->l10n, $this->args->getQueryString(), 100);
+
+		$valid_orders = [
+			'name',
+			'email',
+			'register_date',
+			'last-activity',
+			'last-item',
+			'page-flags',
+		];
+
+		$order		   = 'last-item';
+		$order_direction = '-';
+		if (!empty($request['o'])) {
+			$new_order = $request['o'];
+			if ($new_order[0] === '-') {
+				$order_direction = '-';
+				$new_order	   = substr($new_order, 1);
+			}
+
+			if (in_array($new_order, $valid_orders)) {
+				$order = $new_order;
+			}
+		}
+
+		$users = User::getList($pager->getStart(), $pager->getItemsPerPage(), 'active', $order, ($order_direction == '-'));
+
+		$users = array_map($this->setupUserCallback(), $users);
+
+		$header_titles = [
+			$this->t('Name'),
+			$this->t('Email'),
+			$this->t('Register date'),
+			$this->t('Last login'),
+			$this->t('Last public item'),
+			$this->t('Type'),
+			$this->t('Blocked by'),
+			$this->t('Comments last 24h'),
+			$this->t('Reactions last 24h'),
+			$this->t('Ratio last 24h'),
+		];
+		$field_names = [
+			'name',
+			'email',
+			'register_date',
+			'login_date',
+			'lastitem_date',
+			'page_flags',
+			'blocked_by',
+			'comments',
+			'reactions',
+			'ratio',
+		];
+		$th_users = array_map(null, $header_titles, $valid_orders, $field_names);
+
+		$count = $this->database->count('user', ["`verified` AND NOT `blocked` AND NOT `account_removed` AND NOT `account_expired` AND `uid` != ?", 0]);
+
+		$t = Renderer::getMarkupTemplate('ratioed.tpl', 'addon/ratioed');
+		return self::getTabsHTML('ratioed') . Renderer::replaceMacros($t, [
+			// strings //
+			'$title'		  => $this->t('Moderation'),
+			'$page'		   => $this->t('Behaviour'),
+			'$select_all'	 => $this->t('select all'),
+			'$delete'		 => $this->t('Delete'),
+			'$block'		  => $this->t('Block'),
+			'$blocked'		=> $this->t('User blocked'),
+			'$siteadmin'	  => $this->t('Site admin'),
+			'$accountexpired' => $this->t('Account expired'),
+			'$h_newuser'	  => $this->t('Create a new user'),
+
+			'$th_users'			  => $th_users,
+			'$order_users'		   => $order,
+			'$order_direction_users' => $order_direction,
+
+			'$confirm_delete_multi' => $this->t('Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'),
+			'$confirm_delete'	   => $this->t('The user {0} will be deleted!\n\nEverything this user has posted on this site will be permanently deleted!\n\nAre you sure?'),
+
+			'$form_security_token' => self::getFormSecurityToken('moderation_users_active'),
+
+			// values //
+			'$baseurl'	  => $this->baseUrl,
+			'$query_string' => $this->args->getQueryString(),
+
+			'$users' => $users,
+			'$count' => $count,
+			'$pager' => $pager->renderFull($count),
+		]);
+	}
+
+	protected function setupUserCallback(): \Closure
+	{
+		Logger::debug("ratioed: setupUserCallback");
+		$parentCallback = parent::setupUserCallback();
+		return function ($user) use ($parentCallback) {
+			$blocked_count = DBA::count('user-contact', ['uid' => $user['uid'], 'is-blocked' => 1]);
+			$user['blocked_by'] = $blocked_count;
+
+			$self_contact_result = DBA::p('SELECT admin_contact.id AS user_contact_uid FROM contact AS admin_contact JOIN contact AS user_contact ON admin_contact.`uri-id` = user_contact.`uri-id` AND admin_contact.self = 0 AND user_contact.self = 1 WHERE user_contact.uid = ?', $user['uid']);
+			if (DBA::isResult($self_contact_result)) {
+				$self_contact_result_row = DBA::fetch($self_contact_result);
+				$user['user_contact_uid'] = $self_contact_result_row['user_contact_uid'];
+			}
+			else {
+				$user['user_contact_uid'] = NULL;
+			}
+
+			if ($user['user_contact_uid']) {
+				$post_engagement_result = DBA::p('SELECT SUM(`comments`) AS `comment_count`, SUM(`activities`) AS `activities_count` FROM `post-engagement` WHERE `post-engagement`.created > DATE_SUB(now(), INTERVAL 1 DAY) AND `post-engagement`.`owner-id` = ?', $user['user_contact_uid']);
+				if (DBA::isResult($post_engagement_result)) {
+					$post_engagement_result_row = DBA::fetch($post_engagement_result);
+					$user['comments'] = $post_engagement_result_row['comment_count'];
+					$user['reactions'] = $post_engagement_result_row['activities_count'];
+					if ($user['reactions'] > 0) {
+						$user['ratio'] = number_format($user['comments'] / $user['reactions'], 1, '.', '');
+						$user['ratioed'] = (float)($user['ratio']) >= 2.0;
+					}
+					else {
+						if ($user['comments'] == 0) {
+							$user['ratio'] = '0';
+							$user['ratioed'] = false;
+						}
+						else {
+							$user['ratio'] = '∞';
+							$user['ratioed'] = false;
+						}
+					}
+				}
+				else {
+					$user['comments'] = 'error';
+					$user['reactions'] = 'error';
+					$user['ratio'] = 'error';
+					$user['ratioed'] = false;
+				}
+			}
+			else {
+				$user['comments'] = 'error';
+				$user['reactions'] = 'error';
+				$user['ratio'] = 'error';
+				$user['ratioed'] = false;
+			}
+
+			$user = $parentCallback($user);
+			Logger::debug("ratioed: setupUserCallback", [
+				'uid' => $user['uid'],
+				'blocked_by' => $user['blocked_by'],
+				'comments' => $user['comments'],
+				'reactions' => $user['reactions'],
+				'ratio' => $user['ratio'],
+				'ratioed' => $user['ratioed'],
+			]);
+			return $user;
+		};
+	}
+}
diff --git a/ratioed/ratioed.php b/ratioed/ratioed.php
index d8da9ac1..8ae0d48c 100644
--- a/ratioed/ratioed.php
+++ b/ratioed/ratioed.php
@@ -6,14 +6,10 @@
  * Author: Matthew Exon <http://mat.exon.name>
  */
 
-use Friendica\Content\Pager;
+use Friendica\Addon\ratioed\RatioedPanel;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
-use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\User;
-use Friendica\Module\Moderation\Users\Active;
 
 /**
  * Sets up the addon hooks and updates data in the database if needed
@@ -50,206 +46,13 @@ function ratioed_users_tabs(array &$arr) {
 	]);
 }
 
-class Ratioed extends Friendica\Module\Moderation\Users\Active
-{
-	protected function content(array $request = []): string
-	{
-		Friendica\Module\Moderation\Users\Active::content();
-
-		$action = $this->parameters['action'] ?? '';
-		$uid	= $this->parameters['uid']	?? 0;
-
-		if ($uid) {
-			$user = User::getById($uid, ['username', 'blocked']);
-			if (!$user) {
-				$this->systemMessages->addNotice($this->t('User not found'));
-				$this->baseUrl->redirect('moderation/users');
-			}
-		}
-
-		switch ($action) {
-			case 'delete':
-				if ($this->session->getLocalUserId() != $uid) {
-					self::checkFormSecurityTokenRedirectOnError('moderation/users/active', 'moderation_users_active', 't');
-					// delete user
-					User::remove($uid);
-
-					$this->systemMessages->addNotice($this->t('User "%s" deleted', $user['username']));
-				} else {
-					$this->systemMessages->addNotice($this->t('You can\'t remove yourself'));
-				}
-
-				$this->baseUrl->redirect('moderation/users/active');
-				break;
-			case 'block':
-				self::checkFormSecurityTokenRedirectOnError('moderation/users/active', 'moderation_users_active', 't');
-				User::block($uid);
-				$this->systemMessages->addNotice($this->t('User "%s" blocked', $user['username']));
-				$this->baseUrl->redirect('moderation/users/active');
-				break;
-		}
-		$pager = new Pager($this->l10n, $this->args->getQueryString(), 100);
-
-		$valid_orders = [
-			'name',
-			'email',
-			'register_date',
-			'last-activity',
-			'last-item',
-			'page-flags',
-		];
-
-		$order		   = 'last-item';
-		$order_direction = '-';
-		if (!empty($request['o'])) {
-			$new_order = $request['o'];
-			if ($new_order[0] === '-') {
-				$order_direction = '-';
-				$new_order	   = substr($new_order, 1);
-			}
-
-			if (in_array($new_order, $valid_orders)) {
-				$order = $new_order;
-			}
-		}
-
-		$users = User::getList($pager->getStart(), $pager->getItemsPerPage(), 'active', $order, ($order_direction == '-'));
-
-		$users = array_map($this->setupUserCallback(), $users);
-
-		$header_titles = [
-			$this->t('Name'),
-			$this->t('Email'),
-			$this->t('Register date'),
-			$this->t('Last login'),
-			$this->t('Last public item'),
-			$this->t('Type'),
-			$this->t('Blocked by'),
-			$this->t('Comments last 24h'),
-			$this->t('Reactions last 24h'),
-			$this->t('Ratio last 24h'),
-		];
-		$field_names = [
-			'name',
-			'email',
-			'register_date',
-			'login_date',
-			'lastitem_date',
-			'page_flags',
-            'blocked_by',
-			'comments',
-			'reactions',
-			'ratio',
-		];
-		$th_users = array_map(null, $header_titles, $valid_orders, $field_names);
-
-		$count = $this->database->count('user', ["`verified` AND NOT `blocked` AND NOT `account_removed` AND NOT `account_expired` AND `uid` != ?", 0]);
-
-		$t = Renderer::getMarkupTemplate('ratioed.tpl', 'addon/ratioed');
-		return self::getTabsHTML('ratioed') . Renderer::replaceMacros($t, [
-			// strings //
-			'$title'		  => $this->t('Moderation'),
-			'$page'		   => $this->t('Behaviour'),
-			'$select_all'	 => $this->t('select all'),
-			'$delete'		 => $this->t('Delete'),
-			'$block'		  => $this->t('Block'),
-			'$blocked'		=> $this->t('User blocked'),
-			'$siteadmin'	  => $this->t('Site admin'),
-			'$accountexpired' => $this->t('Account expired'),
-			'$h_newuser'	  => $this->t('Create a new user'),
-
-			'$th_users'			  => $th_users,
-			'$order_users'		   => $order,
-			'$order_direction_users' => $order_direction,
-
-			'$confirm_delete_multi' => $this->t('Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'),
-			'$confirm_delete'	   => $this->t('The user {0} will be deleted!\n\nEverything this user has posted on this site will be permanently deleted!\n\nAre you sure?'),
-
-			'$form_security_token' => self::getFormSecurityToken('moderation_users_active'),
-
-			// values //
-			'$baseurl'	  => $this->baseUrl,
-			'$query_string' => $this->args->getQueryString(),
-
-			'$users' => $users,
-			'$count' => $count,
-			'$pager' => $pager->renderFull($count),
-		]);
-	}
-
-	protected function setupUserCallback(): \Closure
-	{
-	Logger::debug("ratioed: setupUserCallback");
-		$parentCallback = parent::setupUserCallback();
-		return function ($user) use ($parentCallback) {
-            $blocked_count = DBA::count('user-contact', ['uid' => $user['uid'], 'is-blocked' => 1]);
-			$user['blocked_by'] = $blocked_count;
-
-            $self_contact_result = DBA::p('SELECT admin_contact.id AS user_contact_uid FROM contact AS admin_contact JOIN contact AS user_contact ON admin_contact.`uri-id` = user_contact.`uri-id` AND admin_contact.self = 0 AND user_contact.self = 1 WHERE user_contact.uid = ?', $user['uid']);
-            if (DBA::isResult($self_contact_result)) {
-                $self_contact_result_row = DBA::fetch($self_contact_result);
-                $user['user_contact_uid'] = $self_contact_result_row['user_contact_uid'];
-            }
-            else {
-                $user['user_contact_uid'] = NULL;
-            }
-
-            if ($user['user_contact_uid']) {
-                $post_engagement_result = DBA::p('SELECT SUM(`comments`) AS `comment_count`, SUM(`activities`) AS `activities_count` FROM `post-engagement` WHERE `post-engagement`.created > DATE_SUB(now(), INTERVAL 1 DAY) AND `post-engagement`.`owner-id` = ?', $user['user_contact_uid']);
-                if (DBA::isResult($post_engagement_result)) {
-                    $post_engagement_result_row = DBA::fetch($post_engagement_result);
-                    $user['comments'] = $post_engagement_result_row['comment_count'];
-                    $user['reactions'] = $post_engagement_result_row['activities_count'];
-                    if ($user['reactions'] > 0) {
-                        $user['ratio'] = number_format($user['comments'] / $user['reactions'], 1, '.', '');
-                        $user['ratioed'] = (float)($user['ratio']) >= 2.0;
-                    }
-                    else {
-                        if ($user['comments'] == 0) {
-                            $user['ratio'] = '0';
-                            $user['ratioed'] = false;
-                        }
-                        else {
-                            $user['ratio'] = '∞';
-                            $user['ratioed'] = false;
-                        }
-                    }
-                }
-                else {
-                    $user['comments'] = 'error';
-                    $user['reactions'] = 'error';
-                    $user['ratio'] = 'error';
-                    $user['ratioed'] = false;
-                }
-            }
-            else {
-                $user['comments'] = 'error';
-                $user['reactions'] = 'error';
-                $user['ratio'] = 'error';
-                $user['ratioed'] = false;
-            }
-
-			$user = $parentCallback($user);
-            Logger::debug("ratioed: setupUserCallback", [
-                'uid' => $user['uid'],
-                'blocked_by' => $user['blocked_by'],
-                'comments' => $user['comments'],
-                'reactions' => $user['reactions'],
-                'ratio' => $user['ratio'],
-                'ratioed' => $user['ratioed'],
-            ]);
-			return $user;
-		};
-	}
-}
-
 /**
  * @brief Displays the ratioed tab in the moderation panel
  */
 function ratioed_content() {
 	Logger::debug("ratioed: content");
 
-	$ratioed = DI::getDice()->create(Ratioed::class, [$_SERVER]);
+	$ratioed = DI::getDice()->create(RatioedPanel::class, [$_SERVER]);
 	$httpException = DI::getDice()->create(Friendica\Module\Special\HTTPException::class);
 	$ratioed->run($httpException);
 }

From 14e7413eb2f89effd151b4460c0a56cdb560c681 Mon Sep 17 00:00:00 2001
From: hankg <hankg@noreply.git.friendi.ca>
Date: Mon, 24 Jun 2024 22:20:35 +0200
Subject: [PATCH 098/294] Add Relatica to blockbot fediverse client list

---
 blockbot/blockbot.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php
index eb634b1f..adf0a7c2 100644
--- a/blockbot/blockbot.php
+++ b/blockbot/blockbot.php
@@ -499,6 +499,7 @@ function blockbot_is_fediverse_client(array $parts): bool
 		'megalodonandroid', 'fedilab', 'mastodonapp', 'toot!', 'intravnews',
 		'pixeldroid', 'greatnews', 'protopage', 'newsfox', 'vienna', 'wp-urldetails', 'husky',
 		'activitypub-go-http-client', 'mobilesafari', 'mastodon-ios', 'mastodonpy', 'techniverse',
+		'relatica',
 	];
 
 	foreach ($parts as $part) {

From b2108c7a4c7efe5c79f8c5e762e3cae207d9e0d2 Mon Sep 17 00:00:00 2001
From: Hannes Heute <haheute@posteo.de>
Date: Thu, 27 Jun 2024 11:44:15 +0200
Subject: [PATCH 099/294] fix for curweather

---
 curweather/curweather.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/curweather/curweather.php b/curweather/curweather.php
index 5a14a9cf..9aa8584a 100644
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -152,7 +152,7 @@ function curweather_network_mod_init(string &$body)
 
 function curweather_addon_settings_post($post)
 {
-	if (!DI::userSession()->getLocalUserId() || empty($_POST['curweather-settings-submit'])) {
+	if (!DI::userSession()->getLocalUserId() || empty($_POST['curweather-submit'])) {
 		return;
 	}
 

From 5f27f72b0d18bbf3226f4850cb4aa6f2c36482fe Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sat, 29 Jun 2024 15:23:24 +0200
Subject: [PATCH 100/294] Streamline log lines

---
 mailstream/mailstream.php | 70 +++++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index b513cf36..c5cf8f3f 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -34,7 +34,7 @@ function mailstream_install()
 	Hook::register('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
 	Hook::register('mailstream_send_hook', 'addon/mailstream/mailstream.php', 'mailstream_send_hook');
 
-	Logger::info("mailstream: installed");
+	Logger::info("installed mailstream");
 }
 
 /**
@@ -44,7 +44,7 @@ function mailstream_check_version()
 {
 	if (!is_null(DI::config()->get('mailstream', 'dbversion'))) {
 		DI::config()->delete('mailstream', 'dbversion');
-		Logger::info("mailstream_check_version: old version detected, reinstalling");
+		Logger::info("old version detected, reinstalling");
 		mailstream_install();
 		Hook::loadHooks();
 		Hook::add(
@@ -105,7 +105,7 @@ function mailstream_generate_id(string $uri): string
 	$host = DI::baseUrl()->getHost();
 	$resource = hash('md5', $uri);
 	$message_id = "<" . $resource . "@" . $host . ">";
-	Logger::debug('mailstream: Generated message ID ' . $message_id . ' for URI ' . $uri);
+	Logger::debug('generated message ID', ['id' => $message_id, 'uri' => $uri]);
 	return $message_id;
 }
 
@@ -114,20 +114,20 @@ function mailstream_send_hook(array $data)
 	$criteria = array('uid' => $data['uid'], 'contact-id' => $data['contact-id'], 'uri' => $data['uri']);
 	$item = Post::selectFirst([], $criteria);
 	if (empty($item)) {
-		Logger::error('mailstream_send_hook could not find item');
+		Logger::error('could not find item');
 		return;
 	}
 
 	$user = User::getById($item['uid']);
 	if (empty($user)) {
-			Logger::error('mailstream_send_hook could not fund user', ['uid' => $item['uid']]);
+			Logger::error('could not find user', ['uid' => $item['uid']]);
 		return;
 	}
 
 	if (!mailstream_send($data['message_id'], $item, $user)) {
-		Logger::debug('mailstream_send_hook send failed, will retry', $data);
+		Logger::debug('send failed, will retry', $data);
 		if (!Worker::defer()) {
-			Logger::error('mailstream_send_hook failed and could not defer', $data);
+			Logger::error('failed and could not defer', $data);
 		}
 	}
 }
@@ -145,32 +145,32 @@ function mailstream_post_hook(array &$item)
 	mailstream_check_version();
 
 	if (!DI::pConfig()->get($item['uid'], 'mailstream', 'enabled')) {
-		Logger::debug('mailstream: not enabled.', ['item' => $item['id'], ' uid ' => $item['uid']]);
+		Logger::debug('mailstream not enabled.', ['item' => $item['id'], 'uid' => $item['uid']]);
 		return;
 	}
 	if (!$item['uid']) {
-		Logger::debug('mailstream: no uid for item ' . $item['id']);
+		Logger::debug('no uid', ['item' => $item['id']]);
 		return;
 	}
 	if (!$item['contact-id']) {
-		Logger::debug('mailstream: no contact-id for item ' . $item['id']);
+		Logger::debug('no contact-id', ['item' => $item['id']]);
 		return;
 	}
 	if (!$item['uri']) {
-		Logger::debug('mailstream: no uri for item ' . $item['id']);
+		Logger::debug('no uri', ['item' => $item['id']]);
 		return;
 	}
 	if ($item['verb'] == Activity::ANNOUNCE) {
-		Logger::debug('mailstream: announce item ', ['item' => $item['id']]);
+		Logger::debug('ignoring announce', ['item' => $item['id']]);
 		return;
 	}
 	if (DI::pConfig()->get($item['uid'], 'mailstream', 'nolikes')) {
 		if ($item['verb'] == Activity::LIKE) {
-			Logger::debug('mailstream: like item ' . $item['id']);
+			Logger::debug('ignoring like', ['item' => $item['id']]);
 			return;
 		}
 		if ($item['verb'] == Activity::DISLIKE) {
-			Logger::debug('mailstream: dislike item ' . $item['id']);
+			Logger::debug('ignoring dislike', ['item' => $item['id']]);
 			return;
 		}
 	}
@@ -221,7 +221,7 @@ function mailstream_do_images(array &$item, array &$attachments)
 		try {
 			$curlResult = DI::httpClient()->fetchFull($url, HttpClientAccept::DEFAULT, 0, $cookiejar);
 		} catch (InvalidArgumentException $e) {
-			Logger::error('mailstream_do_images exception fetching url', ['url' => $url, 'item_id' => $item['id']]);
+			Logger::error('exception fetching url', ['url' => $url, 'item_id' => $item['id']]);
 			continue;
 		}
 		$attachments[$url] = [
@@ -322,13 +322,12 @@ function mailstream_subject(array $item): string
 	}
 	$contact = Contact::selectFirst([], ['id' => $item['contact-id'], 'uid' => $item['uid']]);
 	if (!DBA::isResult($contact)) {
-		Logger::error(
-			'mailstream_subject no contact for item',
-			['id' => $item['id'],
-				'plink' => $item['plink'],
-				'contact id' => $item['contact-id'],
-			'uid' => $item['uid']]
-		);
+		Logger::error('no contact', [
+			'item' => $item['id'],
+			'plink' => $item['plink'],
+			'contact id' => $item['contact-id'],
+			'uid' => $item['uid']
+		]);
 		return DI::l10n()->t("Friendica post");
 	}
 	if ($contact['network'] === 'dfrn') {
@@ -365,17 +364,16 @@ function mailstream_subject(array $item): string
 function mailstream_send(string $message_id, array $item, array $user): bool
 {
 	if (!is_array($item)) {
-		Logger::error('mailstream_send item is empty', ['message_id' => $message_id]);
+		Logger::error('item is empty', ['message_id' => $message_id]);
 		return false;
 	}
 
 	if (!$item['visible']) {
-		Logger::debug('mailstream_send item not yet visible', ['item uri' => $item['uri']]);
+		Logger::debug('item not yet visible', ['item uri' => $item['uri']]);
 		return false;
 	}
 	if (!$message_id) {
-		Logger::error('mailstream_send no message ID supplied', ['item uri' => $item['uri'],
-				'user email' => $user['email']]);
+		Logger::error('no message ID supplied', ['item uri' => $item['uri'], 'user email' => $user['email']]);
 		return true;
 	}
 
@@ -432,13 +430,15 @@ function mailstream_send(string $message_id, array $item, array $user): bool
 		if (!$mail->Send()) {
 			throw new Exception($mail->ErrorInfo);
 		}
-		Logger::debug('mailstream_send sent message', ['message ID' => $mail->MessageID,
-				'subject' => $mail->Subject,
-				'address' => $address]);
+		Logger::debug('sent message', [
+			'message ID' => $mail->MessageID,
+			'subject' => $mail->Subject,
+			'address' => $address
+		]);
 	} catch (phpmailerException $e) {
-		Logger::debug('mailstream_send PHPMailer exception sending message ' . $message_id . ': ' . $e->errorMessage());
+		Logger::debug('PHPMailer exception sending message', ['id' => $message_id, 'error' => $e->errorMessage()]);
 	} catch (Exception $e) {
-		Logger::debug('mailstream_send exception sending message ' . $message_id . ': ' . $e->getMessage());
+		Logger::debug('exception sending message', ['id' => $message_id, 'error' => $e->getMessage()]);
 	}
 
 	return true;
@@ -468,7 +468,7 @@ function mailstream_html_wrap(string &$text)
 function mailstream_convert_table_entries()
 {
 	$ms_item_ids = DBA::selectToArray('mailstream_item', [], ['message-id', 'uri', 'uid', 'contact-id'], ["`mailstream_item`.`completed` IS NULL"]);
-	Logger::debug('mailstream_convert_table_entries processing ' . count($ms_item_ids) . ' items');
+	Logger::debug('processing items', ['count' => count($ms_item_ids)]);
 	foreach ($ms_item_ids as $ms_item_id) {
 		$send_hook_data = array('uid' => $ms_item_id['uid'],
 					'contact-id' => $ms_item_id['contact-id'],
@@ -476,10 +476,10 @@ function mailstream_convert_table_entries()
 					'message_id' => $ms_item_id['message-id'],
 					'tries' => 0);
 		if (!$ms_item_id['message-id'] || !strlen($ms_item_id['message-id'])) {
-			Logger::info('mailstream_convert_table_entries: item has no message-id.', ['item' => $ms_item_id['id'], 'uri' => $ms_item_id['uri']]);
-							continue;
+			Logger::info('item has no message-id', ['item' => $ms_item_id['id'], 'uri' => $ms_item_id['uri']]);
+			continue;
 		}
-		Logger::info('mailstream_convert_table_entries: convert item to workerqueue', $send_hook_data);
+		Logger::info('convert item to workerqueue', $send_hook_data);
 		Hook::fork(Worker::PRIORITY_LOW, 'mailstream_send_hook', $send_hook_data);
 	}
 	DBA::e('DROP TABLE `mailstream_item`');

From f3db763c599cfeb830fdf95a8de5738c183be30b Mon Sep 17 00:00:00 2001
From: Matthew Exon <mat.github@exon.name>
Date: Tue, 9 Jul 2024 20:13:00 +0100
Subject: [PATCH 101/294] More comprehensible check for root user contact

---
 mailstream/mailstream.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index c5cf8f3f..b86c4e2a 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -144,12 +144,12 @@ function mailstream_post_hook(array &$item)
 {
 	mailstream_check_version();
 
-	if (!DI::pConfig()->get($item['uid'], 'mailstream', 'enabled')) {
-		Logger::debug('mailstream not enabled.', ['item' => $item['id'], 'uid' => $item['uid']]);
+	if ($item['uid'] === 0) {
+		Logger::debug('mailstream: root user, skipping item ' . $item['id']);
 		return;
 	}
-	if (!$item['uid']) {
-		Logger::debug('no uid', ['item' => $item['id']]);
+	if (!DI::pConfig()->get($item['uid'], 'mailstream', 'enabled')) {
+		Logger::debug('mailstream: not enabled.', ['item' => $item['id'], ' uid ' => $item['uid']]);
 		return;
 	}
 	if (!$item['contact-id']) {

From 589cf712cc92911d5288b1dfff06bd8c9d4cfb78 Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sun, 14 Jul 2024 18:56:22 +0200
Subject: [PATCH 102/294] Remove old version conversion code

---
 mailstream/mailstream.php | 44 ---------------------------------------
 1 file changed, 44 deletions(-)

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index b86c4e2a..8bce2529 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -37,25 +37,6 @@ function mailstream_install()
 	Logger::info("installed mailstream");
 }
 
-/**
- * Enforces that mailstream_install has set up the current version
- */
-function mailstream_check_version()
-{
-	if (!is_null(DI::config()->get('mailstream', 'dbversion'))) {
-		DI::config()->delete('mailstream', 'dbversion');
-		Logger::info("old version detected, reinstalling");
-		mailstream_install();
-		Hook::loadHooks();
-		Hook::add(
-			'mailstream_convert_table_entries',
-			'addon/mailstream/mailstream.php',
-			'mailstream_convert_table_entries'
-		);
-		Hook::fork(Worker::PRIORITY_LOW, 'mailstream_convert_table_entries');
-	}
-}
-
 /**
  * This is a statement rather than an actual function definition. The simple
  * existence of this method is checked to figure out if the addon offers a
@@ -142,8 +123,6 @@ function mailstream_send_hook(array $data)
  */
 function mailstream_post_hook(array &$item)
 {
-	mailstream_check_version();
-
 	if ($item['uid'] === 0) {
 		Logger::debug('mailstream: root user, skipping item ' . $item['id']);
 		return;
@@ -462,29 +441,6 @@ function mailstream_html_wrap(string &$text)
 	return $text;
 }
 
-/**
- * Convert v1 mailstream table entries to v2 workerqueue items
- */
-function mailstream_convert_table_entries()
-{
-	$ms_item_ids = DBA::selectToArray('mailstream_item', [], ['message-id', 'uri', 'uid', 'contact-id'], ["`mailstream_item`.`completed` IS NULL"]);
-	Logger::debug('processing items', ['count' => count($ms_item_ids)]);
-	foreach ($ms_item_ids as $ms_item_id) {
-		$send_hook_data = array('uid' => $ms_item_id['uid'],
-					'contact-id' => $ms_item_id['contact-id'],
-					'uri' => $ms_item_id['uri'],
-					'message_id' => $ms_item_id['message-id'],
-					'tries' => 0);
-		if (!$ms_item_id['message-id'] || !strlen($ms_item_id['message-id'])) {
-			Logger::info('item has no message-id', ['item' => $ms_item_id['id'], 'uri' => $ms_item_id['uri']]);
-			continue;
-		}
-		Logger::info('convert item to workerqueue', $send_hook_data);
-		Hook::fork(Worker::PRIORITY_LOW, 'mailstream_send_hook', $send_hook_data);
-	}
-	DBA::e('DROP TABLE `mailstream_item`');
-}
-
 /**
  * Form for configuring mailstream features for a user
  *

From c0535db74214eb0983c7bd145702d9600fc169f2 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 5 Aug 2024 20:37:58 +0000
Subject: [PATCH 103/294] Statistics: inbound / outbound for Tumblr and Bluesky

---
 bluesky/bluesky.php | 2 ++
 tumblr/tumblr.php   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 6994b3e3..9f21674f 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1946,6 +1946,7 @@ function bluesky_post(int $uid, string $url, string $params, array $headers): ?s
 		return null;
 	}
 
+	Item::incrementOutbound(Protocol::BLUESKY);
 	try {
 		$curlResult = DI::httpClient()->post($pds . $url, $params, $headers);
 	} catch (\Exception $e) {
@@ -1982,6 +1983,7 @@ function bluesky_xrpc_get(int $uid, string $url, array $parameters = []): ?stdCl
 
 function bluesky_get(string $url, string $accept_content = HttpClientAccept::DEFAULT, array $opts = []): ?stdClass
 {
+	Item::incrementInbound(Protocol::BLUESKY);
 	try {
 		$curlResult = DI::httpClient()->get($url, $accept_content, $opts);
 	} catch (\Exception $e) {
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index f0c68f33..945f8f35 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -1326,6 +1326,7 @@ function tumblr_get_contact_by_url(string $url, int $uid): ?array
  */
 function tumblr_get(int $uid, string $url, array $parameters = []): stdClass
 {
+	Item::incrementInbound(Protocol::TUMBLR);
 	$url = 'https://api.tumblr.com/v2/' . $url;
 
 	if ($uid == 0) {
@@ -1355,6 +1356,7 @@ function tumblr_get(int $uid, string $url, array $parameters = []): stdClass
  */
 function tumblr_post(int $uid, string $url, array $parameters): stdClass
 {
+	Item::incrementOutbound(Protocol::TUMBLR);
 	$url = 'https://api.tumblr.com/v2/' . $url;
 
 	$curlResult = DI::httpClient()->post($url, $parameters, ['Authorization' => ['Bearer ' . tumblr_get_token($uid)]]);

From 46a55f13f7bd2566e0ede5bdb5df6d78c42fdab4 Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Mon, 22 Jul 2024 18:23:23 +0200
Subject: [PATCH 104/294] Ratioed: add help text

---
 ratioed/RatioedPanel.php   |  7 +++
 ratioed/templates/help.tpl | 92 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+)
 create mode 100644 ratioed/templates/help.tpl

diff --git a/ratioed/RatioedPanel.php b/ratioed/RatioedPanel.php
index 16f9df6f..e25c7f34 100644
--- a/ratioed/RatioedPanel.php
+++ b/ratioed/RatioedPanel.php
@@ -6,6 +6,7 @@ use Friendica\Content\Pager;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\User;
 use Friendica\Module\Moderation\Users\Active;
 
@@ -18,6 +19,11 @@ class RatioedPanel extends Active
 	{
 		Active::content();
 
+		if (isset(DI::args()->getArgv()[1]) and DI::args()->getArgv()[1] === 'help') {
+			$template = Renderer::getMarkupTemplate('/help.tpl', 'addon/ratioed/');
+			return Renderer::replaceMacros($template, array('$config' => DI::baseUrl() . '/settings/addon'));
+		}
+
 		$action = $this->parameters['action'] ?? '';
 		$uid	= $this->parameters['uid']	?? 0;
 
@@ -111,6 +117,7 @@ class RatioedPanel extends Active
 		return self::getTabsHTML('ratioed') . Renderer::replaceMacros($t, [
 			// strings //
 			'$title'		  => $this->t('Moderation'),
+			'$help_url'		  => $this->baseUrl . '/ratioed/help',
 			'$page'		   => $this->t('Behaviour'),
 			'$select_all'	 => $this->t('select all'),
 			'$delete'		 => $this->t('Delete'),
diff --git a/ratioed/templates/help.tpl b/ratioed/templates/help.tpl
new file mode 100644
index 00000000..fee47e34
--- /dev/null
+++ b/ratioed/templates/help.tpl
@@ -0,0 +1,92 @@
+<div class="panel 'help-content-wrapper">
+  <div class="panel-body">
+    <h2>Ratioed Plugin Help</h2>
+    <p>
+      This plugin provides administrators with additional statistics about
+      the behaviour of users.  These may be useful as early warning signs
+      that warrant more carefully watching the behaviour of a user.  They
+      are <em>not</em> suitable as a trigger for instantly blocking,
+      muting, or reporting a user, since they lack context.
+    </p>
+    <p>
+      The name of the plugin comes
+      from <a href="https://knowyourmeme.com/editorials/guides/what-is-the-ratio-and-what-does-it-mean-to-get-ratioed-twitters-1-rule-explained">"The
+        Ratio"</a>, a well-known quick rule of thumb:
+    </p>
+    <blockquote>
+      If the Replies:RT ratio is greater than 2:1, you done messed up.
+    </blockquote>
+    <p>
+      To "get ratioed" is to receive a large number of comments in a short
+      space of time, with relatively few likes or boosts.  If commenters
+      were enthusiastic about the posts, they would also have liked or
+      boosted them.  Receiving many comments without such likes or boosts
+      indicates the comments were probably angry.  This anger may or may
+      not be justified, but either way this is probably something
+      moderators should be aware of.
+    </p>
+    <p>
+      This plugin allows viewing of an actual ratio, calculated over the
+      last 24 hours.  This is a useful timeframe for sudden dogpiling
+      events that administrators might not otherwise notice.  The plugin
+      also calculates other statistics.
+    </p>
+    <h3>Explanation of Statistics</h3>
+    <h4>Blocked by</h4>
+    <p>
+      This summarises the number of users on remote servers that have
+      blocked this user.
+    </p>
+    <p>
+      Note that the ActivityPub spec expressly says that
+      implementations "SHOULD NOT" forward such block messages to
+      remote servers.  Nevertheless some implementations do this
+      anyway, notably Mastodon.  This statistic can only count block
+      messages from servers that do this, as well as blocks from local
+      users.  As such, it is usually an undercount.
+    </p>
+    <p>
+      The reason the spec recommends against forwarding these messages
+      is that they can lead to retaliation.  For this reason, this
+      plugin deliberately does not provide any way to investigate
+      exactly who blocked the user.
+    </p>
+    <h4>Comments last 24h</h4>
+    <p>
+      This gives the number of comments made on the top-level posts that
+      this user made within the last 24 hours.
+    </p>
+    <h4>Reactions last 24h</h4>
+    <p>
+      This collects the number of likes, boosts, or other "one-click"
+      interactions made on the user's top-level posts within the last 24
+      hours.
+    </p>
+    <h4>Ratio last 24h</h4>
+    <p>
+      This is the ratio between "Comments last 24h" and "Reactions last
+      24h".  It is intended to approximate the traditional ratio as
+      understood on Twitter.
+    </p>
+    <h3>Performance</h3>
+    <p>
+      The statistics are computed from scratch each time the page loads.
+      It's possible that this might put a heavy load on the database. and
+      the page may take a long time to load.
+    </p>
+    <h3>Extending</h3>
+    <p>
+      Suggestions for additional statistics are welcome, especially from
+      moderators.  This plugin should be considered a sandbox for
+      experimentation, so it is not necessary to prove that any statistic
+      is correlated with unwanted behaviour.
+    </p>
+    <p>
+      However, this plugin does deal with potentially sensitive
+      information.  Even if moderators do in principle have access to all
+      information, it should not necessarily be highlighted.  Statistics
+      should be kept anonymous and neutral.  Also, they should be
+      presented only to moderators, not to the users themselves.
+    </p>
+  </div>
+</div>

From 4bfdb45e81c8550ab89381670c068455d780bcf5 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 12 Aug 2024 20:20:32 +0000
Subject: [PATCH 105/294] Bluesky/Tumblr: Improved statistics

---
 bluesky/bluesky.php | 23 +++++++++++++----------
 tumblr/tumblr.php   | 22 +++++++++++++---------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 9f21674f..19466a42 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -294,9 +294,9 @@ function bluesky_block(array &$hook_data)
 
 	$activity = bluesky_xrpc_post($hook_data['uid'], 'com.atproto.repo.createRecord', $post);
 	if (!empty($activity->uri)) {
-		$cdata = Contact::getPublicAndUserContactID($hook_data['contact']['id'], $hook_data['uid']);
-		if (!empty($cdata['user'])) {
-			Contact::remove($cdata['user']);
+		$ucid = Contact::getUserContactId($hook_data['contact']['id'], $hook_data['uid']);
+		if ($ucid) {
+			Contact::remove($ucid);
 		}
 		Logger::debug('Successfully blocked contact', ['url' => $hook_data['contact']['url'], 'uri' => $activity->uri]);
 	}
@@ -975,6 +975,7 @@ function bluesky_upload_blob(int $uid, array $photo): ?stdClass
 		return null;
 	}
 
+	Item::incrementOutbound(Protocol::BLUESKY);
 	Logger::debug('Uploaded blob', ['return' => $data, 'uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
 	return $data->blob;
 }
@@ -1048,8 +1049,8 @@ function bluesky_process_reason(stdClass $reason, string $uri, int $uid)
 	$item['owner-link']   = $item['author-link'];
 	$item['owner-avatar'] = $item['author-avatar'];
 	if (Item::insert($item)) {
-		$cdata = Contact::getPublicAndUserContactID($contact['id'], $uid);
-		Item::update(['post-reason' => Item::PR_ANNOUNCEMENT, 'causer-id' => $cdata['public']], ['uri' => $uri, 'uid' => $uid]);
+		$pcid = Contact::getPublicContactId($contact['id'], $uid);
+		Item::update(['post-reason' => Item::PR_ANNOUNCEMENT, 'causer-id' => $pcid], ['uri' => $uri, 'uid' => $uid]);
 	}
 }
 
@@ -1537,8 +1538,7 @@ function bluesky_fetch_missing_post(string $uri, int $uid, int $fetch_uid, int $
 	Logger::debug('Reply count', ['level' => $level, 'uid' => $uid, 'uri' => $uri]);
 
 	if ($causer != 0) {
-		$cdata = Contact::getPublicAndUserContactID($causer, $uid);
-		$causer = $cdata['public'] ?? 0;
+		$causer = Contact::getPublicContactId($causer, $uid);
 	}
 
 	return bluesky_process_thread($data->thread, $uid, $fetch_uid, $post_reason, $causer, $level, $last_poll);
@@ -1936,7 +1936,11 @@ function bluesky_create_token(int $uid, string $password): string
 
 function bluesky_xrpc_post(int $uid, string $url, $parameters): ?stdClass
 {
-	return bluesky_post($uid, '/xrpc/' . $url, json_encode($parameters),  ['Content-type' => 'application/json', 'Authorization' => ['Bearer ' . bluesky_get_token($uid)]]);
+	$data = bluesky_post($uid, '/xrpc/' . $url, json_encode($parameters),  ['Content-type' => 'application/json', 'Authorization' => ['Bearer ' . bluesky_get_token($uid)]]);
+	if (!empty($data)) {
+		Item::incrementOutbound(Protocol::BLUESKY);
+	}
+	return $data;
 }
 
 function bluesky_post(int $uid, string $url, string $params, array $headers): ?stdClass
@@ -1946,7 +1950,6 @@ function bluesky_post(int $uid, string $url, string $params, array $headers): ?s
 		return null;
 	}
 
-	Item::incrementOutbound(Protocol::BLUESKY);
 	try {
 		$curlResult = DI::httpClient()->post($pds . $url, $params, $headers);
 	} catch (\Exception $e) {
@@ -1983,7 +1986,6 @@ function bluesky_xrpc_get(int $uid, string $url, array $parameters = []): ?stdCl
 
 function bluesky_get(string $url, string $accept_content = HttpClientAccept::DEFAULT, array $opts = []): ?stdClass
 {
-	Item::incrementInbound(Protocol::BLUESKY);
 	try {
 		$curlResult = DI::httpClient()->get($url, $accept_content, $opts);
 	} catch (\Exception $e) {
@@ -1996,5 +1998,6 @@ function bluesky_get(string $url, string $accept_content = HttpClientAccept::DEF
 		return null;
 	}
 
+	Item::incrementInbound(Protocol::BLUESKY);
 	return json_decode($curlResult->getBodyString());
 }
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 945f8f35..dd34bd41 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -133,6 +133,7 @@ function tumblr_item_by_link(array &$hookData)
 	Logger::debug('Got post', ['blog' => $matches[1], 'id' => $matches[2], 'result' => $result->response->posts]);
 	if (!empty($result->response->posts)) {
 		$hookData['item_id'] = tumblr_process_post($result->response->posts[0], $hookData['uid'], Item::PR_FETCHED);
+		Item::incrementInbound(Protocol::TUMBLR);
 	}
 }
 
@@ -203,9 +204,9 @@ function tumblr_block(array &$hook_data)
 	$hook_data['result'] = ($result->meta->status <= 399);
 
 	if ($hook_data['result']) {
-		$cdata = Contact::getPublicAndUserContactID($hook_data['contact']['id'], $hook_data['uid']);
-		if (!empty($cdata['user'])) {
-			Contact::remove($cdata['user']);
+		$ucid = Contact::getUserContactId($hook_data['contact']['id'], $hook_data['uid']);
+		if ($ucid) {
+			Contact::remove($ucid);
 		}
 	}
 }
@@ -238,9 +239,7 @@ function tumblr_get_contact_uuid(array $contact): string
  * existence of this method is checked to figure out if the addon offers a
  * module.
  */
-function tumblr_module()
-{
-}
+function tumblr_module() {}
 
 function tumblr_content()
 {
@@ -756,6 +755,7 @@ function tumblr_fetch_tags(int $uid, int $last_poll)
 				$post = Post::selectFirst(['uri-id'], ['id' => $id]);
 				$stored = Post\Category::storeFileByURIId($post['uri-id'], $uid, Post\Category::SUBCRIPTION, $tag);
 				Logger::debug('Stored tag subscription for user', ['uri-id' => $post['uri-id'], 'uid' => $uid, 'tag' => $tag, 'stored' => $stored]);
+				Item::incrementInbound(Protocol::TUMBLR);
 			}
 		}
 	}
@@ -795,6 +795,7 @@ function tumblr_fetch_dashboard(int $uid, int $last_poll)
 		Logger::debug('Importing post', ['uid' => $uid, 'created' => date(DateTimeFormat::MYSQL, $post->timestamp), 'id' => $post->id_string]);
 
 		tumblr_process_post($post, $uid, Item::PR_NONE, $last_poll);
+		Item::incrementInbound(Protocol::TUMBLR);
 
 		DI::pConfig()->set($uid, 'tumblr', 'last_id', $last);
 	}
@@ -1167,6 +1168,7 @@ function tumblr_get_contact_fields(stdClass $blog, int $uid, bool $update): arra
 		Logger::notice('Error fetching blog info', ['meta' => $info->meta, 'response' => $info->response, 'errors' => $info->errors]);
 		return $fields;
 	}
+	Item::incrementInbound(Protocol::TUMBLR);
 
 	$avatar = $info->response->blog->avatar;
 	if (!empty($avatar)) {
@@ -1231,6 +1233,8 @@ function tumblr_get_blogs(int $uid): array
 		return [];
 	}
 
+	Item::incrementInbound(Protocol::TUMBLR);
+
 	$blogs = [];
 	foreach ($userinfo->response->user->blogs as $blog) {
 		$blogs[$blog->uuid] = $blog->name;
@@ -1287,10 +1291,11 @@ function tumblr_get_contact_by_url(string $url, int $uid): ?array
 	if ($info->meta->status > 399) {
 		Logger::notice('Error fetching blog info', ['meta' => $info->meta, 'response' => $info->response, 'errors' => $info->errors, 'blog' => $blog, 'uid' => $uid]);
 		return null;
-	} else {
-		Logger::debug('Got data', ['blog' => $blog, 'meta' => $info->meta]);
 	}
 
+	Logger::debug('Got data', ['blog' => $blog, 'meta' => $info->meta]);
+	Item::incrementInbound(Protocol::TUMBLR);
+
 	$baseurl = 'https://tumblr.com';
 	$url     = $baseurl . '/' . $info->response->blog->name;
 
@@ -1326,7 +1331,6 @@ function tumblr_get_contact_by_url(string $url, int $uid): ?array
  */
 function tumblr_get(int $uid, string $url, array $parameters = []): stdClass
 {
-	Item::incrementInbound(Protocol::TUMBLR);
 	$url = 'https://api.tumblr.com/v2/' . $url;
 
 	if ($uid == 0) {

From a55f80cb39ea8737a56e265cb9edda6739cc2755 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 15 Aug 2024 06:44:57 +0200
Subject: [PATCH 106/294] updated translations

---
 curweather/lang/fr/messages.po | 7 ++++---
 curweather/lang/fr/strings.php | 2 +-
 geonames/lang/fr/messages.po   | 7 ++++---
 geonames/lang/fr/strings.php   | 2 +-
 gnot/lang/fr/messages.po       | 7 ++++---
 gnot/lang/fr/strings.php       | 2 +-
 gravatar/lang/fr/messages.po   | 7 ++++---
 gravatar/lang/fr/strings.php   | 2 +-
 ijpost/lang/fr/messages.po     | 7 ++++---
 ijpost/lang/fr/strings.php     | 2 +-
 krynn/lang/fr/messages.po      | 7 ++++---
 krynn/lang/fr/strings.php      | 2 +-
 12 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/curweather/lang/fr/messages.po b/curweather/lang/fr/messages.po
index 57ed6b8b..21e60c54 100644
--- a/curweather/lang/fr/messages.po
+++ b/curweather/lang/fr/messages.po
@@ -5,6 +5,7 @@
 # 
 # Translators:
 # bob lebonche <lebonche@tutanota.com>, 2021
+# cracrayol, 2024
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2022
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2016
 # ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
@@ -15,8 +16,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:14-0500\n"
 "PO-Revision-Date: 2014-06-22 11:34+0000\n"
-"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>, 2022\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"Last-Translator: cracrayol, 2024\n"
+"Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,7 +46,7 @@ msgstr "Vent"
 
 #: curweather.php:140
 msgid "Last Updated"
-msgstr "Dernière mise-à-jour"
+msgstr "Dernière mise à jour"
 
 #: curweather.php:141
 msgid "Data by"
diff --git a/curweather/lang/fr/strings.php b/curweather/lang/fr/strings.php
index be5c1ba5..268b3a42 100644
--- a/curweather/lang/fr/strings.php
+++ b/curweather/lang/fr/strings.php
@@ -10,7 +10,7 @@ $a->strings['Current Weather'] = 'Météo actuelle';
 $a->strings['Relative Humidity'] = 'Humidité relative';
 $a->strings['Pressure'] = 'Pression';
 $a->strings['Wind'] = 'Vent';
-$a->strings['Last Updated'] = 'Dernière mise-à-jour';
+$a->strings['Last Updated'] = 'Dernière mise à jour';
 $a->strings['Data by'] = 'Données de';
 $a->strings['Show on map'] = 'Montrer sur la carte';
 $a->strings['There was a problem accessing the weather data. But have a look'] = 'Une erreur est survenue lors de l\'accès aux données météo. Vous pouvez quand même jeter un oeil';
diff --git a/geonames/lang/fr/messages.po b/geonames/lang/fr/messages.po
index b1cd8ce1..9fe03bdb 100644
--- a/geonames/lang/fr/messages.po
+++ b/geonames/lang/fr/messages.po
@@ -6,6 +6,7 @@
 # Translators:
 # bob lebonche <lebonche@tutanota.com>, 2021
 # ButterflyOfFire, 2020
+# cracrayol, 2024
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2016
 msgid ""
 msgstr ""
@@ -13,8 +14,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:14-0500\n"
 "PO-Revision-Date: 2014-06-23 08:27+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"Last-Translator: cracrayol, 2024\n"
+"Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,7 +30,7 @@ msgstr "Remplacer les coordonnées par le nom de la localité la plus proche dan
 
 #: geonames.php:136
 msgid "Enable Geonames Addon"
-msgstr "Activer l'application complémentaire Geonames"
+msgstr "Activer l'extension Geonames"
 
 #: geonames.php:141
 msgid "Geonames Settings"
diff --git a/geonames/lang/fr/strings.php b/geonames/lang/fr/strings.php
index 297e3b73..802dd118 100644
--- a/geonames/lang/fr/strings.php
+++ b/geonames/lang/fr/strings.php
@@ -6,5 +6,5 @@ function string_plural_select_fr($n){
 	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
 $a->strings['Replace numerical coordinates by the nearest populated location name in your posts.'] = 'Remplacer les coordonnées par le nom de la localité la plus proche dans votre publication.';
-$a->strings['Enable Geonames Addon'] = 'Activer l\'application complémentaire Geonames';
+$a->strings['Enable Geonames Addon'] = 'Activer l\'extension Geonames';
 $a->strings['Geonames Settings'] = 'Paramètres Geonames';
diff --git a/gnot/lang/fr/messages.po b/gnot/lang/fr/messages.po
index 3ce82e7f..8a928544 100644
--- a/gnot/lang/fr/messages.po
+++ b/gnot/lang/fr/messages.po
@@ -6,6 +6,7 @@
 # Translators:
 # bob lebonche <lebonche@tutanota.com>, 2021
 # ButterflyOfFire, 2020
+# cracrayol, 2024
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2016
 msgid ""
 msgstr ""
@@ -13,8 +14,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:14-0500\n"
 "PO-Revision-Date: 2014-06-23 08:30+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"Last-Translator: cracrayol, 2024\n"
+"Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,7 +30,7 @@ msgstr "Permettre le filtrage des notifications de commentaires par courriel sur
 
 #: gnot.php:64
 msgid "Enable this addon?"
-msgstr "Activer cette application complémentaire ?"
+msgstr "Activer cette extension ?"
 
 #: gnot.php:69
 msgid "Gnot Settings"
diff --git a/gnot/lang/fr/strings.php b/gnot/lang/fr/strings.php
index c498f7e8..53104349 100644
--- a/gnot/lang/fr/strings.php
+++ b/gnot/lang/fr/strings.php
@@ -6,6 +6,6 @@ function string_plural_select_fr($n){
 	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
 $a->strings['Allows threading of email comment notifications on Gmail and anonymising the subject line.'] = 'Permettre le filtrage des notifications de commentaires par courriel sur Gmail et l\'anonymisation de l\'objet.';
-$a->strings['Enable this addon?'] = 'Activer cette application complémentaire ?';
+$a->strings['Enable this addon?'] = 'Activer cette extension ?';
 $a->strings['Gnot Settings'] = 'Paramètres Gnot';
 $a->strings['[Friendica:Notify] Comment to conversation #%d'] = '[Friendica:Notify] Commentaire vers conversation #%d';
diff --git a/gravatar/lang/fr/messages.po b/gravatar/lang/fr/messages.po
index f8a64a1b..6ffa6214 100644
--- a/gravatar/lang/fr/messages.po
+++ b/gravatar/lang/fr/messages.po
@@ -5,6 +5,7 @@
 # 
 # Translators:
 # bob lebonche <lebonche@tutanota.com>, 2021
+# cracrayol, 2024
 # Marie Olive <lacellule101@gmail.com>, 2018
 # ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
 msgid ""
@@ -13,8 +14,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: 2014-06-23 08:33+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"Last-Translator: cracrayol, 2024\n"
+"Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +51,7 @@ msgid ""
 "Libravatar addon is installed, too. Please disable Libravatar addon or this "
 "Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
 "nothing was found at Libravatar."
-msgstr "L'application complémentaire Libravatar est aussi installée. Merci de désactiver l'application complémentaire Libravatar ou cette application complémentaire Gravatar. L'application complémentaire se repliera sur Gravatar si rien n'est trouvé dans Libravatar."
+msgstr "L'extension Libravatar est aussi installée. Merci de désactiver l'extension Libravatar ou cette extension Gravatar. L'extension se repliera sur Gravatar si rien n'est trouvé dans Libravatar."
 
 #: gravatar.php:102
 msgid "Save Settings"
diff --git a/gravatar/lang/fr/strings.php b/gravatar/lang/fr/strings.php
index b826ab65..930d7169 100644
--- a/gravatar/lang/fr/strings.php
+++ b/gravatar/lang/fr/strings.php
@@ -11,7 +11,7 @@ $a->strings['monster face'] = 'Face de monstre';
 $a->strings['computer generated face'] = 'visage généré par ordinateur';
 $a->strings['retro arcade style face'] = 'Face style retro arcade';
 $a->strings['Information'] = 'Information';
-$a->strings['Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'L\'application complémentaire Libravatar est aussi installée. Merci de désactiver l\'application complémentaire Libravatar ou cette application complémentaire Gravatar. L\'application complémentaire se repliera sur Gravatar si rien n\'est trouvé dans Libravatar.';
+$a->strings['Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'L\'extension Libravatar est aussi installée. Merci de désactiver l\'extension Libravatar ou cette extension Gravatar. L\'extension se repliera sur Gravatar si rien n\'est trouvé dans Libravatar.';
 $a->strings['Save Settings'] = 'Sauvegarder les paramètres.';
 $a->strings['Default avatar image'] = 'Image par défaut d\'avatar';
 $a->strings['Select default avatar image if none was found at Gravatar. See README'] = 'Sélectionner l\'avatar par défaut, si aucun n\'est trouvé sur Gravatar. Voir Lisezmoi.';
diff --git a/ijpost/lang/fr/messages.po b/ijpost/lang/fr/messages.po
index bc322337..6f29cad7 100644
--- a/ijpost/lang/fr/messages.po
+++ b/ijpost/lang/fr/messages.po
@@ -5,6 +5,7 @@
 # 
 # Translators:
 # bob lebonche <lebonche@tutanota.com>, 2021
+# cracrayol, 2024
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2016
 msgid ""
 msgstr ""
@@ -12,8 +13,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:17-0500\n"
 "PO-Revision-Date: 2014-06-23 08:37+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"Last-Translator: cracrayol, 2024\n"
+"Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgstr "Publier sur Insanejournal"
 
 #: ijpost.php:61
 msgid "Enable InsaneJournal Post Addon"
-msgstr "Activer l'application complémentaire InsaneJournalPost"
+msgstr "Activer l'extension InsaneJournal"
 
 #: ijpost.php:62
 msgid "InsaneJournal username"
diff --git a/ijpost/lang/fr/strings.php b/ijpost/lang/fr/strings.php
index d8e3e95d..d2fafc92 100644
--- a/ijpost/lang/fr/strings.php
+++ b/ijpost/lang/fr/strings.php
@@ -6,7 +6,7 @@ function string_plural_select_fr($n){
 	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
 $a->strings['Post to Insanejournal'] = 'Publier sur Insanejournal';
-$a->strings['Enable InsaneJournal Post Addon'] = 'Activer l\'application complémentaire InsaneJournalPost';
+$a->strings['Enable InsaneJournal Post Addon'] = 'Activer l\'extension InsaneJournal';
 $a->strings['InsaneJournal username'] = 'Identifiant du InsaneJournal';
 $a->strings['InsaneJournal password'] = 'Mot de passe du InsaneJournal';
 $a->strings['Post to InsaneJournal by default'] = 'Publier sur le InsaneJournal par défaut';
diff --git a/krynn/lang/fr/messages.po b/krynn/lang/fr/messages.po
index a96af8de..8a306eb1 100644
--- a/krynn/lang/fr/messages.po
+++ b/krynn/lang/fr/messages.po
@@ -5,14 +5,15 @@
 # 
 # Translators:
 # bob lebonche <lebonche@tutanota.com>, 2021
+# cracrayol, 2024
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:14-0500\n"
 "PO-Revision-Date: 2015-07-07 15:14+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"Last-Translator: cracrayol, 2024\n"
+"Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,7 +22,7 @@ msgstr ""
 
 #: krynn.php:127
 msgid "Enable Krynn Addon"
-msgstr "Activer l'application complémentaire Krynn"
+msgstr "Activer l'extension Krynn"
 
 #: krynn.php:132
 msgid "Krynn Settings"
diff --git a/krynn/lang/fr/strings.php b/krynn/lang/fr/strings.php
index 3c3574d0..84293f79 100644
--- a/krynn/lang/fr/strings.php
+++ b/krynn/lang/fr/strings.php
@@ -5,5 +5,5 @@ function string_plural_select_fr($n){
 	$n = intval($n);
 	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
-$a->strings['Enable Krynn Addon'] = 'Activer l\'application complémentaire Krynn';
+$a->strings['Enable Krynn Addon'] = 'Activer l\'extension Krynn';
 $a->strings['Krynn Settings'] = 'Paramètres de Krynn';

From 276c27678feb7f2660efb7b199c40346abdb5bb3 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Tue, 20 Aug 2024 18:07:51 +0200
Subject: [PATCH 107/294] [CI] Add safe.directory config

---
 .woodpecker/.code_standards_check.yml  | 3 +++
 .woodpecker/.continuous-deployment.yml | 3 +++
 .woodpecker/.messages.po_check.yml     | 3 +++
 .woodpecker/.phpunit.yml               | 3 +++
 .woodpecker/.releaser.yml              | 3 +++
 5 files changed, 15 insertions(+)

diff --git a/.woodpecker/.code_standards_check.yml b/.woodpecker/.code_standards_check.yml
index 8e0f7dc7..fb5be33c 100644
--- a/.woodpecker/.code_standards_check.yml
+++ b/.woodpecker/.code_standards_check.yml
@@ -4,6 +4,9 @@ pipeline:
   clone_friendica_base:
     image: alpine/git
     commands:
+      - git config --global user.email "no-reply@friendi.ca"
+      - git config --global user.name "Friendica"
+      - git config --global --add safe.directory $CI_WORKSPACE
       - git clone https://github.com/friendica/friendica.git .
       - git checkout $CI_COMMIT_BRANCH
     when:
diff --git a/.woodpecker/.continuous-deployment.yml b/.woodpecker/.continuous-deployment.yml
index d1202978..4d3bc5b7 100644
--- a/.woodpecker/.continuous-deployment.yml
+++ b/.woodpecker/.continuous-deployment.yml
@@ -9,6 +9,9 @@ pipeline:
   clone_friendica_base:
     image: alpine/git
     commands:
+      - git config --global user.email "no-reply@friendi.ca"
+      - git config --global user.name "Friendica"
+      - git config --global --add safe.directory $CI_WORKSPACE
       - git clone https://github.com/friendica/friendica.git .
       - git checkout $CI_COMMIT_BRANCH
     when:
diff --git a/.woodpecker/.messages.po_check.yml b/.woodpecker/.messages.po_check.yml
index ea9fa4d5..aa40ab4e 100644
--- a/.woodpecker/.messages.po_check.yml
+++ b/.woodpecker/.messages.po_check.yml
@@ -4,6 +4,9 @@ pipeline:
   clone_friendica_base:
     image: alpine/git
     commands:
+      - git config --global user.email "no-reply@friendi.ca"
+      - git config --global user.name "Friendica"
+      - git config --global --add safe.directory $CI_WORKSPACE
       - git clone https://github.com/friendica/friendica.git .
       - git checkout $CI_COMMIT_BRANCH
     when:
diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml
index 0c25a2bd..887e897e 100644
--- a/.woodpecker/.phpunit.yml
+++ b/.woodpecker/.phpunit.yml
@@ -21,6 +21,9 @@ pipeline:
   clone_friendica_base:
     image: alpine/git
     commands:
+      - git config --global user.email "no-reply@friendi.ca"
+      - git config --global user.name "Friendica"
+      - git config --global --add safe.directory $CI_WORKSPACE
       - git clone https://github.com/friendica/friendica.git .
       - git checkout $CI_COMMIT_BRANCH
   clone_friendica_addon:
diff --git a/.woodpecker/.releaser.yml b/.woodpecker/.releaser.yml
index 68bdfb21..f12697b9 100644
--- a/.woodpecker/.releaser.yml
+++ b/.woodpecker/.releaser.yml
@@ -9,6 +9,9 @@ pipeline:
   clone_friendica_base:
     image: alpine/git
     commands:
+      - git config --global user.email "no-reply@friendi.ca"
+      - git config --global user.name "Friendica"
+      - git config --global --add safe.directory $CI_WORKSPACE
       - git clone https://github.com/friendica/friendica.git .
       - git checkout $CI_COMMIT_BRANCH
     when:

From 50930c301d3d736fb204a69d1cafd778af819ca8 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 1 Sep 2024 11:39:59 +0000
Subject: [PATCH 108/294] Bluesky: Improve DID detection for custom PDS

---
 bluesky/bluesky.php | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 19466a42..101568c7 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1793,23 +1793,19 @@ function bluesky_get_did(string $handle): string
 		$handle .= '.' . BLUESKY_HOSTNAME;
 	}
 
-	// Deactivated at the moment, since it isn't reliable by now
-	//$did = bluesky_get_did_by_dns($handle);
-	//if ($did != '') {
-	//	return $did;
-	//}
-
-	//$did = bluesky_get_did_by_wellknown($handle);
-	//if ($did != '') {
-	//	return $did;
-	//}
-
 	$data = bluesky_get(BLUESKY_PDS . '/xrpc/com.atproto.identity.resolveHandle?handle=' . urlencode($handle));
-	if (empty($data) || empty($data->did)) {
-		return '';
+	if (!empty($data) && !empty($data->did)) {
+		Logger::debug('Got DID by PDS call', ['handle' => $handle, 'did' => $data->did]);
+		return $data->did;
 	}
-	Logger::debug('Got DID by PDS call', ['handle' => $handle, 'did' => $data->did]);
-	return $data->did;
+
+	// Possibly a custom PDS. 
+	$did = bluesky_get_did_by_dns($handle);
+	if ($did != '') {
+		return $did;
+	}
+	
+	return bluesky_get_did_by_wellknown($handle);
 }
 
 function bluesky_get_user_did(int $uid, bool $refresh = false): ?string

From 2f9076bffdede3add6feeae7e66e4ca095105a2c Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 3 Sep 2024 11:28:49 +0000
Subject: [PATCH 109/294] Bluesky: probing for bluesky handles

---
 bluesky/bluesky.php | 146 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 112 insertions(+), 34 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 101568c7..9145fc32 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -45,10 +45,12 @@ use Friendica\Model\Tag;
 use Friendica\Model\User;
 use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPClient\Client\HttpClientOptions;
+use Friendica\Network\HTTPClient\Client\HttpClientRequest;
 use Friendica\Object\Image;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\Relay;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
 const BLUESKY_DEFAULT_POLL_INTERVAL = 10; // given in minutes
@@ -129,8 +131,13 @@ function bluesky_probe_detect(array &$hookData)
 
 	if (parse_url($hookData['uri'], PHP_URL_SCHEME) == 'did') {
 		$did = $hookData['uri'];
-	} elseif (preg_match('#^' . BLUESKY_WEB . '/profile/(.+)#', $hookData['uri'], $matches)) {
-		$did = bluesky_get_did($matches[1]);
+	} elseif (parse_url($hookData['uri'], PHP_URL_PATH) == $hookData['uri'] && strpos($hookData['uri'], '@') === false) {
+		$did = bluesky_get_did($hookData['uri'], $pconfig['uid']);
+		if (empty($did)) {
+			return;
+		}
+	} elseif (Network::isValidHttpUrl($hookData['uri'])) {
+		$did = bluesky_get_did_by_profile($hookData['uri']);
 		if (empty($did)) {
 			return;
 		}
@@ -148,19 +155,14 @@ function bluesky_probe_detect(array &$hookData)
 		return;
 	}
 
-	$hookData['result'] = bluesky_get_contact_fields($data, 0, $pconfig['uid'], false);
-
-	$hookData['result']['baseurl'] = bluesky_get_pds($did);
+	$hookData['result'] = bluesky_get_contact_fields($data, 0, $pconfig['uid'], true);
 
 	// Preparing probe data. This differs slightly from the contact array
-	$hookData['result']['about']    = HTML::toBBCode($data->description ?? '');
 	$hookData['result']['photo']    = $data->avatar ?? '';
-	$hookData['result']['header']   = $data->banner ?? '';
 	$hookData['result']['batch']    = '';
 	$hookData['result']['notify']   = '';
 	$hookData['result']['poll']     = '';
 	$hookData['result']['poco']     = '';
-	$hookData['result']['pubkey']   = '';
 	$hookData['result']['priority'] = 0;
 	$hookData['result']['guid']     = '';
 }
@@ -177,21 +179,21 @@ function bluesky_item_by_link(array &$hookData)
 		return;
 	}
 
-	if (!preg_match('#^' . BLUESKY_WEB . '/profile/(.+)/post/(.+)#', $hookData['uri'], $matches)) {
-		return;
-	}
-
-	$did = bluesky_get_did($matches[1]);
+	$did = bluesky_get_did_by_profile($hookData['uri']);
 	if (empty($did)) {
 		return;
 	}
 
-	Logger::debug('Found bluesky post', ['url' => $hookData['uri'], 'handle' => $matches[1], 'did' => $did, 'cid' => $matches[2]]);
+	if (!preg_match('#/profile/.+/post/(.+)#', $hookData['uri'], $matches)) {
+		return;
+	}
 
-	$uri = 'at://' . $did . '/app.bsky.feed.post/' . $matches[2];
+	Logger::debug('Found bluesky post', ['url' => $hookData['uri'], 'did' => $did, 'cid' => $matches[1]]);
+
+	$uri = 'at://' . $did . '/app.bsky.feed.post/' . $matches[1];
 
 	$uri = bluesky_fetch_missing_post($uri, $hookData['uid'], $hookData['uid'], Item::PR_FETCHED, 0, 0, 0);
-	Logger::debug('Got post', ['profile' => $matches[1], 'cid' => $matches[2], 'result' => $uri]);
+	Logger::debug('Got post', ['did' => $did, 'cid' => $matches[1], 'result' => $uri]);
 	if (!empty($uri)) {
 		$item = Post::selectFirst(['id'], ['uri' => $uri, 'uid' => $hookData['uid']]);
 		if (!empty($item['id'])) {
@@ -1678,10 +1680,14 @@ function bluesky_get_contact_fields(stdClass $author, int $uid, int $fetch_uid,
 		return $fields;
 	}
 
-	$fields['baseurl'] = bluesky_get_pds($author->did);
-	if (!empty($fields['baseurl'])) {
-		GServer::check($fields['baseurl'], Protocol::BLUESKY);
-		$fields['gsid'] = GServer::getID($fields['baseurl'], true);
+	$data = bluesky_get(BLUESKY_DIRECTORY . '/' . $author->did);
+	if (!empty($data)) {		
+		$fields['baseurl'] = bluesky_get_pds('', $data);
+		if (!empty($fields['baseurl'])) {
+			GServer::check($fields['baseurl'], Protocol::BLUESKY);
+			$fields['gsid'] = GServer::getID($fields['baseurl'], true);
+		}
+		$fields['pubkey'] = bluesky_get_public_key('', $data);
 	}
 
 	$data = bluesky_xrpc_get($fetch_uid, 'app.bsky.actor.getProfile', ['actor' => $author->did]);
@@ -1748,6 +1754,42 @@ function bluesky_get_preferences(int $uid): ?stdClass
 	return $data;
 }
 
+function bluesky_get_did_by_profile(string $url): string
+{
+	try {
+		$curlResult = DI::httpClient()->get($url, HttpClientAccept::HTML, [HttpClientOptions::REQUEST => HttpClientRequest::CONTACTINFO]);
+	} catch (\Throwable $th) {
+		return '';
+	}
+	if (!$curlResult->isSuccess()) {
+		return '';
+	}
+	$profile = $curlResult->getBodyString();
+
+	$doc = new DOMDocument();
+	@$doc->loadHTML($profile);
+	$xpath = new DOMXPath($doc);
+	$list = $xpath->query('//p[@id]');
+	foreach ($list as $node) {
+		foreach ($node->attributes as $attribute) {
+			if ($attribute->name == 'id') {
+				$ids[$attribute->value] = $node->textContent;
+			}
+		}
+	}
+
+	if (empty($ids['bsky_handle']) || empty($ids['bsky_did'])) {
+		return '';
+	}
+
+	if (!bluesky_valid_did($ids['bsky_did'], $ids['bsky_handle'])) {
+		Logger::notice('Invalid DID', ['handle' => $ids['bsky_handle'], 'did' => $ids['bsky_did']]);
+		return '';
+	}
+
+	return $ids['bsky_did'];
+}
+
 function bluesky_get_did_by_wellknown(string $handle): string
 {
 	$curlResult = DI::httpClient()->get('http://' . $handle . '/.well-known/atproto-did');
@@ -1757,7 +1799,6 @@ function bluesky_get_did_by_wellknown(string $handle): string
 			Logger::notice('Invalid DID', ['handle' => $handle, 'did' => $did]);
 			return '';
 		}
-		Logger::debug('Got DID by wellknown', ['handle' => $handle, 'did' => $did]);
 		return $did;
 	}
 	return '';
@@ -1776,14 +1817,13 @@ function bluesky_get_did_by_dns(string $handle): string
 				Logger::notice('Invalid DID', ['handle' => $handle, 'did' => $did]);
 				return '';
 			}
-			Logger::debug('Got DID by DNS', ['handle' => $handle, 'did' => $did]);
 			return $did;
 		}
 	}
 	return '';
 }
 
-function bluesky_get_did(string $handle): string
+function bluesky_get_did(string $handle, int $uid): string
 {
 	if ($handle == '') {
 		return '';
@@ -1793,19 +1833,39 @@ function bluesky_get_did(string $handle): string
 		$handle .= '.' . BLUESKY_HOSTNAME;
 	}
 
+	// At first we use the user PDS. That should cover most cases.
+	$pds = DI::pConfig()->get($uid, 'bluesky', 'pds');
+	if (!empty($pds)) {
+		$data = bluesky_get($pds . '/xrpc/com.atproto.identity.resolveHandle?handle=' . urlencode($handle));
+		if (!empty($data) && !empty($data->did)) {
+			Logger::debug('Got DID by user PDS call', ['handle' => $handle, 'did' => $data->did]);
+			return $data->did;
+		}
+	}
+
+	// Then we query the DNS, which is used for third party handles (DNS should be faster than wellknown)
+	$did = bluesky_get_did_by_dns($handle);
+	if ($did != '') {
+		Logger::debug('Got DID by DNS', ['handle' => $handle, 'did' => $did]);
+		return $did;
+	}
+
+	// Then we query wellknown, which should mostly cover the rest.
+	$did = bluesky_get_did_by_wellknown($handle);
+	if ($did != '') {
+		Logger::debug('Got DID by wellknown', ['handle' => $handle, 'did' => $did]);
+		return $did;
+	}
+
+	// And finally we use the default PDS from Bluesky.
 	$data = bluesky_get(BLUESKY_PDS . '/xrpc/com.atproto.identity.resolveHandle?handle=' . urlencode($handle));
 	if (!empty($data) && !empty($data->did)) {
-		Logger::debug('Got DID by PDS call', ['handle' => $handle, 'did' => $data->did]);
+		Logger::debug('Got DID by system PDS call', ['handle' => $handle, 'did' => $data->did]);
 		return $data->did;
 	}
 
-	// Possibly a custom PDS. 
-	$did = bluesky_get_did_by_dns($handle);
-	if ($did != '') {
-		return $did;
-	}
-	
-	return bluesky_get_did_by_wellknown($handle);
+	Logger::notice('No DID detected', ['handle' => $handle]);
+	return '';
 }
 
 function bluesky_get_user_did(int $uid, bool $refresh = false): ?string
@@ -1822,7 +1882,7 @@ function bluesky_get_user_did(int $uid, bool $refresh = false): ?string
 		return null;
 	}
 
-	$did = bluesky_get_did($handle);
+	$did = bluesky_get_did($handle, $uid);
 	if (empty($did)) {
 		return null;
 	}
@@ -1853,9 +1913,11 @@ function bluesky_get_user_pds(int $uid): ?string
 	return $pds;
 }
 
-function bluesky_get_pds(string $did): ?string
+function bluesky_get_pds(string $did, stdClass $data = null): ?string
 {
-	$data = bluesky_get(BLUESKY_DIRECTORY . '/' . $did);
+	if (empty($data)) {
+		$data = bluesky_get(BLUESKY_DIRECTORY . '/' . $did);
+	}
 	if (empty($data) || empty($data->service)) {
 		return null;
 	}
@@ -1869,6 +1931,22 @@ function bluesky_get_pds(string $did): ?string
 	return null;
 }
 
+function bluesky_get_public_key(string $did, stdClass $data = null): ?string
+{
+	if (empty($data)) {
+		$data = bluesky_get(BLUESKY_DIRECTORY . '/' . $did);
+	}
+	if (empty($data) || empty($data->verificationMethod)) {
+		return null;
+	}
+	foreach ($data->verificationMethod as $method) {
+		if (!empty($method->publicKeyMultibase)) {
+			return $method->publicKeyMultibase;
+		}
+	}
+	return null;
+}
+
 function bluesky_valid_did(string $did, string $handle): bool
 {
 	$data = bluesky_get(BLUESKY_DIRECTORY . '/' . $did);

From 0dfb345f85d0b8016fd6b0c25be48e26a49e94fd Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 4 Sep 2024 11:46:33 +0000
Subject: [PATCH 110/294] "fetchFull" is replaced by "get"

---
 mailstream/mailstream.php                     | 30 +++++++++++--------
 mastodoncustomemojis/mastodoncustomemojis.php |  4 +--
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index cc283789..ae57c4dd 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -6,7 +6,6 @@
  * Author: Matthew Exon <http://mat.exon.name>
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
@@ -16,12 +15,11 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\User;
 use Friendica\Network\HTTPClient\Client\HttpClientAccept;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Protocol\Activity;
-use Friendica\Util\DateTimeFormat;
 
 /**
  * Sets up the addon hooks and the database table
@@ -53,10 +51,12 @@ function mailstream_addon_admin(string &$o)
 {
 	$frommail = DI::config()->get('mailstream', 'frommail');
 	$template = Renderer::getMarkupTemplate('admin.tpl', 'addon/mailstream/');
-	$config = ['frommail',
+	$config = [
+		'frommail',
 		DI::l10n()->t('From Address'),
 		$frommail,
-		DI::l10n()->t('Email address that stream items will appear to be from.')];
+		DI::l10n()->t('Email address that stream items will appear to be from.')
+	];
 	$o .= Renderer::replaceMacros($template, [
 		'$frommail' => $config,
 		'$submit' => DI::l10n()->t('Save Settings')
@@ -101,7 +101,7 @@ function mailstream_send_hook(array $data)
 
 	$user = User::getById($item['uid']);
 	if (empty($user)) {
-			Logger::error('could not find user', ['uid' => $item['uid']]);
+		Logger::error('could not find user', ['uid' => $item['uid']]);
 		return;
 	}
 
@@ -198,10 +198,13 @@ function mailstream_do_images(array &$item, array &$attachments)
 
 		$cookiejar = tempnam(System::getTempPath(), 'cookiejar-mailstream-');
 		try {
-			$curlResult = DI::httpClient()->fetchFull($url, HttpClientAccept::DEFAULT, 0, $cookiejar);
+			$curlResult = DI::httpClient()->get($url, HttpClientAccept::DEFAULT, [HttpClientOptions::COOKIEJAR => $cookiejar]);
 			if (!$curlResult->isSuccess()) {
 				Logger::debug('mailstream: fetch image url failed', [
-					'url' => $url, 'item_id' => $item['id'], 'return_code' => $curlResult->getReturnCode()]);
+					'url' => $url,
+					'item_id' => $item['id'],
+					'return_code' => $curlResult->getReturnCode()
+				]);
 				continue;
 			}
 		} catch (InvalidArgumentException $e) {
@@ -361,7 +364,7 @@ function mailstream_send(string $message_id, array $item, array $user): bool
 		return true;
 	}
 
-	require_once (dirname(__file__) . '/phpmailer/class.phpmailer.php');
+	require_once(dirname(__file__) . '/phpmailer/class.phpmailer.php');
 
 	$item['body'] = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
 
@@ -406,10 +409,11 @@ function mailstream_send(string $message_id, array $item, array $user): bool
 		$item['body'] = BBCode::convertForUriId($item['uri-id'], $item['body'], BBCode::CONNECTORS);
 		$item['url'] = DI::baseUrl() . '/display/' . $item['guid'];
 		$mail->Body = Renderer::replaceMacros($template, [
-						 '$upstream' => DI::l10n()->t('Upstream'),
-						 '$uri' => DI::l10n()->t('URI'),
-						 '$local' => DI::l10n()->t('Local'),
-						 '$item' => $item]);
+			'$upstream' => DI::l10n()->t('Upstream'),
+			'$uri' => DI::l10n()->t('URI'),
+			'$local' => DI::l10n()->t('Local'),
+			'$item' => $item
+		]);
 		$mail->Body = mailstream_html_wrap($mail->Body);
 		if (!$mail->Send()) {
 			throw new Exception($mail->ErrorInfo);
diff --git a/mastodoncustomemojis/mastodoncustomemojis.php b/mastodoncustomemojis/mastodoncustomemojis.php
index 561262f1..fcb8feea 100644
--- a/mastodoncustomemojis/mastodoncustomemojis.php
+++ b/mastodoncustomemojis/mastodoncustomemojis.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * Name: Mastodon Custom Emojis
  * Description: Replace emojis shortcodes in Mastodon posts with their originating server custom emojis images.
@@ -9,7 +8,6 @@
  * Status: Unsupported
  */
 
-use Friendica\App;
 use Friendica\Content\Smilies;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Hook;
@@ -78,7 +76,7 @@ function mastodoncustomemojis_fetch_custom_emojis_for_url($api_base_url)
 
 	$api_url = $api_base_url . '/api/v1/custom_emojis';
 
-	$fetchResult = DI::httpClient()->fetchFull($api_url);
+	$fetchResult = DI::httpClient()->get($api_url);
 
 	if ($fetchResult->isSuccess()) {
 		$emojis_array = json_decode($fetchResult->getBodyString(), true);

From 3dc77b21023c1258d2a7a23033f6ff6d0300b215 Mon Sep 17 00:00:00 2001
From: loma-one <m.ebers@web.de>
Date: Sat, 7 Sep 2024 21:04:43 +0200
Subject: [PATCH 111/294] unicode_smilies/unicode_smilies.php aktualisiert
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Addition of the unicode character ‘asterism’ & ‘outlines white star’
---
 unicode_smilies/unicode_smilies.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/unicode_smilies/unicode_smilies.php b/unicode_smilies/unicode_smilies.php
index 3bd30644..22ee3439 100644
--- a/unicode_smilies/unicode_smilies.php
+++ b/unicode_smilies/unicode_smilies.php
@@ -1293,6 +1293,8 @@ function unicode_smilies_smilies(array &$b)
 	Smilies::add($b, ':microscope:', '&#x1F52C');
 	Smilies::add($b, ':telescope:', '&#x1F52D');
 	Smilies::add($b, ':satellite antenna:', '&#x1F4E1');
+	Smilies::add($b, ':asterism:', '&#8258');
+	Smilies::add($b, ':outlines white star:', '&#9885');
 
 // medical
 	Smilies::add($b, ':syringe:', '&#x1F489');

From 712edf42366d0ad118116be0f23cc20ea2b6bbdd Mon Sep 17 00:00:00 2001
From: loma-one <m.ebers@web.de>
Date: Sat, 7 Sep 2024 21:10:02 +0200
Subject: [PATCH 112/294] invidious/invidious.php aktualisiert

Further addresses have been added, which are now redirected.
---
 invidious/invidious.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/invidious/invidious.php b/invidious/invidious.php
index 7153aab9..033ecce5 100644
--- a/invidious/invidious.php
+++ b/invidious/invidious.php
@@ -96,6 +96,8 @@ function invidious_render(array &$b)
 	$b['html'] = preg_replace("~https?://(?:www\.)?youtube\.com/watch\?v=(.*?)~ism", $server . '/watch?v=$1', $b['html']);
 	$b['html'] = preg_replace("~https?://(?:www\.)?youtube\.com/embed/(.*?)~ism", $server . '/embed/$1', $b['html']);
 	$b['html'] = preg_replace("~https?://(?:www\.)?youtube\.com/shorts/(.*?)~ism", $server . '/shorts/$1', $b['html']);
+	$b['html'] = preg_replace ("/https?:\/\/music.youtube.com\/(.*?)/ism", $server . '/watch?v=$1', $b['html']);
+	$b['html'] = preg_replace ("/https?:\/\/m.youtube.com\/(.*?)/ism", $server . '/watch?v=$1', $b['html']);
 	$b['html'] = preg_replace("/https?:\/\/youtu.be\/(.*?)/ism", $server . '/watch?v=$1', $b['html']);
 
 	if ($original != $b['html']) {

From 14e1c9677527118c73e999a221c006dd698a2b79 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 10 Sep 2024 10:26:05 +0000
Subject: [PATCH 113/294] Bluesky: Fix for the handling of invalid profiles

---
 bluesky/bluesky.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 9145fc32..181e8d2d 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1765,9 +1765,16 @@ function bluesky_get_did_by_profile(string $url): string
 		return '';
 	}
 	$profile = $curlResult->getBodyString();
+	if (empty($profile)) {
+		return '';
+	}
 
 	$doc = new DOMDocument();
-	@$doc->loadHTML($profile);
+	try {
+		@$doc->loadHTML($profile);
+	} catch (\Throwable $th) {
+		return '';
+	}
 	$xpath = new DOMXPath($doc);
 	$list = $xpath->query('//p[@id]');
 	foreach ($list as $node) {

From 10521115c4f51b4e773e94f3a8149711c125701e Mon Sep 17 00:00:00 2001
From: loma-one <loma-one@noreply.git.friendi.ca>
Date: Sun, 8 Sep 2024 18:12:13 +0200
Subject: [PATCH 114/294] More and updated icons for the smiley pack

---
 smiley_pack/icons/commercial/facebook.gif     | Bin 0 -> 269 bytes
 smiley_pack/icons/commercial/github.png       | Bin 0 -> 4720 bytes
 smiley_pack/icons/commercial/google.gif       | Bin 0 -> 270 bytes
 smiley_pack/icons/commercial/instagram.gif    | Bin 0 -> 1302 bytes
 smiley_pack/icons/commercial/signal.gif       | Bin 0 -> 339 bytes
 smiley_pack/icons/commercial/telegram.gif     | Bin 0 -> 627 bytes
 smiley_pack/icons/commercial/threads.png      | Bin 0 -> 1025 bytes
 smiley_pack/icons/commercial/threema.png      | Bin 0 -> 4777 bytes
 smiley_pack/icons/commercial/tiktok.gif       | Bin 0 -> 257 bytes
 smiley_pack/icons/commercial/whatsapp.gif     | Bin 0 -> 1353 bytes
 smiley_pack/icons/commercial/windows.png      | Bin 0 -> 3584 bytes
 smiley_pack/icons/fediverse/diaspora.gif      | Bin 79 -> 1147 bytes
 smiley_pack/icons/fediverse/diaspora.png      | Bin 0 -> 4656 bytes
 smiley_pack/icons/fediverse/fediverse.gif     | Bin 0 -> 444 bytes
 smiley_pack/icons/fediverse/friendica.png     | Bin 0 -> 4719 bytes
 smiley_pack/icons/fediverse/funkwhale.gif     | Bin 0 -> 471 bytes
 smiley_pack/icons/fediverse/gnusocial.gif     | Bin 0 -> 135 bytes
 smiley_pack/icons/fediverse/hubzilla.png      | Bin 0 -> 4563 bytes
 smiley_pack/icons/fediverse/lemmy.gif         | Bin 0 -> 418 bytes
 smiley_pack/icons/fediverse/misskey.gif       | Bin 405 -> 1177 bytes
 smiley_pack/icons/fediverse/peertube.gif      | Bin 0 -> 137 bytes
 smiley_pack/icons/fediverse/pixelfed.gif      | Bin 1064 -> 1262 bytes
 smiley_pack/icons/fediverse/pleroma.gif       | Bin 100 -> 180 bytes
 smiley_pack/icons/fediverse/plume.gif         | Bin 0 -> 410 bytes
 smiley_pack/icons/fediverse/writefreely.gif   | Bin 0 -> 112 bytes
 smiley_pack/icons/noncommercial/bluesky.png   | Bin 0 -> 4766 bytes
 smiley_pack/icons/noncommercial/invidious.gif | Bin 0 -> 908 bytes
 smiley_pack/icons/noncommercial/vivaldi.png   | Bin 0 -> 4945 bytes
 smiley_pack/icons/opensource/archlinux.png    | Bin 0 -> 4598 bytes
 smiley_pack/icons/opensource/debian.png       | Bin 0 -> 5357 bytes
 smiley_pack/icons/opensource/fdroid.png       | Bin 0 -> 7919 bytes
 smiley_pack/icons/opensource/fedora.png       | Bin 0 -> 1408 bytes
 smiley_pack/icons/opensource/firefox.png      | Bin 0 -> 12229 bytes
 .../icons/opensource/firefoxnightly.png       | Bin 0 -> 4987 bytes
 smiley_pack/icons/opensource/foss.png         | Bin 0 -> 4981 bytes
 smiley_pack/icons/opensource/jabber.png       | Bin 0 -> 4301 bytes
 smiley_pack/icons/opensource/kde.png          | Bin 0 -> 4678 bytes
 smiley_pack/icons/opensource/linux.png        | Bin 0 -> 5149 bytes
 smiley_pack/icons/opensource/matrix.png       | Bin 0 -> 4347 bytes
 smiley_pack/icons/opensource/mint.png         | Bin 0 -> 8663 bytes
 smiley_pack/icons/opensource/opensuse.png     | Bin 0 -> 12271 bytes
 smiley_pack/icons/opensource/raspi.png        | Bin 0 -> 4534 bytes
 smiley_pack/icons/opensource/thunderbird.png  | Bin 0 -> 4661 bytes
 smiley_pack/icons/opensource/tutanota.png     | Bin 0 -> 5011 bytes
 smiley_pack/icons/opensource/ubuntu.png       | Bin 0 -> 5067 bytes
 smiley_pack/icons/opensource/xmpp.png         | Bin 0 -> 4985 bytes
 smiley_pack/icons/respect/cc.png              | Bin 0 -> 4461 bytes
 smiley_pack/icons/respect/cc0.png             | Bin 0 -> 4669 bytes
 smiley_pack/icons/respect/ccby.png            | Bin 0 -> 4407 bytes
 smiley_pack/icons/respect/ccsa.png            | Bin 0 -> 4848 bytes
 smiley_pack/smiley_pack.php                   | 242 +++++++++++++-----
 51 files changed, 175 insertions(+), 67 deletions(-)
 create mode 100644 smiley_pack/icons/commercial/facebook.gif
 create mode 100644 smiley_pack/icons/commercial/github.png
 create mode 100644 smiley_pack/icons/commercial/google.gif
 create mode 100644 smiley_pack/icons/commercial/instagram.gif
 create mode 100644 smiley_pack/icons/commercial/signal.gif
 create mode 100644 smiley_pack/icons/commercial/telegram.gif
 create mode 100644 smiley_pack/icons/commercial/threads.png
 create mode 100644 smiley_pack/icons/commercial/threema.png
 create mode 100644 smiley_pack/icons/commercial/tiktok.gif
 create mode 100644 smiley_pack/icons/commercial/whatsapp.gif
 create mode 100644 smiley_pack/icons/commercial/windows.png
 create mode 100644 smiley_pack/icons/fediverse/diaspora.png
 create mode 100644 smiley_pack/icons/fediverse/fediverse.gif
 create mode 100644 smiley_pack/icons/fediverse/friendica.png
 create mode 100644 smiley_pack/icons/fediverse/funkwhale.gif
 create mode 100644 smiley_pack/icons/fediverse/gnusocial.gif
 create mode 100644 smiley_pack/icons/fediverse/hubzilla.png
 create mode 100644 smiley_pack/icons/fediverse/lemmy.gif
 create mode 100644 smiley_pack/icons/fediverse/peertube.gif
 create mode 100644 smiley_pack/icons/fediverse/plume.gif
 create mode 100644 smiley_pack/icons/fediverse/writefreely.gif
 create mode 100644 smiley_pack/icons/noncommercial/bluesky.png
 create mode 100644 smiley_pack/icons/noncommercial/invidious.gif
 create mode 100644 smiley_pack/icons/noncommercial/vivaldi.png
 create mode 100644 smiley_pack/icons/opensource/archlinux.png
 create mode 100644 smiley_pack/icons/opensource/debian.png
 create mode 100644 smiley_pack/icons/opensource/fdroid.png
 create mode 100644 smiley_pack/icons/opensource/fedora.png
 create mode 100644 smiley_pack/icons/opensource/firefox.png
 create mode 100644 smiley_pack/icons/opensource/firefoxnightly.png
 create mode 100644 smiley_pack/icons/opensource/foss.png
 create mode 100644 smiley_pack/icons/opensource/jabber.png
 create mode 100644 smiley_pack/icons/opensource/kde.png
 create mode 100644 smiley_pack/icons/opensource/linux.png
 create mode 100644 smiley_pack/icons/opensource/matrix.png
 create mode 100644 smiley_pack/icons/opensource/mint.png
 create mode 100644 smiley_pack/icons/opensource/opensuse.png
 create mode 100644 smiley_pack/icons/opensource/raspi.png
 create mode 100644 smiley_pack/icons/opensource/thunderbird.png
 create mode 100644 smiley_pack/icons/opensource/tutanota.png
 create mode 100644 smiley_pack/icons/opensource/ubuntu.png
 create mode 100644 smiley_pack/icons/opensource/xmpp.png
 create mode 100644 smiley_pack/icons/respect/cc.png
 create mode 100644 smiley_pack/icons/respect/cc0.png
 create mode 100644 smiley_pack/icons/respect/ccby.png
 create mode 100644 smiley_pack/icons/respect/ccsa.png

diff --git a/smiley_pack/icons/commercial/facebook.gif b/smiley_pack/icons/commercial/facebook.gif
new file mode 100644
index 0000000000000000000000000000000000000000..45488a5b5147f33b9237402acee364ec90062e08
GIT binary patch
literal 269
zcmZ?wbhEHblwgoxXc1?yikx8`Iit2~L+gai^Oqmou>H)I-52&8ymau`^>Y{RK6>){
z@zdAOUc7tp^8Jff?_Yw@hj$;oeEa_E$IstCfBpIM=kNdj|0SiBa3RHig3d*$i6yBi
z3gww484B*6z5xu1KUo;L7~~mr7=Qre5C+!L2kLz(ne$Q?tb4I@UxD@^lkRIQ$&nXc
zUuwC#PEh$OQ}<k@!UdAqlVl(KSmIlD{J;t|iGZ@^#sy}JU0V*Z{|vTXtlL+5wqeB^
zfsUp>6<brb=F~()Mw`~Qw1zcjr*_qagzC5VOw^j}YG1Eq)L1`fYQy|RYKjcj0Iwx~
AN&o-=

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/commercial/github.png b/smiley_pack/icons/commercial/github.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd5c77c95ffcc9ae0e042970c0a11b993828c2d8
GIT binary patch
literal 4720
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

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/commercial/google.gif b/smiley_pack/icons/commercial/google.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5855c74d745237a6fa3c8d17f4c630c9350b38d8
GIT binary patch
literal 270
zcmZ?wbhEHblwgoxXc1$0<!t)O#q>?IkyGmz$Ie&weYb6<9k5t1*<?kq$%-)36~Sgp
zi$BzAr>ye-JXvMldYAp1Ex)gjyuV%J=T^RtyTpI*VU?6t!h;n52|5?0CYGe8D3oWG
zWGJ|M`UWs4{$yd~VvuLhVE_V<Ll{`g9;o*zC(L75xhkW2-5TxXA8f8~>)!r)_wNk}
zM+F(!5~q5(I9PK{7H<1IbIk#^8*9X(edD%2SXau*SHA!0o8?}WKK2hvT`xK8*}jO&
yrSXOTN2S`PGRMNk<~l77c9y8FjtRBgtPutiCvvheJ5HbIH@7KYd7gnHgEas)?q!Yu

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/commercial/instagram.gif b/smiley_pack/icons/commercial/instagram.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f15e6ee8a2df5f527707ba988a3026bd3087283b
GIT binary patch
literal 1302
zcmdVZ|1;Zn0LSsq`y(NIlqBc~vxL}u7oCOp5|J+=p}s`#w(DWsO1tC6b#|szO^7eU
zG-!Hmxcas+#gJL++Y&=WJEj|*J8nf?u^-y#%;%k*)#A_C>mK*~4_;zPY#1lY8F5B-
ze?lOE013n+OZy{B@{yJOkrmm9y=lbUU)s7GZQT!S-Cx+fwMX{dKjrr)*=LvH|AI{4
zqxkJp{BR1`aC+}0g#jtZGY2-L0Gx{8RPfv}V9P0V`&8KW*)Zq`Hk~=^G~qf;v_TVY
z&_wI5q77H!ihIfm-AuMhPg$kQp3r404B10w`ih5a)gyJ0nX$yoSoAXcaLFs<8mI3%
zr~f)<V8!b~31^@rd_eD$tM|#nJ;AJR?z~SP^hBU1(EH}<ee>ph^GYLzAQO~Eepebf
zR2n%v=l_W|ut*zNERWJCqBQ!zTy0RXHt3ozs94U`D7YgEu0|VNTpm4I&NKUAETm#A
zq;f2zYCNQ}BIZFw%-92V#b{{N7`svv)-c4mJ<Mqs53L^IG*k)3M>tJYf{ALuM5XZl
zP`G*|yrEh+{)K3=Ml@9;`mvAOb&uPAkK57DZ6Arc)6eawi`Df<chrh?bz&{fM(V^m
zoDJ&4(~yloHuy4bx=S$FEg0w)4Bm>H=@brrE9k73%-oX9bczO5(m9n>-(YUMnZ6-@
zu1zx0m|$p?PPR&?niA%l5)4fV3wO@X-%gx|5(G*BlmeIrOlIi-<^xl{xkOk1Oa<uS
z4btB?tza2|<p8RINezx#$apV;_X6099Q9%NFbf|Ca2((hC^P_Qu!Dv-@MRnL7~snk
z_$z?FJHR!ni>t@~6yr5Ta5X!tF#8g{=;OjGbg|@oGQuzsfDLkj_#@_>9t9!2Moz4c
zd!8qH#J2^CWV1bqEv&S5|NY>COw~IXYdbN@g5SDh6?>5z)Cy~RH;bY*vdrsDYYppU
z>M=EYL84$@{Fz17^zi)R3XjW|vxGK^)N|XMHHiaL_2~|2wu~uOT6z$k7=ypYTA~s{
zqy80KUX1=qYQy~8n6Ip*@f%Ce`0d}l8;*{pS+jWURjnbVnJXV%rtp(aY>8Cw9E^yd
zE{@qLo;lwrlZb=X7RoZ7g<ZIc?Cllr@-7<e)y-7Zx9|mov&qZIjMgdigB-`Tludeg
zJIR{B+m!350h@`yVfU%05{;?<hshEk0Ilt7-g>sse6!B(sf}`nr1n+_`>{f!V%CPn
zZ#|CC?5cQ)>WdxJIPWPQ<{&TNUq#giYF=C3w$u+*$l|E3B&D1nnlmOjq?Sxu=C>JM
z)$qFH9tJYwFr=L9Y+bk<Fsys^iw^_kD=nQq%j9FmD26I#VvYYOy04jEQ_f36c))7t
zeH3H69oW0%9Ztsw-Y0!8^$C7ED;-#}mjA%elr19d<ggJ7<eCT;H7M~fOg-AoNhVq>
wCC~D7lf{qx2ZtITsyuTFE}?dEd6{jnsS~Tc(RohlEx%H{gSuUCBqI_30Z9t(Y5)KL

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/commercial/signal.gif b/smiley_pack/icons/commercial/signal.gif
new file mode 100644
index 0000000000000000000000000000000000000000..db5aea12ec33b315e405aa7871c8403e2dc420b3
GIT binary patch
literal 339
zcmZ?wbhEHblwgoxSZcxm1k&M$tja!EmVE${#@TQ5vR}cumZcwbvL9HLf}~9I-<p@a
zH7j@uRB2ZH7DxhRL1fu`h<eM?cNQfel`!!S=EWc>u*iFh(swWhSOHKk2)zgDGAVj#
zSpsCdHwPK`-U4JeNTZ~*5<#T+Ptdt2HL)Z$MWH;iBtya7(>H)Y@h1x-7lS>64#;~T
zk20`DADCa@AtJ$gWXY%U5VPqQl!a!^@mhavsc5yR-`torm!+RooquX1JlCv#X0D;N
zp4p+7vDW+g?mTa=D{CmP&dzSEO=&4iZ*PsN=q>J!ZEK$15;8L=A%8}we}E%{H2|4w
Bj4}WK

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/commercial/telegram.gif b/smiley_pack/icons/commercial/telegram.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6ab4851ad4169b691ed355562ba2172e84516493
GIT binary patch
literal 627
zcmZ?wbhEHblwgoxIOf2>JnISbtf$PgpD@n`lFwLx<eVq0bDpxzdCD>O8P~jL-1D9Z
zEqpGr=(*UU=Tb|a%Po5$zwCw5@)yc0UZ}2kp|R?v)~c7r>t30ze`UVmmBZ%Oj$2;4
zZF>{F?_J#fcgY9eXB>W?b>u_YiH}X^K25y*Wy;krb8dW{d*kc8n_m~){JQ+kw{4HU
z?|l4Y*OMQ6p8PoQ?8ng;KaaimdHm(i6EA;WefRtN``=H${(1iG?~8AL-~IUe<@dku
zfByac`~UC1|Ns7jfTXn2kVcCC1f7dg6H8K46v{J8G8EiBeFGR2f3h%gF*q>jFaQB4
zq8QkBH#jskH#4&`w=uVL_b_$zPhe*0>7F>Pe@fHz*<C$z=1iTxVAi7fOO^^NYfM}|
zn_E`T*4|{zd~sDvdtF0&&5112c@zxn?JeZhjw()UpCF}Webi1}Q2VI8#C$Fto1>=E
ze8$(UIVUon?dO$K;u12wZf`X0#WW7H5B4h4CeP-xx3XJTy5R~}P^*lj#T^Z|MuiE!
x{5lFv9}cnYWn|#$w0dwLW<}5hjm9HWI8z#Yn)TdHbrel(Ok-6`<ziv51^^!u@Lm7_

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/commercial/threads.png b/smiley_pack/icons/commercial/threads.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fe41fe72fa754f0ea71b038e86d9113be370267
GIT binary patch
literal 1025
zcmV+c1pfPpP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ^g{cqIOVm$WWc^q9Ts93Pq?8YK2xEOfLO`CJjl7
zi=*ILaPVWX>fqw6tAnc`2!4P#J2)x2NQwVT3N2ziIPS;0dyl(!fKV?p&FYE)nr@q^
zL|n{dSH+%J1Q5ai`Y|js%b1g-Bsz|-d-(Wz7v))<&;2?2)SSftpGX{IhG`RT5YKGd
z2Iqa^Fe}O`@j3B?Nf#u3<htVV8|Q+{0?!Pa>C`-Nm{=^dvC_t@XllgM#1U1~DPPEV
zta9Gstd*;*c~AbrU`}6I<~q$$B(R7jND!f*iW17O5v5fp#X^eq;~o4Xu3sXTLaq`R
zITlcX2HEw4|H1EWt^CxamlTWx-7k*wF$VPP0*#vEd>=bb;{@<O16O*>U#SDLpQP7X
zTI2`_Z37qAElt@2E_Z;TCqp)6SMt*o@_FF>jJ_!g4Bi60YhG{7eVjf3Y3eF@0~{Oz
z;|0oI@9^$GdvE`qY4-O6Z8mbG3y)5n00006VoOIv02lyr0HVfz8O8tr010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru=m-xI5hy1flq>)M0scuuK~y-)t&}lqB2f^>=PKbi
z?gOMrlRi~o7sMi;KuEDjDtlYI1PftBQl?53@KW3@+~JZ!k-(OLEDPDnMjJ)8G00oV
z5_V&L*TlV(i)+F;@Zilb{N6C{KO-XYSwy~x2>*G0h{#vj5^Q;XeR{pTX}MfZYPFi|
z?d^$(NDu_#IF7X2ZOO7XU$bqSD2f1hd3oXa`5A!4V!{3WJ({MitMcEV>$=2oOt06Y
zR4S!$P19(#S}3JZN^y92xEXkHaRGp7nrnM?e0+>j3g7oP1A`#I^E^ZZUDt6OhcFCD
zl7zuvK)GB-L@-SgAobq_9vvO6RCj)UP8`Q{yIm~HA_xMe(`lOD?RKeDD(ivGW)ol~
zVcC4cFesHu05lqnEb07lEX!H}YMO@UdBkzd-`4N<(RKafK*w>2qKK=jD^5;MsMqVM
zbd*x$^Z9Jx+1c3&a6BI4x^C)Mt5pC_PfwZ8=Qxg&4P5qU`6<`e*XgI&wvAGX;c$qE
zaCdjdWHNc5Y;JFFQ~&1XhKGj-!Z5`5eF}vFB7*PxDLfN+d3m`}*yVDWBuTJs`(vYL
z+cw2wF^%u<@28_T8jUzOICvj$DcYx}CjcHFADPW&scc-=UAr7I*O#vAVi<<(?Cgk$
v$ZR%~PN%bReSP2Jg8eBX^5yli4cP8)Z#s&ArhdKc00000NkvXXu0mjfzromS

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/commercial/threema.png b/smiley_pack/icons/commercial/threema.png
new file mode 100644
index 0000000000000000000000000000000000000000..897230aa06fedcc0189c81925c89430f8ff703f9
GIT binary patch
literal 4777
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

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/commercial/tiktok.gif b/smiley_pack/icons/commercial/tiktok.gif
new file mode 100644
index 0000000000000000000000000000000000000000..dfd3b6f4b5613025ac6e6d41b9136bd064128df8
GIT binary patch
literal 257
zcmZ?wbhEHblwgo#Xpv#~&7k;)LFF%l>VF3L{|w6i8PxtUX#Zg_{>Py6kHO#{gUNpe
z!~YCM{}?>}Gx+^y@Mn1UnBn6yhL6t~K0Raj1SDTDe16676^Pz4e0#_6?LEWycaqXd
zaHRN8(77lzu_QG`p**uBL&4qCH-JI$CkrDNgFJ%{0}y~5!oZsOK)r9tjMS*Gb!%4i
zx@zw(_PxEi>-4X4`}V~LNKDDlnt1zoV0Vm1yMMnXSAhFuFHc3;*vM(3<;GPfG?pH0
yu%2q`&J%P#XL0{C=gH>(8SA8Kgq0bb1te;8%W7DdI+O}KxY;ThI5{j78LR<73t)o)

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/commercial/whatsapp.gif b/smiley_pack/icons/commercial/whatsapp.gif
new file mode 100644
index 0000000000000000000000000000000000000000..59898b09bffb5b83fd36b4a9bc1753bf93f725c8
GIT binary patch
literal 1353
zcmWlYX;70_6o%sxYY{C8E~vD!s2~OjvY3Pb+4qfXBqW4<9|>EkLxt*8>Qqt00*cnL
zP^PvPYpuYv2B%c{Q&C)o!P-t~OIt(;kU&CKl8}}3<IeqYmvi3pKIhJ*Giews5C@Bc
znP4z_Er((g10fyBCL&oyWSbb;VvRg#O|S?>9<{^^U>7)ri$y?ChngXk2CAUo#7SK4
zJPQozSWY=~m@tXMnYjlIB!*MQbjp$^@tAoI6a!7FO_F6~uw3#;Btmx-L${C`+f~9_
zQgW9RN9Ng(g3wczV`B2%r6qnXBulkR4jbuE7SSq%{1kaqd1fBXE`>Z~&e23(wJKPZ
zW+3KU_)t+rpkn`20mD(8F-tu(OTjE~IIa@OG9X<B4@?u1Ci5UyrNK%FXWyIrY!g%9
zE+s4$rO%L)-{1*WAq1N;Ramen5V%!kp=!vv+^>OJfu5s@y@1%OF7}n<EqrC561Tur
z1}bO{DaWM%!#avx0>MJ;sndi4ivTmvM$b|4W?t%aVd87t-ql(R)C^f2s)pFrp_<G&
zI>RB8`81dXcCLxF=QUR5D+j_grGZMiL&|i@u?yU?U{%6v9NQ)5tagT#ZDatU8me8I
zV`6calzg|c$WunPi4=Y<(JB&o%l1tb<e9lyMtZ(Qz;i3*e(ga6v2am9u}KaXh>~S6
zW0sOWLrIw`z*~7Kkg>@;xlbeTsDSY53!-PKfk@C3@d|yaJrmfK$cn;WQM?Q~R-ESW
z;#}A?8Jd0^croZ78V~*Vd+^V4|FMzaE7fw%SDri9+&7w+uH6pw=^Up{J6r1Qja`B6
z9&i7>;6RnX?!IsE&<q8;$Z7X?Uhuac^PM^{TX@>ve8P98&@PbrL6!YzxvdUw=aQU4
zsjX6O)@j_eIcBEVug*6K`6e*OLeDT!<eo~Dk;L~Y=<_8QE0bUrVP<(E7f3QndG@kw
z16ybXnHFX8OdiW#!thA*Oni>Dl;)CFES$((ppq>TyiL(&`y$OqXS%A;|4`%sO-Vp2
z3xEP2DDgH3eU*tT2=Z|)P_NY_oUE>|N}w~j0$8Gd{hBCP1crh^WA&rJHm<-TZ--7M
z!J|@9C*p~Ql-QU|eE&pIcI{LWayKs?*I5fZX-3#X*sLprvvG0MPNK7IT;DM=Kxt%r
z|10Bc(cT-w<GQ~tBJ`SvYilg<o%?elp@zD<Yc5?Iq>UOpFPkngM`|B-%`K+3<66)Y
zj_Iu(Y2Zg`an+jZO&wZ2_@Nf5f7z)Ypt(us$c(1OqrYHUb1d+f!PtM%SHA1nzFB?0
z-VcAj<>?M>a?8%`S<P3Y6uo1mLmp9Q3=#e=p#PZt`Fl?eBQv|2bbYT7&ui7Fi(t-=
zh*xfnIVpK~BN&Yy+oc~VIn%oH2q`nSaR)i+SpB@Dh|-xRdBj=ip1A2!8=Hg|qp_19
z2>~W+?lz>2c5S#WxNLWHf4b$WY~cKFD#UXbwe4hY{4FB9GrdlN%*WqsMd4(w;q?vi
zw?_E!pIxD+_ukW<+ZGe(?$~lzIer0M5!P(lHQv{~NlldLY47|ze0=i<b&hY=t^<5)
zqqnV_=#R?%<Te_<FZXftXbS$+vq!Roc>^osw03xCEAPCp6*VwQYQyN6)$OPr2Z;b1
zJeqJ8sSJD@mHtED@zz5>O(9#wLrTQcuGDbsTVFnK_j8ed$N$lVx<6)MBjU~vJ^LEI
zaqRg`<%TtMWEi+}?u-p^Y}n1)Tz?lC{{k_b8WT7&d?$9@<smV3EzpzJoBtrnvOZe8
IH3pXVKg-jSl>h($

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/commercial/windows.png b/smiley_pack/icons/commercial/windows.png
new file mode 100644
index 0000000000000000000000000000000000000000..33109cfa72a07cb5637e72dbe3e3b26ba976d7ed
GIT binary patch
literal 3584
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
Q24et2U5rlE1#H}Z08n7w`~Uy|

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/fediverse/diaspora.gif b/smiley_pack/icons/fediverse/diaspora.gif
index 82971986b249c8d18b8e81d4dfcccc3646a191f3..c8743f8f2f9dce1e7a51f01eb1dbed7cde9881ce 100644
GIT binary patch
literal 1147
zcmZ?wbhEHblwgoxc;3dKu4kZSV5DVetPMm)COSZ5Y^n=FX1XRoWUgmore|udZ)$F6
zW?^J*X=Gt#Y-w#`Wn*q*XY1%}=j>wd?CRj+=IG|`<mTb+AK(`h92gQB7#bEF77-jC
z5fTv@9u*xO7atR!5SN&gkerg3l9H5~mYR{721J=z>6uv>**V#{dAS9Jg(am$KvY^<
zT3%6JSyfqGQ&j^*wbiwCHFfo!UEN(hJw1K>lcr3WJZ0*%88c?io;_#oyv0kFE?K&C
z>9S?3R<B;Qdd<4^>o;uNxN+0wO`Cye%jPXxwr<<Db=&rB+jnf=v17;1oqP7~+q-w)
zk)uFx?C3ENIDY)Z@e?OboIH8zG#H!#fwSk%ojVT(7cN}91Ok_V;L4RNSFc{XcJ0QE
z8@E8<_O06xaOdvbd-v|$2Z9F=9zJ*o29F*+1A^xu@Z!abS3vOk^`}ptzI^%e4G6w}
z|M~OhuV24@{{ex&fB*jb_wWDz|B}*5qlj)Hp!iSFxhOTUBsE2$JhLQ2!QIn0fI;ym
z3nLf9e+C@}AOK|)29AFW|2btWF7Qs(2wb&C@x+FQ`_)WkbTTd^9AuX9mod6i)U@b$
zKW{+E#UK7BnI~vSyPUYO;pCBi!@N5UA16Ixn#R1}gQ3&Gf1y()N5h;4tq-`TaMm!1
za!oqsps6n|vS7xS^nfnbMNxt`4lfq8bo2PK#cRP4K`UpQe*!xgv**ljdG_Py&33+p
z^RwfsezdbOxC%Daamnde1h988U8<0DxOi;t?iP08RmRPa8g&wxDq;>Wan3za+_z#y
zrh~UMvqrazSkonjIrW+jrx-+j_H$3rWnuf-!PuW*n$2>1<A;eI2ebujtOWO{AK|cT
znqDzQA#DMFzvKo1sV&V({7x;)Tw*?Ov^<a$nq6zq$<^xaE1V)xb@9VQ$G`nD2P~dk
uGJJYm^jD^dn}EoV@Ph(ZC#nQUdOrE!$i&sK;IL4d#tK2{><9?~25SILmaK^Y

literal 79
zcmZ?wbhEHb6krfwXkcUj0!e8l#h)yUTnvm1Iv_qshJi_~hrjal#0!tQb5DI;5SaJu
eeyx&uUxa7tw3JPYR;TvtS<4Zgtr^O|U=0A+vKN~G

diff --git a/smiley_pack/icons/fediverse/diaspora.png b/smiley_pack/icons/fediverse/diaspora.png
new file mode 100644
index 0000000000000000000000000000000000000000..06c32f6bfa29412330007d7c1f429f18816cbe37
GIT binary patch
literal 4656
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
U{*8DK3n)7z3y+pogeGVI7lk^>ga7~l

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/fediverse/fediverse.gif b/smiley_pack/icons/fediverse/fediverse.gif
new file mode 100644
index 0000000000000000000000000000000000000000..498b57426b264f7d09e8e72465e00b2148ef9a3d
GIT binary patch
literal 444
zcmZ?wbhEHblwgoxSZc~JmEr#qwzvNo82&Rbc8UMGAkiOf_Hwzwj=kE;cj>R%YC3DX
z>9ljUQWwG{r$(Rt706Ind2@EfB!<QRSr-3~nY1rt+P*Jkj8_`P<kz14SkG#(qd06!
znde^r@ZDkId;G%>iaH*sel~~e#zNuh{UQ_himcx$ba0zc`w8LOn*{Ff<NLFNA^M}m
z-(yVwPci&C$C&(EJLNw^%WuXvk62$nW_|gDRZ?0BKT`ZB=v<VVSdyBeP@Y+mq2TW6
z8^ECWlZBCs!Ja{f0SG`IWnepUV19vzj#U4NX+kGuw5IzmdnIWbr6U=3T6Hzw`f2jb
zA1%+O`8572lr^fGfBt<>$ZF?z<uM-Sw^%hAm3YMMRh6BMP28E7Ih=WU8Yeeu8XC-S
zWwmE_%6C>#n>=Ht%j`K^^PP&EMD>@<a-QoVFDJTPLEFG>IS=<{Cs}z>Cn*os+4JXa
zmtG@v%>6|2T2YbJM|~MN1-BpBTy)-t;jzGxO$9O+JRUQ!u(7%D2?<H~zOjG*lTG-u
WP@MbUKYxuc<u5qc?AFA<U=0ABR;w5Q

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/fediverse/friendica.png b/smiley_pack/icons/fediverse/friendica.png
new file mode 100644
index 0000000000000000000000000000000000000000..7afd87da64438e5f55908671408a5fdc65b2ef50
GIT binary patch
literal 4719
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

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/fediverse/funkwhale.gif b/smiley_pack/icons/fediverse/funkwhale.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1604869f1dc290dba3e56428632d027bb38e3886
GIT binary patch
literal 471
zcmZ?wbhEHblwgoxSZc@s1pi3{t5&Vd&CRi~u?`6dnKy6lxpU`k-MZ!B;l6F#w#3AQ
zLx&DMfBw9+we|Do&l4w3tgNg!|MpkF-Zu{0Up1WnIREz7^$))loP5tP|MC6LfBLU}
z-v9iE!NwN~tDg%jefs|A--N^OB&C&zM~eRhor_WvOHxx5$}>wc6x=<10~i#4vM_Qn
z*fZ#Wya)0q1Ka%r^9w9^B>Imm`E(*jYw}r*Pd_I|F`s|@^igM(-ki*jD`xuGi9ddt
z{LbL`@t&Q!GyToZWfePboUK_=877u0ER-2k6(*jR7~an)EHS}dQISzmlTlk!UQ|<?
zQFHpVKrMAfbuC8a)r?xo>sPD_RMTZt)tRkfV4$&3N0m`mEl^WKQD5(nqL$WlRXu%0
zjahD8dl}U<wDjHdwe~aKyxw*EkhYG7&MTdTs#k-3ZXdd=rgn0N#?d4nZ4G6g2=BzC
o77IhC8A~|Y7bQB2UOVNOXmmDcpLvLe=NXPpuW2^^O$-dy0B3X5UH||9

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/fediverse/gnusocial.gif b/smiley_pack/icons/fediverse/gnusocial.gif
new file mode 100644
index 0000000000000000000000000000000000000000..69418a085e83586a34831135db2820713b73a3ce
GIT binary patch
literal 135
zcmV;20C@jLNk%w1VHf}y0Du7ilK>7G8zLe85kqoiVRU6=Aa`kWXdp*PO;7+K`2+z9
z0096j000007yuXm00K#jfvKD34516Lw!`Sso8Rmqm~u?O_;r)nNh_L?=+mmT42BVW
pjx25y(SSE0$n|pVR!fVsr+W&A(&_8!!D?q)?WLQvg2$@@06T;qHFf|1

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/fediverse/hubzilla.png b/smiley_pack/icons/fediverse/hubzilla.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5fc6278e937629bba214062056c09fe2a4c6d7c
GIT binary patch
literal 4563
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
Z!uCWTJW_(JFW`^JnxvG(<MHb@eh;F0j{*Py

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/fediverse/lemmy.gif b/smiley_pack/icons/fediverse/lemmy.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5e61105f6a5f9ed28606dbd19914515788a4bc39
GIT binary patch
literal 418
zcmV;T0bTw_Nk%w1VHf}y0Hr?w000010Rb#5EG;c9MMXtZQ&U%0S7&EuXlQ6_Yio3L
zbai!gfPjF9hlhxWh>3}biiwJfii(hske!{KpP!$gprE0lp`xLpqobpyrlzN-r>Ll?
zsi~=|s;aH6t*)-Fva+(ZwY9dkw!Xf;zrVl4#KgtL#m2_Q$;rvf%gfBn%+Aiv&(F`%
z(b3-C-r?cl=H}+-=jZ6?=<4d~>+9?6?CkCB?eFjJ@bK{W_xJkx`u+X={{H^|{{R2~
z{}~%1A^s6Va%Ew3Wn>_CX>@2HM@dak03rDV0SW*=04x9i000;O7ytkUs=%LcNGuwU
z$fR<~Y&xG%CBj5fFc+i}VhFhTzMOzzVoI4ki2#T9y#a)d@3%A3$?vGo{UHR{zAGkd
zcXur(Up8+-2Q)qsgM@btJ~LZH01z6HksJ{LNF1Al97+{FJt{JHH7sltN(DMF026l^
z05LfPN&y%?EsZrbJ~%Bt6`x3op*|oYAs{|G8$!uR0Sqq|Ul%S5icHB0Iywv0Q9l9$
M=<Mz8??*uZJH3>~O8@`>

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/fediverse/misskey.gif b/smiley_pack/icons/fediverse/misskey.gif
index 84982750c6ffcc159c88b23e461aee4596f8f555..a4d6bb340edc3d19574a397ed51940eeffb6824e 100644
GIT binary patch
delta 979
zcmXxiZA=?=90%~b_GquAv`BHQ(DATgDU3}9LlDSHXMi>_5tt@(0mIP55R+|jD1|c0
zRvua&T6*_C1_ig4r!K^8Y#<8Q_BuscdiOu-T-=N@GZSY_Os2*JLeg1Y_{%5Xd|!ND
z{wV&K$W*PbDtYa!0#P7Oy~sruYM4X}lW6M{^6@nC$u!a$%b6I|FoU%3L5(wrVK#<u
zoJBfjkv0#~?m>(mr0oXM9y7-`ekSOMxh3elozOX-V7eo0y_?;&AiumIzp^ATf01Hd
zmYJ6mJHO2DT+TOjugH2<q<t&mo>gh@s>HG?>|M#|`%2R1m07*G)hq7z;{85+z$dW!
z`GY>p>W{a0vj_bGv#-$XJ8q#9EWYd^8tbQ%Y&6#GFS64-dw@3_;0*+hTD~r|uk&r+
zD(yj@J%|mh9Ul(K93lDeM*K(!9b7*#Xj<2dY@j0>{Gnh4!JxLFmS8X<oH!gTBbd06
zFrQ!qSHmd5-~=PGg-#OT41(EDgtHu>3X&BQObQWJk!(C*UL@HBl9iIIjAUOR*(8#c
zlWg)R%X4hRmitCojAZwdtb$}yNH&#Z^2Q)WhD}-kl>i=~SQUV2fXxLk9l#6#GXXp_
z#>D}c1>nnoJ?7*v096E237{Il8~}4krV7A30FMB86u?5jY5*)I*=hhw04xQ2rJUkk
zp}1odS1=xlqqst6L^K`|P+Sqky-IP#6j!37xKfHMqqx}g1jT76u7cvU6sL23C#N|5
z#C^fYrvB3h!fOvi&hN9X{~&Tb6uTaYuRlt3{}?~{lVs}Wq^T|G^p@1&D0jGy{7>Lu
zQ%%p2JS28|zlGpY<he+xn|B4wxIDK$IPVU;Jy+9kQvH5#ID_91X!`ej-Q1~}Dt*Dj
zU;9GoMbS&OZ|Q5PH)eI#zZXTaz)K|`{WkH}Z5-sh*?)R6xt~<&h8VmfbE^5i;&7DO
zM6-mVh6QP5`#0)Z_aSwo<-ms~l%}P;wm<*)=L3gZdwF}iCNg<0UMj@#mhMo*U%!0L
znv;cZrj?zopU^pY7*8A*U5mWlCb<>9NpCNos<w?ER#jOpB)ac)nNHVvmeyAGISX30
z7T+OfLpDi5?r79A-Fp5E-5hFq(mUiVe0OOx-(@UzJmucgUyU|j)Tb0Q+*Rl^+&j%_
z#rK*X8!E4rt5ZWaYj!-1S9V2c^v<ZpPhQ&X##Gva&%C?anV6z6&5~>hDg`^j$C`A*
zFD~I3Ix|yQr&y$oGW?lcklJ!1psBqO=#k^v#)Eu*LsuY9`uXoq2J(H1M5OFLs?xj$

delta 331
zcmbQqIhDEI-P6s&GEss-f?=sP14G9uhRziXohuo-fM^v%*J`G&mCRi$7`j(7bgyFQ
zUd_<Gh6zaatYYt4!P32gp$Eub!`QQmv1bii_X;K;w-<=ku=cEB=v%|myNaQ2Eo<)@
z&Yo4g-7A^<R&)2P-~lR_xQ?%PHAnv{?!GnrynU+~Caq(bv|hM(h3w>wlM9*bC-X8(
z*V{AbFaQC_VGL|@56my{(2?ptv83o^j+7)9D_dqqSsN$o!{eQ9%x*2=3xB%q5jY+3
zQPJw!@^~|;oohr@A3oOmRk=s4tXxyEoU7JJ%c-fYtwTXv#J;CDyH+_)Wy;jJ+GK&*
zbK32bOBYRB61QwB>x!jQqLb|flIN|O!ldUUoommsb!EvE2DjosjkHz5aooIa%*pJN
a<0Oj$g*+m8MV$i${O&(^_~@Y{gEau$?t9<>

diff --git a/smiley_pack/icons/fediverse/peertube.gif b/smiley_pack/icons/fediverse/peertube.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0cfeee9c3e965236fad3af30caf570285a0f4de8
GIT binary patch
literal 137
zcmZ?wbhEHblwgoxSjfzvD6ddlT>LSES5jI@@t>e`QEFmIYKlU6W=V#EyQgmegW^vX
zMlJ?s1|0?<0BK@ia-Gw^^7PpUix>mUyxty)RPL)3w%|~T<XR>wx9U{bJMM1Hy;T)w
oSsXWY|EM#bm;AzbkI9LYbC-O&W|=W>%2G{YzqR&zGy{V*0P)i<(EtDd

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/fediverse/pixelfed.gif b/smiley_pack/icons/fediverse/pixelfed.gif
index da5c1e97bed58f41233e32428537f70cd9c1b665..b42d26b5ce5d3e5fcf32a8e476c6cc98cba7fd3b 100644
GIT binary patch
delta 1241
zcmV;~1Sb2a2<{1gM@dFFIbj$87y#$~07r04i+p|ZRx<s882)`4{d^k#g%<yS82@}3
z|9Tt$cpU$A9shn9|9=?&d>Q|N7XO45|AiF)h7<B`8MlEcYo|NudlwkdK@r+V|A`X+
zV-wMK9c8gL0QXt{TobU1Bp295|BDdgXB;)kLI&no64XY2|4<VM?OGAnLK4+L{EH5Y
zpeqaIQ4!Wb3F=o2<4^yP4h`W=|CtK#Q!3s|Dh}UE5!gcMGd<fEM9>&P%n3-+Bt6wT
zGfucU3g=W0-AVO{4&M?=?h#P$6i@IMP30$1?Fv%v4pH$NO!6U0@g7U_BuLaOIuO}K
z>;_cyC`S-~+eQ)BL-j31)-*Tk8(r-ZPxdoH?GI4@YYr39Jn<Y#64gNP6jbpuKo!kE
z_B=ll(mw4MPZZEQ{&WlIDK5z_Am?oa?tcOo%0KF1XYh!P@1~^m$(r@NdGVx8>>^&}
zb$k5u?f?J(_}s=A$vGI!H}!M~+$mkqCuY1RgsvxlnW8AFnj)v6CAE$amAP=em?*!V
zD7~2~!;&h>voX2CF{;Efvdb~7%P*wFEStS9q0BS0&@!*pFsrs4kI{Cy2;o%5HMz+&
zw!}8P3ENS@H@*kcP`^0Ar{}&1$V7JCo4Gm1yg9@?%XbXcM&$VL2);fG%TTsD$}7uc
zvpday!S3P%k@~Pa&>F;60F(Y7&L|JTd;*jGtv%BRy`lh;`2dvusy@~T$%Fuq{s6Al
zs6N>b#$W)e`~ax@SjgEo%*s5xU<9r+0ITf)kNu`U+XBJ80L#lB$;1Go{Q#x>0Mpd~
zyXFAd-Uskr7|<;Ntl|LP=K#(34%0&bp#1=U*7g9~^#GFo4b?XQo$!v+-vFJv0OIce
z;PU{|_W+&!)Ox}Lr_KPG{Q$`L0G0j#!}tKb`2e^20JHl5uKTV!#yEr00FnQ$Jjq&K
z&UaSCzdFLIL9qah|F=5Eusq1KJI#$sy%u)q0Eqtpkn`RyqyU8V0Cf7%GOp?>o6Rx}
zu^evVdQQaRES~iyl9LAmD1R6L7ytkW{s8|895}E60t5*ZEFj3Rp#%vLAUrULK!L@E
z4JQZ?AYuRn2nQG(RJa18z#>(MXeq)(K*R?j4;C1K@yL-ONRm8}!i2^{i6IlLXu{CQ
zO(IH`NU_po%7hFMfo^D$V&D-YLXa+bV#Ugr8#F?MfEwX}1*!wF5`W3LGtHd0Z`rsR
z`+!1|7Fh(|WGkgh965jk$C*231r)shgbYEN1W%$ofg{VAGseOQC@8XsS*!$4pFo86
zNEUpCLk-Me#H`H&S`s5fqXEb1@!~X!)JWb0+Egi0KG?BKQK}6kN@^vEPKmlSX;Gor
zpGL7@aoV`8C52j%;(s(r(sRJ2O1ELs1Ok!|>OYLT`bQ`hDc+I3=Q?(5RWlbST(F3d
zew9E&wJ3K<e4pg9j5XIRBa0_5oL55>tMnoeA-}XD3U`LgcMUYpVABmSvNQw6D!^pJ
z%0RWa$D1U|JOd3j%ya`zIO5zwj5FN8!cZ&%MuN^a9)2_9I6}7!lZ`j#U}Pb8fAk_F
zjpN{gBP{Hg^v`>hNRkdN;Sfp8k>*rs<v*JYxClJ)+?XRfVvae`BKI)TN;>6O84v(F
DFu+Gr

literal 1064
zcmZ?wbhEHb6krfwc)pflfkx9i(SVs+lirK^zZdiWAnvzHv+k{=&j(4r4^qAhb!UB)
z_Wda1^Ip#9BM`}Zzfy9)sha#r!TXbf&nHE%XR09&)T1tGXYSUU_gTgBv#RGC4cE_V
z9=G+a@95iXHr{YXckUNW_b*!RpS4|gnC;zTw&%3*#+wF9uNkhqY_#Tr@%jruH71+S
znruF4y6u4Zfn#Pn&zo#GX143F`QCk&hh<B8%EH%J<}ECXUirx`=!I{DddErDIhzHR
zx}Gi);+*@?Z_+H5r5}VhdN8c`{k}+!VbyPe%@GW1eloAS@vutla-H0>O7VvkE*~nS
zMYo4DZ1^Rz)AK{6G{eSU^QR~<Z2tABMvh_YPqv*`7<T;pQ73b?LzipUiJ$fI47+|Z
z?D_G(QI=ufkGFL_KUyXKH_I{~KJ~vv=6{PU!@(coCq4hSN;4n1%5eDm|8}YW?b4E`
z0{(YM{_l|b+bPL#^!xu#$^Tsv49CC!@0M^oWcR;U{9m8gzkX?kGv9=-xv`wT%y&JE
z`QmYgbKeASxC-8MRlnjcaL1G3@;CmwUIKSL1nzqB-}B<X=gn~SEB^x@@q6BU5B>Na
z`SU#r;CmdPa3^)urdWo%4;k)!;dvI!^E`y%-WQ%1p~BB%xn4zby@_IY`nl`qvCrE|
zCfr#4Xy5g_hpxWZfAjH?+gt7&J%07pzQ>R5etG)$*SCLv|NQ^^_y7O@lF~{e6Dj@^
zbS_FwEJ;mKD9<d(P;mG34Pa3G$->CR@Sj140SG`Dg@NM(!+%bZ6VH4ljpKLl#Qf0b
zo~TjyY>TGxGOok*(tIWj4;FIDT4bKmNHj5UU}O`q=y{=V?A&qHW;US+1;^$N8LJsD
z4koLgoa_9bO{HRjqRWiXH4#gHO*!ta?DSv2VnqT&!-^%Ip_wxuaRe%`39=+G2y$g#
z@|-3oDP-c<*eRm!Hq&+K%S(%0YIJG}7BaDFhAsDMoV4X-kcw-b-js%mO0AmyQ~rJV
za9C4V#U%RQ#2F8hSOtvc8hkZWV(FT!%^ZIqA<)@(scXZlIWL`_o^X(wQ}{t+i#wl$
gPEc3Ol!K4hCYi>qv5_n)OyH5Wu474*5MZzd0RKgqy#N3J

diff --git a/smiley_pack/icons/fediverse/pleroma.gif b/smiley_pack/icons/fediverse/pleroma.gif
index 7be5eca482992d966a37bd6cc8f7662fdcb48547..88b362395249c8b9aa41da0089e69a8ced223aeb 100644
GIT binary patch
literal 180
zcmZ?wbhEHblwgoxc+AbfAfPNHrLr>5enYY2;Rg3}?VgXP1U#7<@O44x&&6TCmxN17
zD<LDre}c|Msfi`2DGKG8B^e6tp1uJLia%Kxxfu8vbQpjDWH1AZ&xcme)q5Quo!$Na
zftt({7df{KjW<WOJ>c5k^=nu8oXg+l)NhJ<F!cpzJWKKmp_r&yeq16BtQzh1{8N^H
Y))ZKH=%kC3%lQ{uTqoDLFfdpH00mD&C;$Ke

literal 100
zcmZ?wbhEHb6krfwIK;;AdvV0CCE>q8DB}0h@IOn#C8d>sNbx5NBNqcZgAM}_fYdTD
zYgTCK+}4`+Ol`_E+uoP!CQWagsL^&ka+&z4#8~e2@BiG)TY679=hU8HCI)K&0KX<C

diff --git a/smiley_pack/icons/fediverse/plume.gif b/smiley_pack/icons/fediverse/plume.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7c8e4a7c822d7394f216643b146a48705c163854
GIT binary patch
literal 410
zcmZ?wbhEHblwgoxSZczM622@Ye0fUvic}zqSeY8JDm7wtTEv>Ph_z{vYttjwr$=r`
zkKC9ZxhW%Rb4JwG%&2Xd(c814cV<QJ%8uES9kVw(W?xS1ft=Wbxv__H<BsIU9nFn9
zmIp$|^Wshv#GffhI9r%-p)m1cQR3yI#4AOKSBsOb6(?OUPP$Q&e7iLHPHFPp(v*8;
zDfi1#9+ag#EK7Y@p8BXf^|7S15<#T+Ptdt2HL)Z$MWH;iBtya7(>H)Y@h1x-7lS>6
z4g(N?Jj%ef=)n8}4;?8+kHwQDI!ZirP86Nw*qL@iI3bFqB<042R%@56Ll3Vt{0Vm8
zGcYkb9JfJE=I0v`1^EzTW$hvjw&-96wJKvnc_#K0=_+kG4iQz(7#_na6{T?D7zUN@
zM2Qr^r4h>)sV>!Dn8LSIlRL*=vC2@kHit#ONNL-4d$B})1>Pf04C;n*LfNOCM2v(k
ZyRc}B-f)p!bJw0#y#3+RhxU#P)&Ml;m(&0N

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/fediverse/writefreely.gif b/smiley_pack/icons/fediverse/writefreely.gif
new file mode 100644
index 0000000000000000000000000000000000000000..baeb03b0ff7dc3b862c1d0492f49552a1ab2d3ba
GIT binary patch
literal 112
zcmZ?wbhEHblwgoxXkcWxcI}#^w36aKLFb~>#FEq$h4Rdj3<Y;j-v9>1pDc`A42%pq
z3_t)<&cI~U)4%fcTmHp!w%j`1U}yb>tzzND*2SMIPjJrDoV`<LPmR9G`iW~EFXNbU
PBV)#*j~zZvTnyF#+d3&5

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/noncommercial/bluesky.png b/smiley_pack/icons/noncommercial/bluesky.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7c789ab5b80b908c643c80d072eaafe7833621a
GIT binary patch
literal 4766
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

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/noncommercial/invidious.gif b/smiley_pack/icons/noncommercial/invidious.gif
new file mode 100644
index 0000000000000000000000000000000000000000..deb471fe9c741ce4e47fd93f20fa8aa4fb4dc9cb
GIT binary patch
literal 908
zcmdUu*-z2|9Ke5OhpUIuTIsZ<Wo<UA^;Y&!n=SRh)mACqf}-Gwh_~W>-?u2<2Y8DI
zc!45<qJS4(sE7w5itzQ(m&pE%KKuLypY7w|^zFk(v?*eWsOAt?S63Go7ZeKR>FJ3^
zqeDVMqNAgelaq6Eb4yE0Yierh>+74Fn_F61T3cHi8yjnDYbz@&i;9XeGcywt6NyA(
zKtO<xkB_^%J06cuNlB@zt79^mi;Ii9ySpbRC+FwqTCG;6(*eN6#f4g}J~}#DUtj0(
zcs)Hm#l^*betvFlZdfcfDJhA?Vy&&M9UmWSG#a^FE)WR1ySu%;y-P|;I2_Kw!NJ+t
znN%tzlgR`Ep`oFH&*yJ#ZH<hKWMpJ`d3j}JWp#FThKGlHcz8rbMYXrL&&<r=a5%A8
zJT^9#nwpxQpFcV}8X6ipFfb4q85tKBClm@hIy!uPeU(b(;NW0yZ*Nsq)!yFT+}vDD
zObiBt86O`%JUm=oUG3}ZD<~*fT3U*Th-hkR+TY(#PfuT7UY?qo+S%C&3JOX{NLX1}
zxzNF(1{4}lYhiYFmU|4SMX=_;Q#RNOpk)v8^71q~DBp(16M!(`HVZIfIMaemCObVn
zrODwI3k;YL78Z61V8?@(9Jp?mmX?;Co&8k+@3=sg0!{*5U0v&Hc*cf%qaZwiz`(%k
z#(X7w;lmvk7&74n2PiUVYir{vfw}`#G8jGp5{cB`->*`s{QdnWCnpsOMR0KN^z`)n
z{Jcmcij9rsa=9BD8xn~mK0cn!W|x<jGZ>8F;o*si2^x(?rBW*@DspmihK7bVH#fJp
zw+jmkDHKXsSs9&9UszbEuCCVW^=9VJ{}-+P7~2!EXcE@nG6qk=Svoj5|3Iv+ZW`Q0
z^oT8T&A(9)qhE-jk%i+x6F1%H;cL%%f?_KBfw^6V<0YDxXR3cAs(FtVe6}zqTHp!R
v!ZfSzCe~&q?ZTqBKQXpf#8=LgNB1{GHbj-6`pNIxN*e}!rPaak2J-1IzTnMy

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/noncommercial/vivaldi.png b/smiley_pack/icons/noncommercial/vivaldi.png
new file mode 100644
index 0000000000000000000000000000000000000000..17d09db33a04906c325e1c0c92390d3421698a81
GIT binary patch
literal 4945
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
I^svPL0RJgtWdHyG

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/opensource/archlinux.png b/smiley_pack/icons/opensource/archlinux.png
new file mode 100644
index 0000000000000000000000000000000000000000..1741ad3775108273ea7b46c047407f9724a64523
GIT binary patch
literal 4598
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
Js$$dT{t8o%qb&dc

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/opensource/debian.png b/smiley_pack/icons/opensource/debian.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9b8a16b300e65fea37a1e065c2a1f2278083a4d
GIT binary patch
literal 5357
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
LNkvXXu0mjfF33xJ

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/opensource/fdroid.png b/smiley_pack/icons/opensource/fdroid.png
new file mode 100644
index 0000000000000000000000000000000000000000..9aed008d93d75bc966ae75ba7a1ac9693ba07bf2
GIT binary patch
literal 7919
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
Ze*lIo8AuIA7{UMm002ovPDHLkV1gc6aM=I=

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/opensource/fedora.png b/smiley_pack/icons/opensource/fedora.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d4e6cecdbf110ca41c945c70fc51d06784ba832
GIT binary patch
literal 1408
zcmV-`1%LX9P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7vmK|6>zWT>4ih>D1lR-p(LLaorMgUO{ILX(Ch
z#l=x@EjakGSaoo5*44pP5ClI!9G#pLU8KbSC509-9vt`M-Mz=%J3y$HnPzp20-A1{
z>10C8=2pbeD?$*^hiSxQW*M`Rl!EX0x<`PocX6KOf9}uGqvkCJ1VrK)W|%hdI`QPD
zZE)Tvj<Axf5}y-~m~=tnN3JU#zi}?QEbz>TnMuzPM~KB@8!K(hN~T6UK^#>zo$`gO
z$13M7&RV(3n)l={4CnRbC9cyPLJ|vDgai=^s@OmoHsZAEq*zGPe!|B;==vpcDdgG!
zBgZ@{&>*{h@IUz7tyLHw^OC{|p!3CXK8AtNF3_ks&iAq7G){ovGjOH1{FOQ|^+|fI
zrA3c`-fiIGx}_<5z~v4w@MOrQ>`FnJLZJY>pV2qvfc{&cd)4c$xsTHaAVXcHZh(VB
zAXcR8HJ^8PwfFY#nPz`KqC9fCbNJtD00006VoOIv02u%q03uPKL-_yz010qNS#tmY
z4c7nw4c7reD4Tcy000McNliru<_7{2I{-KE-hu!C1AR$EK~zY`rIt->R8<tmfA`JD
zd$dJL8%8n?(uyUduM25SNU70Cv{I0jUkk-L*5GJx<HiMsjT_O}g(L(&;v{N9RAgZ{
z_z?rej})pz+i5W+l-7PsJ5X9?I^&y}_pXaKympw*Fyh(Vmvc}4|8xH5-gBRzgjF`|
zBkRrV0CoUPz=qt`G%yI9mXed{p|C85Ay#sF8oPudtXF_HfV(Me)4(C%s1XSpw<J*Y
z;6~sC(9D0cA>auk624HBK-GiWfF597F_f1(8VT;*&E|%BDpqO46G^`A`Grt-52WHr
zV5boYpD7^7W!?weSq%K${q2Ohp2XvE=lP?v3v7Dr8?1>4a$z<JwA`q~4WI;G1mv+&
z;Gtc59{A+c4AJN;mhkf9xhMz)C7@%bQx&A*$5lPpY(&CoH-Kl2>;zg%3Eb8BxC8#x
ziIeO-_~nw$zIqhjJvNE29&7AR9S8yM3y=N+3L*kDmLiz%KZ>S#8UK5l%^e2{_LYWh
z2(=2#4CZhzz?6_8peTs@Zv~#UB%0<0AQrp2a*&a<SC{98$1jC^OvzoMk|t#thtykP
zuV!|+_dx~N#Q!wmt3zm2b~4HN<y(zz;NE;OU5K^odAg;JeNQ!`sUBddgu1!_KY#i<
z00SdYUOjdZp{>r9YGK7jm!oZP1FDnB8Xt;(3%ERlp50DsOMOAMwKdh$)>H$~(%eM<
zNQUs>oDDuX1j*}p>MD8QfhMO(7e=p;$(kjliN>yTZgdVAk6~WwN6ydO9CBHxdhjQp
z&9&tLaNEULSI3dDG03I?*y^w3*Y6Gk@Z0Z$v_0QlZhPKx1BmMN4!E43LQaq5MV*~U
z+;0DWuqE<pOQIE)dAl}>aP=yMXRh#x*t6B|eE(yl%O!Z*82lKUAhjfcSbJAN<o>SR
z&iC+Nm&yU}%UJObooOoLSCHux!n+D_$2y+d^$`Bmi%2Qi`DiO`t@hiKSWI%{v(uFE
z!aZXRAIBj8kW<5mjrY;nRLkK59k`Tysj{ZYkq^FLXlAh#_$08$h=j+Sdz)iKCaz&!
zK97}2A#WN!bJrF))E(yFCud55_X69ENcenSOI1DC4t%@Z8En^ixXm806O%FC{OA-`
z@qsr0yi=*1{d{g9vhrVrss|qdUIP4OG%x{-0~dksvsE>Jn0@aR4gMEL{WirBuQU4q
O0000<MNUMnLSTXxd!$|f

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/opensource/firefox.png b/smiley_pack/icons/opensource/firefox.png
new file mode 100644
index 0000000000000000000000000000000000000000..9645fdea6e827e8b4bc790576cdec12a6c95ba04
GIT binary patch
literal 12229
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
T-eJuC00000NkvXXu0mjfCB#=2

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/opensource/firefoxnightly.png b/smiley_pack/icons/opensource/firefoxnightly.png
new file mode 100644
index 0000000000000000000000000000000000000000..33c3dcc03953193757eaea960c007c3239a8b469
GIT binary patch
literal 4987
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

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/opensource/foss.png b/smiley_pack/icons/opensource/foss.png
new file mode 100644
index 0000000000000000000000000000000000000000..e59bf3e7962e150570d627ed358a1f8738b55916
GIT binary patch
literal 4981
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

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/opensource/jabber.png b/smiley_pack/icons/opensource/jabber.png
new file mode 100644
index 0000000000000000000000000000000000000000..83e3c6c532e34fa3f458ebcfc582da8f49f64e3b
GIT binary patch
literal 4301
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
MXRc$<;-ZKC1S>)FzW@LL

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/opensource/kde.png b/smiley_pack/icons/opensource/kde.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a6ff9ac7a5460d0ca7a7a791cc556e7ded3f434
GIT binary patch
literal 4678
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

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/opensource/linux.png b/smiley_pack/icons/opensource/linux.png
new file mode 100644
index 0000000000000000000000000000000000000000..0340301df931cfba0f78c5c8119d0dfe051a7e79
GIT binary patch
literal 5149
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
HN2L8166LpE

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/opensource/matrix.png b/smiley_pack/icons/opensource/matrix.png
new file mode 100644
index 0000000000000000000000000000000000000000..500d0dcff153de275f0d36c4f27a5bf22d7ee5a4
GIT binary patch
literal 4347
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
Ia@IHe2RrI31ONa4

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/opensource/mint.png b/smiley_pack/icons/opensource/mint.png
new file mode 100644
index 0000000000000000000000000000000000000000..83617fcd313b54a3ec540664f04895ea11de933b
GIT binary patch
literal 8663
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

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/opensource/opensuse.png b/smiley_pack/icons/opensource/opensuse.png
new file mode 100644
index 0000000000000000000000000000000000000000..0be8f1bdb9160105fc71eb47dd09c21ee9308251
GIT binary patch
literal 12271
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
JPDHLkV1hSIF`57X

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/opensource/raspi.png b/smiley_pack/icons/opensource/raspi.png
new file mode 100644
index 0000000000000000000000000000000000000000..c07eff2e7caed932cf7c078e395f8a204d07ef08
GIT binary patch
literal 4534
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
BizNU6

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/opensource/thunderbird.png b/smiley_pack/icons/opensource/thunderbird.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d849e5d30e1f1440869d78dfdbb18a521059ce1
GIT binary patch
literal 4661
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
RR|U$?iHVF;ADpAl`7c%W%y|F+

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/opensource/tutanota.png b/smiley_pack/icons/opensource/tutanota.png
new file mode 100644
index 0000000000000000000000000000000000000000..9008c6845c386fdb021f665f7a73cdd1bb24964e
GIT binary patch
literal 5011
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

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/opensource/ubuntu.png b/smiley_pack/icons/opensource/ubuntu.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e68494c797857105972c72386c36f02d60b5d8a
GIT binary patch
literal 5067
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
G@c#h9)s4vj

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/opensource/xmpp.png b/smiley_pack/icons/opensource/xmpp.png
new file mode 100644
index 0000000000000000000000000000000000000000..af301ff7a4e665cbbf28b93ca8d5a06200634963
GIT binary patch
literal 4985
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

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/respect/cc.png b/smiley_pack/icons/respect/cc.png
new file mode 100644
index 0000000000000000000000000000000000000000..b28ef687f359018c136149b631ae3f0bfb38bbc4
GIT binary patch
literal 4461
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
Yzjdr?x2;a80o8%jsx)QehTM|>0f6af00000

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/respect/cc0.png b/smiley_pack/icons/respect/cc0.png
new file mode 100644
index 0000000000000000000000000000000000000000..51ebdf1fc1be3a5bb42c11051c89467254762aeb
GIT binary patch
literal 4669
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

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/respect/ccby.png b/smiley_pack/icons/respect/ccby.png
new file mode 100644
index 0000000000000000000000000000000000000000..69d237d25027f8c992fc2a30025b1358667814c5
GIT binary patch
literal 4407
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
XR?=~2+tKNeXMrvyQ@cOut+oFJxo=6;

literal 0
HcmV?d00001

diff --git a/smiley_pack/icons/respect/ccsa.png b/smiley_pack/icons/respect/ccsa.png
new file mode 100644
index 0000000000000000000000000000000000000000..227c701ac0cc9e44e2e77d1e2cf5d5de188e57d2
GIT binary patch
literal 4848
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
G^M3&g)*ssd

literal 0
HcmV?d00001

diff --git a/smiley_pack/smiley_pack.php b/smiley_pack/smiley_pack.php
index 4361b2f5..343ea262 100644
--- a/smiley_pack/smiley_pack.php
+++ b/smiley_pack/smiley_pack.php
@@ -2,30 +2,28 @@
 /*
  * Name: Smiley Pack
  * Description: Pack of smileys that make master too AOLish.
- * Version: 1.05
+ * Version: 1.06
  * Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template)
  * Author: Matthias Ebers <https://loma.ml/profile/one>
  * All smileys from sites offering them as Public Domain
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
-function smiley_pack_install() {
+function smiley_pack_install()
+{
 	Hook::register('smilie', 'addon/smiley_pack/smiley_pack.php', 'smiley_pack_smilies');
 }
 
 function smiley_pack_smilies(array &$b)
 {
-#Smileys are split into various directories by the intended range of emotions.  This is in case we get too big and need to modularise things.  We can then cut and paste the right lines, move the right directory, and just change the name of the addon to happy_smilies or whatever.
+	#Smileys are split into various directories by the intended range of emotions.  This is in case we get too big and need to modularise things.  We can then cut and paste the right lines, move the right directory, and just change the name of the addon to happy_smilies or whatever.
 
-#Be careful with invocation strings.  If you have a smiley called foo, and another called foobar, typing :foobar will call foo.  Avoid this with clever naming, using ~ instead of : 
-#when all else fails.
+	#Be careful with invocation strings.  If you have a smiley called foo, and another called foobar, typing :foobar will call foo.  Avoid this with clever naming, using ~ instead of :
+	#when all else fails.
 
-
-
-#Animal smileys.
+	#Animal smileys.
 
 	$b['texts'][] = ':bunnyflowers:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':bunnyflowers:' . '" />';
@@ -50,7 +48,7 @@ function smiley_pack_smilies(array &$b)
 
 	$b['texts'][] = ':cow:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':cow:' . '" />';
-    
+
 	$b['texts'][] = ':crab:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':crab:' . '" />';
 
@@ -71,7 +69,7 @@ function smiley_pack_smilies(array &$b)
 
 	$b['texts'][] = ':horse:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':horse:' . '" />';
-  
+
 	$b['texts'][] = ':parrot:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':parrot:' . '" />';
 
@@ -99,16 +97,13 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':pig:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':pig:' . '" />';
 
-
-
-#Baby Smileys
+	#Baby Smileys
 
 	$b['texts'][] = ':baby:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':baby:' . '" />';
 
 	$b['texts'][] = ':babycot:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':babycot:' . '" />';
-	
 
 	$b['texts'][] = ':pregnant:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':pregnant:' . '" />';
@@ -116,11 +111,10 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':stork:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':stork:' . '" />';
 
-
-#Confused Smileys	
+	#Confused Smileys
 	$b['texts'][] = ':confused:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confused:' . '" />';
-    
+
 	$b['texts'][] = ':shrug:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':shrug:' . '" />';
 
@@ -130,13 +124,12 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':dazed:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':dazed:' . '" />';
 
-
-#Cool Smileys
+	#Cool Smileys
 
 	$b['texts'][] = ':affro:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':affro:' . '" />';
 
-#Devil/Angel Smileys
+	#Devil/Angel Smileys
 
 	$b['texts'][] = ':angel:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':angel:' . '" />';
@@ -152,20 +145,20 @@ function smiley_pack_smilies(array &$b)
 
 	$b['texts'][] = ':devillish:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':devillish:' . '" />';
-	
+
 	$b['texts'][] = ':daseesaw:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':daseesaw:' . '" />';
 
 	$b['texts'][] = ':turnevil:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':turnevil:' . '" />';
-	
+
 	$b['texts'][] = ':saint:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':saint:' . '" />';
 
 	$b['texts'][] = ':graveside:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':graveside:' . '" />';
 
-#Unpleasent smileys.
+	#Unpleasent smileys.
 
 	$b['texts'][] = ':toilet:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':toilet:' . '" />';
@@ -176,7 +169,7 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':fartblush:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':fartblush:' . '" />';
 
-#Drinks
+	#Drinks
 
 	$b['texts'][] = ':tea:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':tea:' . '" />';
@@ -184,7 +177,7 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':drool:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':drool:' . '" />';
 
-#Sad smileys
+	#Sad smileys
 
 	$b['texts'][] = ':crying:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':crying:' . '" />';
@@ -195,12 +188,12 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':sigh:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sad/sigh.gif' . '" alt="' . ':sigh:' . '" />';
 
-#Smoking - only one smiley in here, maybe it needs moving elsewhere?
+	#Smoking - only one smiley in here, maybe it needs moving elsewhere?
 
 	$b['texts'][] = ':smoking:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':smoking:' . '" />';
 
-#Sport smileys
+	#Sport smileys
 
 	$b['texts'][] = ':basketball:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':basketball:' . '" />';
@@ -231,11 +224,11 @@ function smiley_pack_smilies(array &$b)
 
 	$b['texts'][] = ':snooker:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':snooker:' . '" />';
-  
+
 	$b['texts'][] = ':horseriding:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':horseriding:' . '" />';
 
-#Love smileys
+	#Love smileys
 
 	$b['texts'][] = ':iloveyou:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':iloveyou:' . '" />';
@@ -255,7 +248,7 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':loveheart:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':loveheart:' . '" />';
 
-#Tired/Sleep smileys
+	#Tired/Sleep smileys
 
 	$b['texts'][] = ':countsheep';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':countsheep:' . '" />';
@@ -269,7 +262,7 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':yawn:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/tired/yawn.gif' . '" alt="' . ':yawn:' . '" />';
 
-#Fight/Flame/Violent smileys
+	#Fight/Flame/Violent smileys
 
 	$b['texts'][] = ':2guns:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':2guns:' . '" />';
@@ -313,7 +306,7 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':acid:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':acid:' . '" />';
 
-#Fantasy smileys - monsters and dragons fantasy.  The other type of fantasy belongs in adult smileys
+	#Fantasy smileys - monsters and dragons fantasy.  The other type of fantasy belongs in adult smileys
 
 	$b['texts'][] = ':alienmonster:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':alienmonster:' . '" />';
@@ -336,7 +329,7 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':mummy:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':mummy:' . '" />';
 
-#Food smileys
+	#Food smileys
 
 	$b['texts'][] = ':apple:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':apple:' . '" />';
@@ -368,7 +361,7 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':birthdaycake:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/birthdaycake.gif' . '" alt="' . ':birthdaycake:' . '" />';
 
-#Happy smileys
+	#Happy smileys
 
 	$b['texts'][] = ':cloud9:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/happy/cloud9.gif' . '" alt="' . ':cloud9:' . '" />';
@@ -376,7 +369,7 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':tearsofjoy:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . '" alt="' . ':tearsofjoy:' . '" />';
 
-#Repsect smileys
+	#Repsect smileys
 
 	$b['texts'][] = ':bow:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':bow:' . '" />';
@@ -390,7 +383,19 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':number1:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':number1:' . '" />';
 
-#Laugh smileys
+	$b['texts'][] = ':cc_cc:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/respect/cc.png' . '" alt="' . ':cc_cc:' . '" />';
+
+	$b['texts'][] = ':cc_by:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/respect/ccby.png' . '" alt="' . ':cc_by:' . '" />';
+
+	$b['texts'][] = ':cc_sa:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/respect/ccsa.png' . '" alt="' . ':cc_sa:' . '" />';
+
+	$b['texts'][] = ':cc_0:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/respect/cc0.png' . '" alt="' . ':cc_0:' . '" />';
+
+	#Laugh smileys
 
 	$b['texts'][] = ':hahaha:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/laugh/hahaha.gif' . '" alt="' . ':hahaha:' . '" />';
@@ -401,24 +406,23 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':rofl:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/laugh/rofl.gif' . '" alt="' . ':rofl:' . '" />';
 
-#Music smileys
+	#Music smileys
 
 	$b['texts'][] = ':drums:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':drums:' . '" />';
 
-
 	$b['texts'][] = ':guitar:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitar:' . '" />';
 
 	$b['texts'][] = ':trumpet:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trumpet:' . '" />';
 
-#Smileys that used to be in core
+	#Smileys that used to be in core
 
 	$b['texts'][] = ':headbang:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':headbang:' . '" />';
 
-		$b['texts'][] = ':beard:';
+	$b['texts'][] = ':beard:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':beard:' . '" />';
 
 	$b['texts'][] = ':whitebeard:';
@@ -436,7 +440,7 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':headdesk:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':headdesk:' . '" />';
 
-#These two are still in core, so oldcore isn't strictly right, but we don't want too many directories
+	#These two are still in core, so oldcore isn't strictly right, but we don't want too many directories
 
 	$b['texts'][] = ':-d';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/laughing.gif' . '" alt="' . ':-d' . '" />';
@@ -444,8 +448,8 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':-o';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/surprised.gif' . '" alt="' . ':-o' . '" />';
 
-# Regex killers - stick these at the bottom so they appear at the end of the English and 
-# at the start of $OtherLanguage.
+	# Regex killers - stick these at the bottom so they appear at the end of the English and
+	# at the start of $OtherLanguage.
 
 	$b['texts'][] = ':cool:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/cool/cool.gif' . '" alt="' . ':cool:' . '" />';
@@ -455,7 +459,7 @@ function smiley_pack_smilies(array &$b)
 
 	$b['texts'][] = ':golf:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/golf.gif' . '" alt="' . ':golf:' . '" />';
-	
+
 	$b['texts'][] = ':football:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/football.gif' . '" alt="' . ':football:' . '" />';
 
@@ -480,63 +484,167 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':gangs:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/gangs.gif' . '" alt="' . ':gangs:' . '" />';
 
-
 	$b['texts'][] = ':dj:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/dj.gif' . '" alt="' . ':dj:' . '" />';
 
-
 	$b['texts'][] = ':elvis:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/elvis.gif' . '" alt="' . ':elivs:' . '" />';
 
 	$b['texts'][] = ':violin:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violin:' . '" />';
 
-# New Gif Emoji (@one@loma.ml)
-# Fediverse
+	# New Gif Emoji (@one@loma.ml)
+	# Fediverse
 
 	$b['texts'][] = ':friendica:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/friendica.gif' . '" alt="' . ':friendica:' . '" />';
-	
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/friendica.png' . '" alt="' . ':friendica:' . '" />';
+
+	$b['texts'][] = ':fediverse:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/fediverse.gif' . '" alt="' . ':fediverse:' . '" />';
+
 	$b['texts'][] = ':mastodon:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/mastodon.gif' . '" alt="' . ':mastodon:' . '" />';
-	
+
 	$b['texts'][] = ':pleroma:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/pleroma.gif' . '" alt="' . ':pleroma:' . '" />';
-	
+
 	$b['texts'][] = ':misskey:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/misskey.gif' . '" alt="' . ':misskey:' . '" />';
-	
+
 	$b['texts'][] = ':diaspora:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/diaspora.gif' . '" alt="' . ':diaspora:' . '" />';
-	
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/diaspora.png' . '" alt="' . ':diaspora:' . '" />';
+
 	$b['texts'][] = ':hubzilla:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/hubzilla.gif' . '" alt="' . ':hubzilla:' . '" />';
-	
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/hubzilla.png' . '" alt="' . ':hubzilla:' . '" />';
+
 	$b['texts'][] = ':pixelfed:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/pixelfed.gif' . '" alt="' . ':pixelfeed:' . '" />';
-	
+
 	$b['texts'][] = ':nextcloud:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/nextcloud.gif' . '" alt="' . ':nextcloud:' . '" />';
-	
+
 	$b['texts'][] = ':activitypub:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/ap.gif' . '" alt="' . ':activitypub:' . '" />';
-	
-# ccc
+
+	# ccc
 
 	$b['texts'][] = ':ccc event:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/ccc/ccc.gif' . '" alt="' . ':ccc event:' . '" />';
-	
-# Commercial
+
+	# Commercial
 
 	$b['texts'][] = ':youtube:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/youtube.gif' . '" alt="' . ':youtube:' . '" />';
-	
+
 	$b['texts'][] = ':spotify:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/spotify.gif' . '" alt="' . ':spotify:' . '" />';
-		
+
 	$b['texts'][] = ':twitter:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/twitter.gif' . '" alt="' . ':twitter:' . '" />';
-			
+
 	$b['texts'][] = ':twitch:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/twitch.gif' . '" alt="' . ':twitch:' . '" />';
+
+	$b['texts'][] = ':facebook:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/facebook.gif' . '" alt="' . ':facebook:' . '" />';
+
+	$b['texts'][] = ':threads:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/threads.png' . '" alt="' . ':threads:' . '" />';
+
+	$b['texts'][] = ':google:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/google.gif' . '" alt="' . ':google:' . '" />';
+
+	$b['texts'][] = ':signal:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/signal.gif' . '" alt="' . ':signal:' . '" />';
+
+	$b['texts'][] = ':tiktok:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/tiktok.gif' . '" alt="' . ':tiktok:' . '" />';
+
+	$b['texts'][] = ':whatsapp:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/whatsapp.gif' . '" alt="' . ':whatsapp:' . '" />';
+
+	$b['texts'][] = ':instagram:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/instagram.gif' . '" alt="' . ':instagram:' . '" />';
+
+	$b['texts'][] = ':telegram:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/telegram.gif' . '" alt="' . ':telegram:' . '" />';
+
+	$b['texts'][] = ':windows:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/windows.png' . '" alt="' . ':windows:' . '" />';
+
+	$b['texts'][] = ':github:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/github.png' . '" alt="' . ':github:' . '" />';
+
+	$b['texts'][] = ':threema:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/threema.png' . '" alt="' . ':threema:' . '" />';
+
+	# nonCommercial
+
+	$b['texts'][] = ':invidious:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/noncommercial/invidious.gif' . '" alt="' . ':invidious:' . '" />';
+
+	$b['texts'][] = ':bluesky:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/noncommercial/bluesky.png' . '" alt="' . ':bluesky:' . '" />';
+
+	$b['texts'][] = ':vivaldi:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/noncommercial/vivaldi.png' . '" alt="' . ':vivaldi:' . '" />';
+
+	# opensource
+
+	$b['texts'][] = ':firefox:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/firefox.png' . '" alt="' . ':firefox:' . '" />';
+
+	$b['texts'][] = ':linuxopensuse:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/opensuse.png' . '" alt="' . ':linuxopensuse:' . '" />';
+
+	$b['texts'][] = ':linuxdebian:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/debian.png' . '" alt="' . ':linuxdebian:' . '" />';
+
+	$b['texts'][] = ':linuxfedora:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/fedora.png' . '" alt="' . ':linuxfedora:' . '" />';
+
+	$b['texts'][] = ':linuxubuntu:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/ubuntu.png' . '" alt="' . ':linuxubuntu:' . '" />';
+
+	$b['texts'][] = ':linuxmint:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/mint.png' . '" alt="' . ':linuxmint:' . '" />';
+
+	$b['texts'][] = ':fdroid:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/fdroid.png' . '" alt="' . ':fdroid:' . '" />';
+
+	$b['texts'][] = ':tutanota:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/tutanota.png' . '" alt="' . ':tutanota:' . '" />';
+
+	$b['texts'][] = ':raspi:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/raspi.png' . '" alt="' . ':raspi:' . '" />';
+
+	$b['texts'][] = ':linux:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/linux.png' . '" alt="' . ':linux:' . '" />';
+
+	$b['texts'][] = ':kde:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/kde.png' . '" alt="' . ':kde:' . '" />';
+
+	$b['texts'][] = ':firefoxnightly:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/firefoxnightly.png' . '" alt="' . ':firefoxnightly:' . '" />';
+
+	$b['texts'][] = ':archlinux:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/archlinux.png' . '" alt="' . ':archlinux:' . '" />';
+
+	$b['texts'][] = ':thunderbird:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/thunderbird.png' . '" alt="' . ':thunderbird:' . '" />';
+
+	$b['texts'][] = ':vivaldi:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/vivaldi.png' . '" alt="' . ':vivaldi:' . '" />';
+
+	$b['texts'][] = ':jabber:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/jabber.png' . '" alt="' . ':jabber:' . '" />';
+
+	$b['texts'][] = ':matrix:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/matrix.png' . '" alt="' . ':matrix:' . '" />';
+
+	$b['texts'][] = ':xmpp:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/xmpp.png' . '" alt="' . ':xmpp:' . '" />';
+
+	$b['texts'][] = ':foss:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/foss.png' . '" alt="' . ':foss:' . '" />';
 }

From 6f3ba10466a78d174d17594b8e2f0fe3a1ceb967 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 14 Sep 2024 14:40:48 +0000
Subject: [PATCH 115/294] Bluesky: Preparation for video posts

---
 bluesky/bluesky.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 181e8d2d..f4e2f456 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1410,6 +1410,19 @@ function bluesky_add_media(stdClass $embed, array $item, int $fetch_uid, int $le
 			}
 			break;
 
+		case 'app.bsky.embed.video#view':
+			$media = [
+				'uri-id'      => $item['uri-id'],
+				'type'        => Post\Media::HLS,
+				'url'         => $embed->playlist,
+				'preview'     => $embed->thumbnail,
+				'description' => $embed->alt ?? '',
+				'height'      => $embed->aspectRatio->height,
+				'width'       => $embed->aspectRatio->width,
+			];
+			Post\Media::insert($media);
+			break;
+	
 		case 'app.bsky.embed.external#view':
 			$media = [
 				'uri-id' => $item['uri-id'],

From f8f63532f4297db73f6cfc578ef4a5e8959db61c Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 29 Sep 2024 18:19:38 +0000
Subject: [PATCH 116/294] Bluesky: New option to complete threads

---
 bluesky/bluesky.php                      | 203 ++++++++++++++++-------
 bluesky/bluesky_feed.php                 |   8 +-
 bluesky/bluesky_notifications.php        |   8 +-
 bluesky/bluesky_timeline.php             |   8 +-
 bluesky/lang/C/messages.po               | 168 +++++++++----------
 bluesky/templates/connector_settings.tpl |   1 +
 6 files changed, 235 insertions(+), 161 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index f4e2f456..73b19612 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Name: Bluesky Connector
- * Description: Post to Bluesky
+ * Description: Post to Bluesky, import timelines and feeds
  * Version: 1.1
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  *
@@ -10,6 +10,8 @@
  * - Outgoing mentions
  *
  * At some point in time:
+ * - post videos
+ * - direct messages
  * - Sending Quote shares https://atproto.com/lexicons/app-bsky-embed#appbskyembedrecord and https://atproto.com/lexicons/app-bsky-embed#appbskyembedrecordwithmedia
  *
  * Possibly not possible:
@@ -151,7 +153,7 @@ function bluesky_probe_detect(array &$hookData)
 	}
 
 	$data = bluesky_xrpc_get($pconfig['uid'], 'app.bsky.actor.getProfile', ['actor' => $did]);
-	if (empty($data)) {
+	if (empty($data) || empty($data->did)) {
 		return;
 	}
 
@@ -346,15 +348,16 @@ function bluesky_settings(array &$data)
 		return;
 	}
 
-	$enabled       = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post') ?? false;
-	$def_enabled   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default') ?? false;
-	$pds           = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'pds');
-	$handle        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'handle');
-	$did           = bluesky_get_user_did(DI::userSession()->getLocalUserId());
-	$token         = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'access_token');
-	$import        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'import') ?? false;
-	$import_feeds  = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'import_feeds') ?? false;
-	$custom_handle = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'friendica_handle') ?? false;
+	$enabled          = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post') ?? false;
+	$def_enabled      = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default') ?? false;
+	$pds              = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'pds');
+	$handle           = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'handle');
+	$did              = bluesky_get_user_did(DI::userSession()->getLocalUserId());
+	$token            = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'access_token');
+	$import           = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'import') ?? false;
+	$import_feeds     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'import_feeds') ?? false;
+	$complete_threads = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'complete_threads') ?? false;
+	$custom_handle    = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'friendica_handle') ?? false;
 
 	if (DI::config()->get('bluesky', 'friendica_handles')) {
 		$self = User::getById(DI::userSession()->getLocalUserId(), ['nickname']);
@@ -369,16 +372,17 @@ function bluesky_settings(array &$data)
 
 	$t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/bluesky/');
 	$html = Renderer::replaceMacros($t, [
-		'$enable'       => ['bluesky', DI::l10n()->t('Enable Bluesky Post Addon'), $enabled],
-		'$bydefault'    => ['bluesky_bydefault', DI::l10n()->t('Post to Bluesky by default'), $def_enabled],
-		'$import'       => ['bluesky_import', DI::l10n()->t('Import the remote timeline'), $import],
-		'$import_feeds' => ['bluesky_import_feeds', DI::l10n()->t('Import the pinned feeds'), $import_feeds, DI::l10n()->t('When activated, Posts will be imported from all the feeds that you pinned in Bluesky.')],
-		'$custom_handle' => $friendica_handle,
-		'$pds'          => ['bluesky_pds', DI::l10n()->t('Personal Data Server'), $pds, DI::l10n()->t('The personal data server (PDS) is the system that hosts your profile.'), '', 'readonly'],
-		'$handle'       => ['bluesky_handle', DI::l10n()->t('Bluesky handle'), $handle, '', '', $custom_handle ? 'readonly' : ''],
-		'$did'          => ['bluesky_did', DI::l10n()->t('Bluesky DID'), $did, DI::l10n()->t('This is the unique identifier. It will be fetched automatically, when the handle is entered.'), '', 'readonly'],
-		'$password'     => ['bluesky_password', DI::l10n()->t('Bluesky app password'), '', DI::l10n()->t("Please don't add your real password here, but instead create a specific app password in the Bluesky settings.")],
-		'$status'       => bluesky_get_status($handle, $did, $pds, $token),
+		'$enable'           => ['bluesky', DI::l10n()->t('Enable Bluesky Post Addon'), $enabled],
+		'$bydefault'        => ['bluesky_bydefault', DI::l10n()->t('Post to Bluesky by default'), $def_enabled],
+		'$import'           => ['bluesky_import', DI::l10n()->t('Import the remote timeline'), $import],
+		'$import_feeds'     => ['bluesky_import_feeds', DI::l10n()->t('Import the pinned feeds'), $import_feeds, DI::l10n()->t('When activated, Posts will be imported from all the feeds that you pinned in Bluesky.')],
+		'$complete_threads' => ['bluesky_complete_threads', DI::l10n()->t('Complete the threads'), $complete_threads, DI::l10n()->t('When activated, the system fetches additional replies for the posts in the timeline. This leads to more complete threads.')],
+		'$custom_handle'    => $friendica_handle,
+		'$pds'              => ['bluesky_pds', DI::l10n()->t('Personal Data Server'), $pds, DI::l10n()->t('The personal data server (PDS) is the system that hosts your profile.'), '', 'readonly'],
+		'$handle'           => ['bluesky_handle', DI::l10n()->t('Bluesky handle'), $handle, '', '', $custom_handle ? 'readonly' : ''],
+		'$did'              => ['bluesky_did', DI::l10n()->t('Bluesky DID'), $did, DI::l10n()->t('This is the unique identifier. It will be fetched automatically, when the handle is entered.'), '', 'readonly'],
+		'$password'         => ['bluesky_password', DI::l10n()->t('Bluesky app password'), '', DI::l10n()->t("Please don't add your real password here, but instead create a specific app password in the Bluesky settings.")],
+		'$status'           => bluesky_get_status($handle, $did, $pds, $token),
 	]);
 
 	$data = [
@@ -446,6 +450,7 @@ function bluesky_settings_post(array &$b)
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'handle',           $handle);
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'import',           intval($_POST['bluesky_import']));
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'import_feeds',     intval($_POST['bluesky_import_feeds']));
+	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'complete_threads', intval($_POST['bluesky_complete_threads']));
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'friendica_handle', intval($_POST['bluesky_friendica_handle'] ?? false));
 
 	if (!empty($handle)) {
@@ -534,15 +539,15 @@ function bluesky_cron()
 		Logger::debug('Refresh the token', ['uid' => $pconfig['uid']]);
 		bluesky_get_token($pconfig['uid']);
 
-		Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_notifications.php', $pconfig['uid'], $last);
+		Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_notifications.php', $pconfig['uid']);
 		if (DI::pConfig()->get($pconfig['uid'], 'bluesky', 'import')) {
-			Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_timeline.php', $pconfig['uid'], $last);
+			Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_timeline.php', $pconfig['uid']);
 		}
 		if (DI::pConfig()->get($pconfig['uid'], 'bluesky', 'import_feeds')) {
 			Logger::debug('Fetch feeds for user', ['uid' => $pconfig['uid']]);
 			$feeds = bluesky_get_feeds($pconfig['uid']);
 			foreach ($feeds as $feed) {
-				Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_feed.php', $pconfig['uid'], $feed, $last);
+				Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_feed.php', $pconfig['uid'], $feed);
 			}
 		}
 		Logger::debug('Polling done for user', ['uid' => $pconfig['uid']]);
@@ -710,7 +715,7 @@ function bluesky_create_activity(array $item, stdClass $parent = null)
 	}
 
 	$activity = bluesky_xrpc_post($uid, 'com.atproto.repo.createRecord', $post);
-	if (empty($activity)) {
+	if (empty($activity->uri)) {
 		return;
 	}
 	Logger::debug('Activity done', ['return' => $activity]);
@@ -794,7 +799,7 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
 		];
 
 		$parent = bluesky_xrpc_post($uid, 'com.atproto.repo.createRecord', $post);
-		if (empty($parent)) {
+		if (empty($parent->uri)) {
 			if ($part == 0) {
 				Worker::defer();
 			}
@@ -972,7 +977,7 @@ function bluesky_upload_blob(int $uid, array $photo): ?stdClass
 	Logger::info('Uploading', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
 
 	$data = bluesky_post($uid, '/xrpc/com.atproto.repo.uploadBlob', $content, ['Content-type' => $photo['type'], 'Authorization' => ['Bearer ' . bluesky_get_token($uid)]]);
-	if (empty($data)) {
+	if (empty($data) || empty($data->blob)) {
 		Logger::info('Uploading failed', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
 		return null;
 	}
@@ -993,7 +998,7 @@ function bluesky_delete_post(string $uri, int $uid)
 	Logger::debug('Deleted', ['parts' => $parts]);
 }
 
-function bluesky_fetch_timeline(int $uid, int $last_poll)
+function bluesky_fetch_timeline(int $uid)
 {
 	$data = bluesky_xrpc_get($uid, 'app.bsky.feed.getTimeline');
 	if (empty($data)) {
@@ -1004,15 +1009,44 @@ function bluesky_fetch_timeline(int $uid, int $last_poll)
 		return;
 	}
 
+	$last_post = DBA::selectFirst('post-thread-user', ['received'], ['network' => Protocol::BLUESKY, 'uid' => $uid], ['order' => ['received' => true]]);
+	$last_poll = !empty($last_post['received']) ? strtotime($last_post['received']) : 0;
+
 	foreach (array_reverse($data->feed) as $entry) {
+		$causer = bluesky_get_contact($entry->post->author, 0, $uid);
+		if (!empty($entry->reply)) {
+			if (!empty($entry->reply->root)) {
+				bluesky_complete_post($entry->reply->root, $uid, Item::PR_COMMENT, $causer['id'], $last_poll);
+			}
+			if (!empty($entry->reply->parent)) {
+				bluesky_complete_post($entry->reply->parent, $uid, Item::PR_COMMENT, $causer['id'], $last_poll);
+			}
+		}
 		bluesky_process_post($entry->post, $uid, $uid, Item::PR_NONE, 0, 0, $last_poll);
 		if (!empty($entry->reason)) {
 			bluesky_process_reason($entry->reason, bluesky_get_uri($entry->post), $uid);
 		}
 	}
+}
 
-	// @todo Support paging
-	// [cursor] => 1684670516000::bafyreidq3ilwslmlx72jf5vrk367xcc63s6lrhzlyup2bi3zwcvso6w2vi
+function bluesky_complete_post(stdClass $post, int $uid, int $post_reason, int $causer, int $last_poll): int
+{
+	$complete     = DI::pConfig()->get($uid, 'bluesky', 'complete_threads');
+	$existing_uri = bluesky_fetch_post(bluesky_get_uri($post), $uid);
+	if (!empty($existing_uri)) {
+		$comments = Post::countPosts(['thr-parent' => $existing_uri, 'gravity' => Item::GRAVITY_COMMENT]);
+		if (($post->replyCount <= $comments) || !$complete) {
+			return bluesky_fetch_uri_id($existing_uri, $uid);
+		}
+	}
+
+	if ($complete) {
+		$uri = bluesky_fetch_missing_post($post->uri, $uid, $uid, $post_reason, $causer, 0, $last_poll, '', true);
+		$uri_id = bluesky_fetch_uri_id($uri, $uid);
+	} else {
+		$uri_id = bluesky_process_post($post, $uid, $uid, $post_reason, $causer, 0, $last_poll);
+	}
+	return $uri_id;
 }
 
 function bluesky_process_reason(stdClass $reason, string $uri, int $uid)
@@ -1056,12 +1090,16 @@ function bluesky_process_reason(stdClass $reason, string $uri, int $uid)
 	}
 }
 
-function bluesky_fetch_notifications(int $uid, int $last_poll)
+function bluesky_fetch_notifications(int $uid)
 {
 	$data = bluesky_xrpc_get($uid, 'app.bsky.notification.listNotifications');
 	if (empty($data->notifications)) {
 		return;
 	}
+
+	$last_post = DBA::selectFirst('post-thread-user', ['received'], ['network' => Protocol::BLUESKY, 'uid' => $uid], ['order' => ['received' => true]]);
+	$last_poll = !empty($last_post['received']) ? strtotime($last_post['received']) : 0;
+
 	foreach ($data->notifications as $notification) {
 		$uri = bluesky_get_uri($notification);
 		if (Post::exists(['uri' => $uri, 'uid' => $uid]) || Post::exists(['extid' => $uri, 'uid' => $uid])) {
@@ -1071,7 +1109,7 @@ function bluesky_fetch_notifications(int $uid, int $last_poll)
 		Logger::debug('Process notification', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
 		switch ($notification->reason) {
 			case 'like':
-				$item = bluesky_get_header($notification, $uri, $uid, $uid);
+				$item = bluesky_get_header($notification, $uri, $uid, $uid, $last_poll);
 				$item['gravity'] = Item::GRAVITY_ACTIVITY;
 				$item['body'] = $item['verb'] = Activity::LIKE;
 				$item['thr-parent'] = bluesky_get_uri($notification->record->subject);
@@ -1085,7 +1123,7 @@ function bluesky_fetch_notifications(int $uid, int $last_poll)
 				break;
 
 			case 'repost':
-				$item = bluesky_get_header($notification, $uri, $uid, $uid);
+				$item = bluesky_get_header($notification, $uri, $uid, $uid, $last_poll);
 				$item['gravity'] = Item::GRAVITY_ACTIVITY;
 				$item['body'] = $item['verb'] = Activity::ANNOUNCE;
 				$item['thr-parent'] = bluesky_get_uri($notification->record->subject);
@@ -1128,7 +1166,7 @@ function bluesky_fetch_notifications(int $uid, int $last_poll)
 	}
 }
 
-function bluesky_fetch_feed(int $uid, string $feed, int $last_poll)
+function bluesky_fetch_feed(int $uid, string $feed)
 {
 	$data = bluesky_xrpc_get($uid, 'app.bsky.feed.getFeed', ['feed' => $feed]);
 	if (empty($data)) {
@@ -1139,8 +1177,11 @@ function bluesky_fetch_feed(int $uid, string $feed, int $last_poll)
 		return;
 	}
 
+	$last_post = DBA::selectFirst('post-thread-user', ['received'], ['network' => Protocol::BLUESKY, 'uid' => $uid], ['order' => ['received' => true]]);
+	$last_poll = !empty($last_post['received']) ? strtotime($last_post['received']) : 0;
+
 	$feeddata = bluesky_xrpc_get($uid, 'app.bsky.feed.getFeedGenerator', ['feed' => $feed]);
-	if (!empty($feeddata)) {
+	if (!empty($feeddata) && !empty($feeddata->view)) {
 		$feedurl  = $feeddata->view->uri;
 		$feedname = $feeddata->view->displayName;
 	} else {
@@ -1153,10 +1194,11 @@ function bluesky_fetch_feed(int $uid, string $feed, int $last_poll)
 		$languages = $entry->post->record->langs ?? [];
 
 		if (!Relay::isWantedLanguage($entry->post->record->text, 0, $contact['id'] ?? 0, $languages)) {
-			Logger::debug('Unwanted language detected', ['text' => $entry->post->record->text]);
+			Logger::debug('Unwanted language detected', ['languages' => $languages, 'text' => $entry->post->record->text]);
 			continue;
 		}
-		$uri_id = bluesky_process_post($entry->post, $uid, $uid, Item::PR_TAG, 0, 0, $last_poll);
+		$causer = bluesky_get_contact($entry->post->author, 0, $uid);
+		$uri_id = bluesky_complete_post($entry->post, $uid, Item::PR_TAG, $causer['id'], $last_poll);
 		if (!empty($uri_id)) {
 			$stored = Post\Category::storeFileByURIId($uri_id, $uid, Post\Category::SUBCRIPTION, $feedname, $feedurl);
 			Logger::debug('Stored tag subscription for user', ['uri-id' => $uri_id, 'uid' => $uid, 'name' => $feedname, 'url' => $feedurl, 'stored' => $stored]);
@@ -1184,7 +1226,7 @@ function bluesky_process_post(stdClass $post, int $uid, int $fetch_uid, int $pos
 
 	Logger::debug('Importing post', ['uid' => $uid, 'indexedAt' => $post->indexedAt, 'uri' => $post->uri, 'cid' => $post->cid, 'root' => $post->record->reply->root ?? '']);
 
-	$item = bluesky_get_header($post, $uri, $uid, $fetch_uid);
+	$item = bluesky_get_header($post, $uri, $uid, $fetch_uid, $last_poll);
 	$item = bluesky_get_content($item, $post->record, $uri, $uid, $fetch_uid, $level, $last_poll);
 	if (empty($item)) {
 		return 0;
@@ -1208,7 +1250,7 @@ function bluesky_process_post(stdClass $post, int $uid, int $fetch_uid, int $pos
 	return bluesky_fetch_uri_id($uri, $uid);
 }
 
-function bluesky_get_header(stdClass $post, string $uri, int $uid, int $fetch_uid): array
+function bluesky_get_header(stdClass $post, string $uri, int $uid, int $fetch_uid, int $last_poll = 0): array
 {
 	$parts = bluesky_get_uri_parts($uri);
 	if (empty($post->author) || empty($post->cid) || empty($parts->rkey)) {
@@ -1221,6 +1263,7 @@ function bluesky_get_header(stdClass $post, string $uri, int $uid, int $fetch_ui
 		'wall'          => false,
 		'uri'           => $uri,
 		'guid'          => $post->cid,
+		'received'      => DateTimeFormat::utc($post->indexedAt, DateTimeFormat::MYSQL),
 		'private'       => Item::UNLISTED,
 		'verb'          => Activity::POST,
 		'contact-id'    => $contact['id'],
@@ -1231,6 +1274,10 @@ function bluesky_get_header(stdClass $post, string $uri, int $uid, int $fetch_ui
 		'source'        => json_encode($post),
 	];
 
+	if (($last_poll != 0) && strtotime($item['received']) < $last_poll) {
+		unset($item['received']);
+	}
+
 	$account = Contact::selectFirstAccountUser(['pid'], ['id' => $contact['id']]);
 
 	$item['author-id'] = $account['pid'];
@@ -1329,10 +1376,6 @@ function bluesky_get_content(array $item, stdClass $record, string $uri, int $ui
 	$item['created'] = DateTimeFormat::utc($record->createdAt, DateTimeFormat::MYSQL);
 	$item['transmitted-languages'] = $record->langs ?? [];
 
-	if (($last_poll != 0) && strtotime($item['created']) > $last_poll) {
-		$item['received'] = $item['created'];
-	}
-
 	return $item;
 }
 
@@ -1422,7 +1465,7 @@ function bluesky_add_media(stdClass $embed, array $item, int $fetch_uid, int $le
 			];
 			Post\Media::insert($media);
 			break;
-	
+
 		case 'app.bsky.embed.external#view':
 			$media = [
 				'uri-id' => $item['uri-id'],
@@ -1522,10 +1565,10 @@ function bluesky_get_uri_parts(string $uri): ?stdClass
 	return $class;
 }
 
-function bluesky_fetch_missing_post(string $uri, int $uid, int $fetch_uid, int $post_reason, int $causer, int $level, int $last_poll, string $fallback = ''): string
+function bluesky_fetch_missing_post(string $uri, int $uid, int $fetch_uid, int $post_reason, int $causer, int $level, int $last_poll, string $fallback = '', bool $always_fetch = false): string
 {
 	$fetched_uri = bluesky_fetch_post($uri, $uid);
-	if (!empty($fetched_uri)) {
+	if (!$always_fetch && !empty($fetched_uri)) {
 		return $fetched_uri;
 	}
 
@@ -1545,7 +1588,7 @@ function bluesky_fetch_missing_post(string $uri, int $uid, int $fetch_uid, int $
 
 	Logger::debug('Fetch missing post', ['level' => $level, 'uid' => $uid, 'uri' => $uri]);
 	$data = bluesky_xrpc_get($fetch_uid, 'app.bsky.feed.getPostThread', ['uri' => $fetch_uri]);
-	if (empty($data)) {
+	if (empty($data) || empty($data->thread)) {
 		Logger::info('Thread was not fetched', ['level' => $level, 'uid' => $uid, 'uri' => $uri, 'fallback' => $fallback]);
 		return $fallback;
 	}
@@ -1556,9 +1599,31 @@ function bluesky_fetch_missing_post(string $uri, int $uid, int $fetch_uid, int $
 		$causer = Contact::getPublicContactId($causer, $uid);
 	}
 
+	if (!empty($data->thread->parent)) {
+		$parents = bluesky_fetch_parents($data->thread->parent, $uid);
+		
+		foreach ($parents as $parent) {
+			$uri_id = bluesky_process_post($parent, $uid, $fetch_uid, Item::PR_FETCHED, $causer, $level, $last_poll);
+			Logger::debug('Parent created', ['uri-id' => $uri_id]);
+		}
+	}
+	
 	return bluesky_process_thread($data->thread, $uid, $fetch_uid, $post_reason, $causer, $level, $last_poll);
 }
 
+function bluesky_fetch_parents(stdClass $parent, int $uid, array $parents = []): array
+{
+	if (!empty($parent->parent)) {
+		$parents = bluesky_fetch_parents($parent->parent, $uid, $parents);
+	}
+	
+	if (empty(bluesky_fetch_post(bluesky_get_uri($parent->post), $uid))) {
+		$parents[] = $parent->post;
+	}
+
+	return $parents;
+}
+
 function bluesky_fetch_post(string $uri, int $uid): string
 {
 	if (Post::exists(['uri' => $uri, 'uid' => [$uid, 0]])) {
@@ -1694,7 +1759,7 @@ function bluesky_get_contact_fields(stdClass $author, int $uid, int $fetch_uid,
 	}
 
 	$data = bluesky_get(BLUESKY_DIRECTORY . '/' . $author->did);
-	if (!empty($data)) {		
+	if (!empty($data)) {
 		$fields['baseurl'] = bluesky_get_pds('', $data);
 		if (!empty($fields['baseurl'])) {
 			GServer::check($fields['baseurl'], Protocol::BLUESKY);
@@ -1877,6 +1942,13 @@ function bluesky_get_did(string $handle, int $uid): string
 		return $did;
 	}
 
+	// The profile page can contain hints to the DID as well
+	$did = bluesky_get_did_by_profile('https://' . $handle);
+	if ($did != '') {
+		Logger::debug('Got DID by profile page', ['handle' => $handle, 'did' => $did]);
+		return $did;
+	}
+
 	// And finally we use the default PDS from Bluesky.
 	$data = bluesky_get(BLUESKY_PDS . '/xrpc/com.atproto.identity.resolveHandle?handle=' . urlencode($handle));
 	if (!empty($data) && !empty($data->did)) {
@@ -1996,7 +2068,7 @@ function bluesky_refresh_token(int $uid): string
 	$token = DI::pConfig()->get($uid, 'bluesky', 'refresh_token');
 
 	$data = bluesky_post($uid, '/xrpc/com.atproto.server.refreshSession', '', ['Authorization' => ['Bearer ' . $token]]);
-	if (empty($data)) {
+	if (empty($data) || empty($data->accessJwt)) {
 		return '';
 	}
 
@@ -2015,7 +2087,7 @@ function bluesky_create_token(int $uid, string $password): string
 	}
 
 	$data = bluesky_post($uid, '/xrpc/com.atproto.server.createSession', json_encode(['identifier' => $did, 'password' => $password]), ['Content-type' => 'application/json']);
-	if (empty($data)) {
+	if (empty($data) || empty($data->accessJwt)) {
 		DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_TOKEN_FAIL);
 		return '';
 	}
@@ -2052,14 +2124,18 @@ function bluesky_post(int $uid, string $url, string $params, array $headers): ?s
 		return null;
 	}
 
+	$data = json_decode($curlResult->getBodyString());
 	if (!$curlResult->isSuccess()) {
-		Logger::notice('API Error', ['error' => json_decode($curlResult->getBodyString()) ?: $curlResult->getBodyString()]);
-		DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_API_FAIL);
-		return null;
+		Logger::notice('API Error', ['url' => $url, 'code' => $curlResult->getReturnCode(), 'error' => $data ?: $curlResult->getBodyString()]);
+		if (!$data) {
+			DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_API_FAIL);
+			return null;
+		}
+		$data->code = $curlResult->getReturnCode();
 	}
 
 	DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_SUCCESS);
-	return json_decode($curlResult->getBodyString());
+	return $data;
 }
 
 function bluesky_xrpc_get(int $uid, string $url, array $parameters = []): ?stdClass
@@ -2073,7 +2149,14 @@ function bluesky_xrpc_get(int $uid, string $url, array $parameters = []): ?stdCl
 		return null;
 	}
 
-	$data = bluesky_get($pds . '/xrpc/' . $url, HttpClientAccept::JSON, [HttpClientOptions::HEADERS => ['Authorization' => ['Bearer ' . bluesky_get_token($uid)]]]);
+	$headers = ['Authorization' => ['Bearer ' . bluesky_get_token($uid)]];
+
+	$languages = User::getWantedLanguages($uid);
+	if (!empty($languages)) {
+		$headers['Accept-Language'] = implode(',', $languages);
+	}
+
+	$data = bluesky_get($pds . '/xrpc/' . $url, HttpClientAccept::JSON, [HttpClientOptions::HEADERS => $headers]);
 	DI::pConfig()->set($uid, 'bluesky', 'status', is_null($data) ? BLUEKSY_STATUS_API_FAIL : BLUEKSY_STATUS_SUCCESS);
 	return $data;
 }
@@ -2087,11 +2170,15 @@ function bluesky_get(string $url, string $accept_content = HttpClientAccept::DEF
 		return null;
 	}
 
+	$data = json_decode($curlResult->getBodyString());
 	if (!$curlResult->isSuccess()) {
-		Logger::notice('API Error', ['url' => $url, 'error' => json_decode($curlResult->getBodyString()) ?: $curlResult->getBodyString()]);
-		return null;
+		Logger::notice('API Error', ['url' => $url, 'code' => $curlResult->getReturnCode(), 'error' => $data ?: $curlResult->getBodyString()]);
+		if (!$data) {
+			return null;
+		}
+		$data->code = $curlResult->getReturnCode();
 	}
 
 	Item::incrementInbound(Protocol::BLUESKY);
-	return json_decode($curlResult->getBodyString());
+	return $data;
 }
diff --git a/bluesky/bluesky_feed.php b/bluesky/bluesky_feed.php
index c9a54223..a20ef1b9 100644
--- a/bluesky/bluesky_feed.php
+++ b/bluesky/bluesky_feed.php
@@ -6,11 +6,11 @@ function bluesky_feed_run($argv, $argc)
 {
 	require_once 'addon/bluesky/bluesky.php';
 
-	if ($argc != 4) {
+	if ($argc < 3) {
 		return;
 	}
 
-	Logger::debug('Importing feed - start', ['user' => $argv[1], 'feed' => $argv[2], 'last_poll' => $argv[3]]);
-	bluesky_fetch_feed($argv[1], $argv[2], $argv[3]);
-	Logger::debug('Importing feed - done', ['user' => $argv[1], 'feed' => $argv[2], 'last_poll' => $argv[3]]);
+	Logger::debug('Importing feed - start', ['user' => $argv[1], 'feed' => $argv[2]]);
+	bluesky_fetch_feed($argv[1], $argv[2]);
+	Logger::debug('Importing feed - done', ['user' => $argv[1], 'feed' => $argv[2]]);
 }
diff --git a/bluesky/bluesky_notifications.php b/bluesky/bluesky_notifications.php
index ad35dfe0..1fbc8f67 100644
--- a/bluesky/bluesky_notifications.php
+++ b/bluesky/bluesky_notifications.php
@@ -6,11 +6,11 @@ function bluesky_notifications_run($argv, $argc)
 {
 	require_once 'addon/bluesky/bluesky.php';
 
-	if ($argc != 3) {
+	if ($argc < 2) {
 		return;
 	}
 
-	Logger::notice('importing notifications - start', ['user' => $argv[1], 'last_poll' => $argv[2]]);
-	bluesky_fetch_notifications($argv[1], $argv[2]);
-	Logger::notice('importing notifications - done', ['user' => $argv[1], 'last_poll' => $argv[2]]);
+	Logger::notice('importing notifications - start', ['user' => $argv[1]]);
+	bluesky_fetch_notifications($argv[1]);
+	Logger::notice('importing notifications - done', ['user' => $argv[1]]);
 }
diff --git a/bluesky/bluesky_timeline.php b/bluesky/bluesky_timeline.php
index 22ef2224..fda846ba 100644
--- a/bluesky/bluesky_timeline.php
+++ b/bluesky/bluesky_timeline.php
@@ -6,11 +6,11 @@ function bluesky_timeline_run($argv, $argc)
 {
 	require_once 'addon/bluesky/bluesky.php';
 
-	if ($argc != 3) {
+	if ($argc < 2) {
 		return;
 	}
 
-	Logger::notice('importing timeline - start', ['user' => $argv[1], 'last_poll' => $argv[2]]);
-	bluesky_fetch_timeline($argv[1], $argv[2]);
-	Logger::notice('importing timeline - done', ['user' => $argv[1], 'last_poll' => $argv[2]]);
+	Logger::notice('importing timeline - start', ['user' => $argv[1]]);
+	bluesky_fetch_timeline($argv[1]);
+	Logger::notice('importing timeline - done', ['user' => $argv[1]]);
 }
diff --git a/bluesky/lang/C/messages.po b/bluesky/lang/C/messages.po
index 9521ab89..d573972c 100644
--- a/bluesky/lang/C/messages.po
+++ b/bluesky/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-22 05:31+0000\n"
+"POT-Creation-Date: 2024-09-29 18:16+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,131 +17,117 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: bluesky.php:325
+#: bluesky.php:335
 msgid "Save Settings"
 msgstr ""
 
-#: bluesky.php:326
+#: bluesky.php:336
 msgid "Allow your users to use your hostname for their Bluesky handles"
 msgstr ""
 
-#: bluesky.php:326
+#: bluesky.php:336
 #, php-format
-msgid ""
-"Before enabling this option, you have to setup a wildcard domain "
-"configuration and you have to enable wildcard requests in your webserver "
-"configuration. On Apache this is done by adding \"ServerAlias *.%s\" to your "
-"HTTP configuration. You don't need to change the HTTPS configuration."
+msgid "Before enabling this option, you have to setup a wildcard domain configuration and you have to enable wildcard requests in your webserver configuration. On Apache this is done by adding \"ServerAlias *.%s\" to your HTTP configuration. You don't need to change the HTTPS configuration."
 msgstr ""
 
-#: bluesky.php:354
+#: bluesky.php:365
 #, php-format
 msgid "Allow to use %s as your Bluesky handle."
 msgstr ""
 
-#: bluesky.php:354
+#: bluesky.php:365
 #, php-format
-msgid ""
-"When enabled, you can use %s as your Bluesky handle. After you enabled this "
-"option, please go to https://bsky.app/settings and select to change your "
-"handle. Select that you have got your own domain. Then enter %s and select "
-"\"No DNS Panel\". Then select \"Verify Text File\"."
-msgstr ""
-
-#: bluesky.php:361
-msgid "Enable Bluesky Post Addon"
-msgstr ""
-
-#: bluesky.php:362
-msgid "Post to Bluesky by default"
-msgstr ""
-
-#: bluesky.php:363
-msgid "Import the remote timeline"
-msgstr ""
-
-#: bluesky.php:364
-msgid "Import the pinned feeds"
-msgstr ""
-
-#: bluesky.php:364
-msgid ""
-"When activated, Posts will be imported from all the feeds that you pinned in "
-"Bluesky."
-msgstr ""
-
-#: bluesky.php:366
-msgid "Personal Data Server"
-msgstr ""
-
-#: bluesky.php:366
-msgid "The personal data server (PDS) is the system that hosts your profile."
-msgstr ""
-
-#: bluesky.php:367
-msgid "Bluesky handle"
-msgstr ""
-
-#: bluesky.php:368
-msgid "Bluesky DID"
-msgstr ""
-
-#: bluesky.php:368
-msgid ""
-"This is the unique identifier. It will be fetched automatically, when the "
-"handle is entered."
-msgstr ""
-
-#: bluesky.php:369
-msgid "Bluesky app password"
-msgstr ""
-
-#: bluesky.php:369
-msgid ""
-"Please don't add your real password here, but instead create a specific app "
-"password in the Bluesky settings."
+msgid "When enabled, you can use %s as your Bluesky handle. After you enabled this option, please go to https://bsky.app/settings and select to change your handle. Select that you have got your own domain. Then enter %s and select \"No DNS Panel\". Then select \"Verify Text File\"."
 msgstr ""
 
 #: bluesky.php:375
+msgid "Enable Bluesky Post Addon"
+msgstr ""
+
+#: bluesky.php:376
+msgid "Post to Bluesky by default"
+msgstr ""
+
+#: bluesky.php:377
+msgid "Import the remote timeline"
+msgstr ""
+
+#: bluesky.php:378
+msgid "Import the pinned feeds"
+msgstr ""
+
+#: bluesky.php:378
+msgid "When activated, Posts will be imported from all the feeds that you pinned in Bluesky."
+msgstr ""
+
+#: bluesky.php:379
+msgid "Complete the threads"
+msgstr ""
+
+#: bluesky.php:379
+msgid "When activated, the system fetches additional replies for the posts in the timeline. This leads to more complete threads."
+msgstr ""
+
+#: bluesky.php:381
+msgid "Personal Data Server"
+msgstr ""
+
+#: bluesky.php:381
+msgid "The personal data server (PDS) is the system that hosts your profile."
+msgstr ""
+
+#: bluesky.php:382
+msgid "Bluesky handle"
+msgstr ""
+
+#: bluesky.php:383
+msgid "Bluesky DID"
+msgstr ""
+
+#: bluesky.php:383
+msgid "This is the unique identifier. It will be fetched automatically, when the handle is entered."
+msgstr ""
+
+#: bluesky.php:384
+msgid "Bluesky app password"
+msgstr ""
+
+#: bluesky.php:384
+msgid "Please don't add your real password here, but instead create a specific app password in the Bluesky settings."
+msgstr ""
+
+#: bluesky.php:390
 msgid "Bluesky Import/Export"
 msgstr ""
 
-#: bluesky.php:385
-msgid ""
-"You are not authenticated. Please enter your handle and the app password."
+#: bluesky.php:400
+msgid "You are not authenticated. Please enter your handle and the app password."
 msgstr ""
 
-#: bluesky.php:405
-msgid ""
-"You are authenticated to Bluesky. For security reasons the password isn't "
-"stored."
+#: bluesky.php:420
+msgid "You are authenticated to Bluesky. For security reasons the password isn't stored."
 msgstr ""
 
-#: bluesky.php:407
-msgid ""
-"The communication with the personal data server service (PDS) is established."
+#: bluesky.php:422
+msgid "The communication with the personal data server service (PDS) is established."
 msgstr ""
 
-#: bluesky.php:409
+#: bluesky.php:424
 msgid "Communication issues with the personal data server service (PDS)."
 msgstr ""
 
-#: bluesky.php:411
-msgid ""
-"The DID for the provided handle could not be detected. Please check if you "
-"entered the correct handle."
+#: bluesky.php:426
+msgid "The DID for the provided handle could not be detected. Please check if you entered the correct handle."
 msgstr ""
 
-#: bluesky.php:413
+#: bluesky.php:428
 msgid "The personal data server service (PDS) could not be detected."
 msgstr ""
 
-#: bluesky.php:415
-msgid ""
-"The authentication with the provided handle and password failed. Please "
-"check if you entered the correct password."
+#: bluesky.php:430
+msgid "The authentication with the provided handle and password failed. Please check if you entered the correct password."
 msgstr ""
 
-#: bluesky.php:484
+#: bluesky.php:492
 msgid "Post to Bluesky"
 msgstr ""
diff --git a/bluesky/templates/connector_settings.tpl b/bluesky/templates/connector_settings.tpl
index 3ebea827..a85bcd89 100644
--- a/bluesky/templates/connector_settings.tpl
+++ b/bluesky/templates/connector_settings.tpl
@@ -3,6 +3,7 @@
 {{include file="field_checkbox.tpl" field=$bydefault}}
 {{include file="field_checkbox.tpl" field=$import}}
 {{include file="field_checkbox.tpl" field=$import_feeds}}
+{{include file="field_checkbox.tpl" field=$complete_threads}}
 {{if $custom_handle}}
 	{{include file="field_checkbox.tpl" field=$custom_handle}}
 {{/if}}

From 08c17c9dd47388da281875c2def8d07d4a0085d6 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 19 Oct 2024 07:41:24 +0000
Subject: [PATCH 117/294] Bluesky: Fixes "E_WARNING: Undefined property:
 stdClass::$post"

---
 bluesky/bluesky.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 73b19612..95857b01 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1617,7 +1617,7 @@ function bluesky_fetch_parents(stdClass $parent, int $uid, array $parents = []):
 		$parents = bluesky_fetch_parents($parent->parent, $uid, $parents);
 	}
 	
-	if (empty(bluesky_fetch_post(bluesky_get_uri($parent->post), $uid))) {
+	if (!empty($parent->post) && empty(bluesky_fetch_post(bluesky_get_uri($parent->post), $uid))) {
 		$parents[] = $parent->post;
 	}
 

From 586ebe96993bcf8ee3be35c13b2475cb1d527287 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 23 Oct 2024 12:14:40 +0000
Subject: [PATCH 118/294] Bluesky: "block" now works / label names are now
 displayed

---
 bluesky/bluesky.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 95857b01..894b64d9 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -278,14 +278,12 @@ function bluesky_block(array &$hook_data)
 		return;
 	}
 
-	Logger::debug('Check if contact is bluesky', ['data' => $hook_data]);
-	$contact = DBA::selectFirst('contact', [], ['network' => Protocol::BLUESKY, 'url' => $hook_data['url'], 'uid' => [0, $hook_data['uid']]]);
-	if (empty($contact)) {
+	if ($hook_data['contact']['network'] != Protocol::BLUESKY) {
 		return;
 	}
 
 	$record = [
-		'subject'   => $contact['url'],
+		'subject'   => $hook_data['contact']['url'],
 		'createdAt' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
 		'$type'     => 'app.bsky.graph.block'
 	];
@@ -1297,6 +1295,7 @@ function bluesky_get_header(stdClass $post, string $uri, int $uid, int $fetch_ui
 			// When "ver" is set to "1" it was flagged by some automated process.
 			if (empty($label->ver)) {
 				$item['sensitive'] = true;
+				$item['content-warning'] = $label->val ?? '';
 				Logger::debug('Sensitive content', ['uri-id' => $item['uri-id'], 'label' => $label]);
 			}
 		}

From 8b694fbb4c6ee0a19fd7c3b30edca30d916523a9 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 27 Oct 2024 04:50:45 +0000
Subject: [PATCH 119/294] Bluesky: Fix following of a contact and adding a post

---
 bluesky/bluesky.php | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 894b64d9..45a56792 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -139,7 +139,7 @@ function bluesky_probe_detect(array &$hookData)
 			return;
 		}
 	} elseif (Network::isValidHttpUrl($hookData['uri'])) {
-		$did = bluesky_get_did_by_profile($hookData['uri']);
+		$did = bluesky_get_did_by_profile($hookData['uri'], $pconfig['uid']);
 		if (empty($did)) {
 			return;
 		}
@@ -181,21 +181,21 @@ function bluesky_item_by_link(array &$hookData)
 		return;
 	}
 
-	$did = bluesky_get_did_by_profile($hookData['uri']);
+	if (!preg_match('#/profile/(.+)/post/(.+)#', $hookData['uri'], $matches)) {
+		return;
+	}
+
+	$did = bluesky_get_did($matches[1], $hookData['uid']);
 	if (empty($did)) {
 		return;
 	}
 
-	if (!preg_match('#/profile/.+/post/(.+)#', $hookData['uri'], $matches)) {
-		return;
-	}
+	Logger::debug('Found bluesky post', ['url' => $hookData['uri'], 'did' => $did, 'cid' => $matches[2]]);
 
-	Logger::debug('Found bluesky post', ['url' => $hookData['uri'], 'did' => $did, 'cid' => $matches[1]]);
-
-	$uri = 'at://' . $did . '/app.bsky.feed.post/' . $matches[1];
+	$uri = 'at://' . $did . '/app.bsky.feed.post/' . $matches[2];
 
 	$uri = bluesky_fetch_missing_post($uri, $hookData['uid'], $hookData['uid'], Item::PR_FETCHED, 0, 0, 0);
-	Logger::debug('Got post', ['did' => $did, 'cid' => $matches[1], 'result' => $uri]);
+	Logger::debug('Got post', ['did' => $did, 'cid' => $matches[2], 'result' => $uri]);
 	if (!empty($uri)) {
 		$item = Post::selectFirst(['id'], ['uri' => $uri, 'uid' => $hookData['uid']]);
 		if (!empty($item['id'])) {
@@ -1831,8 +1831,14 @@ function bluesky_get_preferences(int $uid): ?stdClass
 	return $data;
 }
 
-function bluesky_get_did_by_profile(string $url): string
+function bluesky_get_did_by_profile(string $url, int $uid): string
 {
+	if (preg_match('#/profile/(.+)#', $url, $matches)) {
+		$did = bluesky_get_did($matches[1], $uid);
+		if (!empty($did)) {
+			return $did;
+		}
+	}
 	try {
 		$curlResult = DI::httpClient()->get($url, HttpClientAccept::HTML, [HttpClientOptions::REQUEST => HttpClientRequest::CONTACTINFO]);
 	} catch (\Throwable $th) {
@@ -1941,13 +1947,6 @@ function bluesky_get_did(string $handle, int $uid): string
 		return $did;
 	}
 
-	// The profile page can contain hints to the DID as well
-	$did = bluesky_get_did_by_profile('https://' . $handle);
-	if ($did != '') {
-		Logger::debug('Got DID by profile page', ['handle' => $handle, 'did' => $did]);
-		return $did;
-	}
-
 	// And finally we use the default PDS from Bluesky.
 	$data = bluesky_get(BLUESKY_PDS . '/xrpc/com.atproto.identity.resolveHandle?handle=' . urlencode($handle));
 	if (!empty($data) && !empty($data->did)) {

From 4165479079faf4a8bb63d08574e0ff10cd4950ab Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 30 Oct 2024 05:11:50 +0000
Subject: [PATCH 120/294] Bluesky: Fix probe mistake

---
 bluesky/bluesky.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 45a56792..af7d9ac7 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -181,7 +181,7 @@ function bluesky_item_by_link(array &$hookData)
 		return;
 	}
 
-	if (!preg_match('#/profile/(.+)/post/(.+)#', $hookData['uri'], $matches)) {
+	if (!preg_match('#^' . BLUESKY_WEB . '/profile/(.+)/post/(.+)#', $hookData['uri'], $matches)) {
 		return;
 	}
 
@@ -1833,7 +1833,7 @@ function bluesky_get_preferences(int $uid): ?stdClass
 
 function bluesky_get_did_by_profile(string $url, int $uid): string
 {
-	if (preg_match('#/profile/(.+)#', $url, $matches)) {
+	if (preg_match('#^' . BLUESKY_WEB . '/profile/(.+)#', $url, $matches)) {
 		$did = bluesky_get_did($matches[1], $uid);
 		if (!empty($did)) {
 			return $did;

From e89b5b1466811a28c28cd95bd81417735809018f Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Wed, 13 Nov 2024 10:10:25 +0100
Subject: [PATCH 121/294] deprecate fancybox addon

replaces #1562
---
 fancybox/fancybox.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fancybox/fancybox.php b/fancybox/fancybox.php
index 1a9ff634..73bbdab9 100644
--- a/fancybox/fancybox.php
+++ b/fancybox/fancybox.php
@@ -4,6 +4,7 @@
  * Description: Open media attachments of posts into a fancybox overlay.
  * Version: 1.05
  * Author: Grischa Brockhaus <grischa@brockha.us>
+ * Status: Unsupported
  */
 
 use Friendica\App;

From 6a1cbe9040d13de472f4924f4fe44ee1e2524ffc Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 6 Nov 2024 17:45:30 +0000
Subject: [PATCH 122/294] Bluesky/Tumblr: Add "connector" parcel to each
 incoming post

---
 bluesky/bluesky.php | 7 +++++--
 tumblr/tumblr.php   | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index af7d9ac7..4882a263 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -38,6 +38,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
 use Friendica\Model\GServer;
 use Friendica\Model\Item;
 use Friendica\Model\ItemURI;
@@ -1058,6 +1059,7 @@ function bluesky_process_reason(stdClass $reason, string $uri, int $uid)
 
 	$item = [
 		'network'       => Protocol::BLUESKY,
+		'protocol'      => Conversation::PARCEL_CONNECTOR,
 		'uid'           => $uid,
 		'wall'          => false,
 		'uri'           => $reason->by->did . '/app.bsky.feed.repost/' . $reason->indexedAt,
@@ -1257,6 +1259,7 @@ function bluesky_get_header(stdClass $post, string $uri, int $uid, int $fetch_ui
 	$contact = bluesky_get_contact($post->author, $uid, $fetch_uid);
 	$item = [
 		'network'       => Protocol::BLUESKY,
+		'protocol'      => Conversation::PARCEL_CONNECTOR,
 		'uid'           => $uid,
 		'wall'          => false,
 		'uri'           => $uri,
@@ -1459,8 +1462,8 @@ function bluesky_add_media(stdClass $embed, array $item, int $fetch_uid, int $le
 				'url'         => $embed->playlist,
 				'preview'     => $embed->thumbnail,
 				'description' => $embed->alt ?? '',
-				'height'      => $embed->aspectRatio->height,
-				'width'       => $embed->aspectRatio->width,
+				'height'      => $embed->aspectRatio->height ?? null,
+				'width'       => $embed->aspectRatio->width ?? null,
 			];
 			Post\Media::insert($media);
 			break;
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index dd34bd41..390c3c6c 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -22,6 +22,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
 use Friendica\Model\Item;
 use Friendica\Model\Photo;
 use Friendica\Model\Post;
@@ -31,7 +32,6 @@ use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\RequestException;
@@ -850,6 +850,7 @@ function tumblr_get_header(stdClass $post, string $uri, int $uid): array
 	$contact = tumblr_get_contact($post->blog, $uid);
 	$item = [
 		'network'       => Protocol::TUMBLR,
+		'protocol'      => Conversation::PARCEL_CONNECTOR,
 		'uid'           => $uid,
 		'wall'          => false,
 		'uri'           => $uri,

From c22e0ae8310e80c83373f608ab4e5b21660c594d Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 16 Nov 2024 05:42:00 +0000
Subject: [PATCH 123/294] Fix handling of the 'private' field / reformatted
 code

---
 bluesky/bluesky.php     | 32 +++++++++++++++++-----------
 diaspora/diaspora.php   | 47 ++++++++++++++++++++---------------------
 dwpost/dwpost.php       | 29 ++++++++++++-------------
 ijpost/ijpost.php       | 22 ++++++++-----------
 libertree/libertree.php | 47 ++++++++++++++++++-----------------------
 ljpost/ljpost.php       | 41 +++++++++++++++++------------------
 pnut/pnut.php           | 17 ++++++---------
 pumpio/pumpio.php       |  8 +++----
 statusnet/statusnet.php | 10 +++++----
 tumblr/tumblr.php       | 14 +++++-------
 twitter/twitter.php     |  6 +++---
 wppost/wppost.php       | 19 +++++------------
 12 files changed, 135 insertions(+), 157 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 4882a263..d719eecb 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -587,13 +587,13 @@ function bluesky_hook_fork(array &$b)
 
 	if (DI::pConfig()->get($post['uid'], 'bluesky', 'import')) {
 		// Don't post if it isn't a reply to a bluesky post
-		if (($post['parent'] != $post['id']) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::BLUESKY])) {
+		if (($post['gravity'] != Item::GRAVITY_PARENT) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::BLUESKY])) {
 			Logger::notice('No bluesky parent found', ['item' => $post['id']]);
 			$b['execute'] = false;
 			return;
 		}
-	} elseif (!strstr($post['postopts'] ?? '', 'bluesky') || ($post['parent'] != $post['id']) || $post['private']) {
-		DI::logger()->info('Activities are never exported when we don\'t import the bluesky timeline', ['uid' => $post['uid']]);
+	} elseif (!strstr($post['postopts'] ?? '', 'bluesky') || ($post['gravity'] != Item::GRAVITY_PARENT) || ($post['private'] == Item::PRIVATE)) {
+		DI::logger()->info('Post will not be exported', ['uid' => $post['uid'], 'postopts' => $post['postopts'], 'gravity' => $post['gravity'], 'private' => $post['private']]);
 		$b['execute'] = false;
 		return;
 	}
@@ -601,15 +601,11 @@ function bluesky_hook_fork(array &$b)
 
 function bluesky_post_local(array &$b)
 {
-	if ($b['edit']) {
-		return;
-	}
-
 	if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
 		return;
 	}
 
-	if ($b['private'] || $b['parent']) {
+	if ($b['edit'] || ($b['private'] == Item::PRIVATE) || ($b['gravity'] != Item::GRAVITY_PARENT)) {
 		return;
 	}
 
@@ -667,7 +663,7 @@ function bluesky_send(array &$b)
 			bluesky_create_activity($b, $parent);
 		}
 		return;
-	} elseif ($b['private'] || !strstr($b['postopts'], 'bluesky')) {
+	} elseif (($b['private'] == Item::PRIVATE) || !strstr($b['postopts'], 'bluesky')) {
 		return;
 	}
 
@@ -1481,6 +1477,18 @@ function bluesky_add_media(stdClass $embed, array $item, int $fetch_uid, int $le
 
 		case 'app.bsky.embed.record#view':
 			$original_uri = $uri = bluesky_get_uri($embed->record);
+			$type = '$type';
+			if (!empty($embed->record->record->$type)) {
+				$embed_type = $embed->record->record->$type;
+				if ($embed_type == 'app.bsky.graph.starterpack') {
+					Logger::debug('Starterpacks are not fetched like posts', ['original-uri' => $original_uri]);
+					if (empty($item['body'])) {
+						// @todo process starterpack
+						$item['body'] = '[url=' . $embed->record->record->list . ']' . $embed->record->record->name . '[/url]';
+					}
+					break;
+				}
+			}
 			$uri = bluesky_fetch_missing_post($uri, $item['uid'], $fetch_uid, Item::PR_FETCHED, $item['contact-id'], $level, $last_poll);
 			if ($uri) {
 				$shared = Post::selectFirst(['uri-id'], ['uri' => $uri, 'uid' => [$item['uid'], 0]]);
@@ -1603,13 +1611,13 @@ function bluesky_fetch_missing_post(string $uri, int $uid, int $fetch_uid, int $
 
 	if (!empty($data->thread->parent)) {
 		$parents = bluesky_fetch_parents($data->thread->parent, $uid);
-		
+
 		foreach ($parents as $parent) {
 			$uri_id = bluesky_process_post($parent, $uid, $fetch_uid, Item::PR_FETCHED, $causer, $level, $last_poll);
 			Logger::debug('Parent created', ['uri-id' => $uri_id]);
 		}
 	}
-	
+
 	return bluesky_process_thread($data->thread, $uid, $fetch_uid, $post_reason, $causer, $level, $last_poll);
 }
 
@@ -1618,7 +1626,7 @@ function bluesky_fetch_parents(stdClass $parent, int $uid, array $parents = []):
 	if (!empty($parent->parent)) {
 		$parents = bluesky_fetch_parents($parent->parent, $uid, $parents);
 	}
-	
+
 	if (!empty($parent->post) && empty(bluesky_fetch_post(bluesky_get_uri($parent->post), $uid))) {
 		$parents[] = $parent->post;
 	}
diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index cb2eb996..979204ba 100644
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -17,6 +17,7 @@ use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Core\Worker;
 use Friendica\DI;
+use Friendica\Model\Item;
 use Friendica\Model\Post;
 
 function diaspora_install()
@@ -120,15 +121,15 @@ function diaspora_settings(array &$data)
 function diaspora_settings_post(array &$b)
 {
 	if (!empty($_POST['diaspora-submit'])) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(),'diaspora', 'post'           , intval($_POST['enabled']));
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'diaspora', 'post', intval($_POST['enabled']));
 		if (intval($_POST['enabled'])) {
 			if (isset($_POST['handle'])) {
-				DI::pConfig()->set(DI::userSession()->getLocalUserId(),'diaspora', 'handle'         , trim($_POST['handle']));
-				DI::pConfig()->set(DI::userSession()->getLocalUserId(),'diaspora', 'password'       , trim($_POST['password']));
+				DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'diaspora', 'handle', trim($_POST['handle']));
+				DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'diaspora', 'password', trim($_POST['password']));
 			}
 			if (!empty($_POST['aspect'])) {
-				DI::pConfig()->set(DI::userSession()->getLocalUserId(),'diaspora', 'aspect'         , trim($_POST['aspect']));
-				DI::pConfig()->set(DI::userSession()->getLocalUserId(),'diaspora', 'post_by_default', intval($_POST['post_by_default']));
+				DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'diaspora', 'aspect', trim($_POST['aspect']));
+				DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'diaspora', 'post_by_default', intval($_POST['post_by_default']));
 			}
 		} else {
 			DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'diaspora', 'password');
@@ -144,8 +145,10 @@ function diaspora_hook_fork(array &$b)
 
 	$post = $b['data'];
 
-	if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
-		!strstr($post['postopts'] ?? '', 'diaspora') || ($post['parent'] != $post['id'])) {
+	if (
+		$post['deleted'] || ($post['private'] == Item::PRIVATE) || ($post['created'] !== $post['edited']) ||
+		!strstr($post['postopts'] ?? '', 'diaspora') || ($post['gravity'] != Item::GRAVITY_PARENT)
+	) {
 		$b['execute'] = false;
 		return;
 	}
@@ -153,23 +156,19 @@ function diaspora_hook_fork(array &$b)
 
 function diaspora_post_local(array &$b)
 {
-	if ($b['edit']) {
-		return;
-	}
-
 	if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
 		return;
 	}
 
-	if ($b['private'] || $b['parent']) {
+	if ($b['edit'] || ($b['private'] == Item::PRIVATE) || ($b['gravity'] != Item::GRAVITY_PARENT)) {
 		return;
 	}
 
-	$diaspora_post   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'diaspora','post'));
+	$diaspora_post   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'diaspora', 'post'));
 
 	$diaspora_enable = (($diaspora_post && !empty($_REQUEST['diaspora_enable'])) ? intval($_REQUEST['diaspora_enable']) : 0);
 
-	if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'diaspora','post_by_default'))) {
+	if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'diaspora', 'post_by_default'))) {
 		$diaspora_enable = 1;
 	}
 
@@ -190,11 +189,11 @@ function diaspora_send(array &$b)
 
 	Logger::notice('diaspora_send: invoked');
 
-	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
+	if ($b['deleted'] || ($b['private'] == Item::PRIVATE) || ($b['created'] !== $b['edited'])) {
 		return;
 	}
 
-	if (!strstr($b['postopts'],'diaspora')) {
+	if (!strstr($b['postopts'], 'diaspora')) {
 		return;
 	}
 
@@ -214,9 +213,9 @@ function diaspora_send(array &$b)
 
 	Logger::info('diaspora_send: prepare posting');
 
-	$handle = DI::pConfig()->get($b['uid'],'diaspora','handle');
-	$password = DI::pConfig()->get($b['uid'],'diaspora','password');
-	$aspect = DI::pConfig()->get($b['uid'],'diaspora','aspect');
+	$handle = DI::pConfig()->get($b['uid'], 'diaspora', 'handle');
+	$password = DI::pConfig()->get($b['uid'], 'diaspora', 'password');
+	$aspect = DI::pConfig()->get($b['uid'], 'diaspora', 'aspect');
 
 	if ($handle && $password) {
 		Logger::info('diaspora_send: all values seem to be okay');
@@ -230,7 +229,7 @@ function diaspora_send(array &$b)
 		// Removal of tags and mentions
 		// #-tags
 		$body = preg_replace('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $body);
- 		// @-mentions
+		// @-mentions
 		$body = preg_replace('/@\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '@$2', $body);
 
 		// remove multiple newlines
@@ -244,7 +243,7 @@ function diaspora_send(array &$b)
 
 		// Adding the title
 		if (strlen($title)) {
-			$body = "## ".html_entity_decode($title)."\n\n".$body;
+			$body = "## " . html_entity_decode($title) . "\n\n" . $body;
 		}
 
 		require_once "addon/diaspora/diasphp.php";
@@ -252,9 +251,9 @@ function diaspora_send(array &$b)
 		try {
 			Logger::info('diaspora_send: prepare');
 			$conn = new Diaspora_Connection($handle, $password);
-			Logger::info('diaspora_send: try to log in '.$handle);
+			Logger::info('diaspora_send: try to log in ' . $handle);
 			$conn->logIn();
-			Logger::info('diaspora_send: try to send '.$body);
+			Logger::info('diaspora_send: try to send ' . $body);
 
 			$conn->provider = $hostname;
 			$conn->postStatusMessage($body, $aspect);
@@ -263,7 +262,7 @@ function diaspora_send(array &$b)
 		} catch (Exception $e) {
 			Logger::notice("diaspora_send: Error submitting the post: " . $e->getMessage());
 
-			Logger::info('diaspora_send: requeueing '.$b['uid']);
+			Logger::info('diaspora_send: requeueing ' . $b['uid']);
 
 			Worker::defer();
 		}
diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index 4ad5021f..1ecd9764 100644
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -14,6 +14,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
+use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\Tag;
 use Friendica\Model\User;
@@ -88,24 +89,20 @@ function dwpost_settings_post(array &$b)
 
 function dwpost_post_local(array &$b)
 {
-	// This can probably be changed to allow editing by pointing to a different API endpoint
-	if ($b['edit']) {
-		return;
-	}
-
 	if ((!DI::userSession()->getLocalUserId()) || (DI::userSession()->getLocalUserId() != $b['uid'])) {
 		return;
 	}
 
-	if ($b['private'] || $b['parent']) {
+	// This can probably be changed to allow editing by pointing to a different API endpoint
+	if ($b['edit'] || ($b['private'] == Item::PRIVATE) || ($b['gravity'] != Item::GRAVITY_PARENT)) {
 		return;
 	}
 
-	$dw_post = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'dwpost','post'));
+	$dw_post = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'dwpost', 'post'));
 
 	$dw_enable = (($dw_post && !empty($_REQUEST['dwpost_enable'])) ? intval($_REQUEST['dwpost_enable']) : 0);
 
-	if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'dwpost','post_by_default'))) {
+	if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'dwpost', 'post_by_default'))) {
 		$dw_enable = 1;
 	}
 
@@ -122,7 +119,7 @@ function dwpost_post_local(array &$b)
 
 function dwpost_send(array &$b)
 {
-	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
+	if ($b['deleted'] || ($b['private'] == Item::PRIVATE) || ($b['created'] !== $b['edited'])) {
 		return;
 	}
 
@@ -145,8 +142,8 @@ function dwpost_send(array &$b)
 	$user = User::getById($b['uid']);
 	$tz = $user['timezone'] ?: 'UTC';
 
-	$dw_username = DI::pConfig()->get($b['uid'],'dwpost','dw_username');
-	$dw_password = DI::pConfig()->get($b['uid'],'dwpost','dw_password');
+	$dw_username = DI::pConfig()->get($b['uid'], 'dwpost', 'dw_username');
+	$dw_password = DI::pConfig()->get($b['uid'], 'dwpost', 'dw_password');
 	$dw_blog = 'http://www.dreamwidth.org/interface/xmlrpc';
 
 	if ($dw_username && $dw_password && $dw_blog) {
@@ -156,11 +153,11 @@ function dwpost_send(array &$b)
 		$tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]);
 
 		$date = DateTimeFormat::convert($b['created'], $tz);
-		$year = intval(substr($date,0,4));
-		$mon  = intval(substr($date,5,2));
-		$day  = intval(substr($date,8,2));
-		$hour = intval(substr($date,11,2));
-		$min  = intval(substr($date,14,2));
+		$year = intval(substr($date, 0, 4));
+		$mon  = intval(substr($date, 5, 2));
+		$day  = intval(substr($date, 8, 2));
+		$hour = intval(substr($date, 11, 2));
+		$min  = intval(substr($date, 14, 2));
 
 		$xml = <<< EOT
 <?xml version="1.0" encoding="utf-8"?>
diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index 885bc289..f22dfff2 100644
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -14,6 +14,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
+use Friendica\Model\Item;
 use Friendica\Model\Tag;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
@@ -85,17 +86,12 @@ function ijpost_settings_post(array &$b)
 
 function ijpost_post_local(array &$b)
 {
-	// This can probably be changed to allow editing by pointing to a different API endpoint
-
-	if ($b['edit']) {
-		return;
-	}
-
 	if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
 		return;
 	}
 
-	if ($b['private'] || $b['parent']) {
+	// This can probably be changed to allow editing by pointing to a different API endpoint
+	if ($b['edit'] || ($b['private'] == Item::PRIVATE) || ($b['gravity'] != Item::GRAVITY_PARENT)) {
 		return;
 	}
 
@@ -120,7 +116,7 @@ function ijpost_post_local(array &$b)
 
 function ijpost_send(array &$b)
 {
-	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
+	if ($b['deleted'] || ($b['private'] == Item::PRIVATE) || ($b['created'] !== $b['edited'])) {
 		return;
 	}
 
@@ -150,11 +146,11 @@ function ijpost_send(array &$b)
 		$tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]);
 
 		$date = DateTimeFormat::convert($b['created'], $tz);
-		$year = intval(substr($date,0,4));
-		$mon  = intval(substr($date,5,2));
-		$day  = intval(substr($date,8,2));
-		$hour = intval(substr($date,11,2));
-		$min  = intval(substr($date,14,2));
+		$year = intval(substr($date, 0, 4));
+		$mon  = intval(substr($date, 5, 2));
+		$day  = intval(substr($date, 8, 2));
+		$hour = intval(substr($date, 11, 2));
+		$min  = intval(substr($date, 14, 2));
 
 		$xml = <<< EOT
 <?xml version="1.0" encoding="utf-8"?>
diff --git a/libertree/libertree.php b/libertree/libertree.php
index f69c0aab..1d997123 100644
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -13,6 +13,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Item;
 use Friendica\Model\Post;
 
 function libertree_install()
@@ -74,13 +75,11 @@ function libertree_settings(array &$data)
 function libertree_settings_post(array &$b)
 {
 	if (!empty($_POST['libertree-submit'])) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(),'libertree','post',intval($_POST['libertree']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(),'libertree','post_by_default',intval($_POST['libertree_bydefault']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(),'libertree','libertree_api_token',trim($_POST['libertree_api_token']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(),'libertree','libertree_url',trim($_POST['libertree_url']));
-
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'libertree', 'post', intval($_POST['libertree']));
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'libertree', 'post_by_default', intval($_POST['libertree_bydefault']));
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'libertree', 'libertree_api_token', trim($_POST['libertree_api_token']));
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'libertree', 'libertree_url', trim($_POST['libertree_url']));
 	}
-
 }
 
 function libertree_hook_fork(array &$b)
@@ -91,8 +90,10 @@ function libertree_hook_fork(array &$b)
 
 	$post = $b['data'];
 
-	if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
-		!strstr($post['postopts'], 'libertree') || ($post['parent'] != $post['id'])) {
+	if (
+		$post['deleted'] || ($post['private'] == Item::PRIVATE) || ($post['created'] !== $post['edited']) ||
+		!strstr($post['postopts'], 'libertree') || ($post['gravity'] != Item::GRAVITY_PARENT)
+	) {
 		$b['execute'] = false;
 		return;
 	}
@@ -100,26 +101,20 @@ function libertree_hook_fork(array &$b)
 
 function libertree_post_local(array &$b)
 {
-
-	// This can probably be changed to allow editing by pointing to a different API endpoint
-
-	if ($b['edit']) {
-		return;
-	}
-
 	if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
 		return;
 	}
 
-	if ($b['private'] || $b['parent']) {
+	// This can probably be changed to allow editing by pointing to a different API endpoint
+	if ($b['edit'] || ($b['private'] == Item::PRIVATE) || ($b['gravity'] != Item::GRAVITY_PARENT)) {
 		return;
 	}
 
-	$ltree_post   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'libertree','post'));
+	$ltree_post   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'libertree', 'post'));
 
 	$ltree_enable = (($ltree_post && !empty($_REQUEST['libertree_enable'])) ? intval($_REQUEST['libertree_enable']) : 0);
 
-	if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'libertree','post_by_default'))) {
+	if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'libertree', 'post_by_default'))) {
 		$ltree_enable = 1;
 	}
 
@@ -138,11 +133,11 @@ function libertree_send(array &$b)
 {
 	Logger::notice('libertree_send: invoked');
 
-	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
+	if ($b['deleted'] || ($b['private'] == Item::PRIVATE) || ($b['created'] !== $b['edited'])) {
 		return;
 	}
 
-	if (! strstr($b['postopts'],'libertree')) {
+	if (! strstr($b['postopts'], 'libertree')) {
 		return;
 	}
 
@@ -159,15 +154,15 @@ function libertree_send(array &$b)
 
 	$b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b));
 
-	$ltree_api_token = DI::pConfig()->get($b['uid'],'libertree','libertree_api_token');
-	$ltree_url = DI::pConfig()->get($b['uid'],'libertree','libertree_url');
+	$ltree_api_token = DI::pConfig()->get($b['uid'], 'libertree', 'libertree_api_token');
+	$ltree_url = DI::pConfig()->get($b['uid'], 'libertree', 'libertree_url');
 	$ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token";
 	$ltree_source = DI::baseUrl()->getHost();
 
 	if ($b['app'] != "")
-		$ltree_source .= " (".$b['app'].")";
+		$ltree_source .= " (" . $b['app'] . ")";
 
-	if($ltree_url && $ltree_api_token && $ltree_blog && $ltree_source) {
+	if ($ltree_url && $ltree_api_token && $ltree_blog && $ltree_source) {
 		$title = $b['title'];
 		$body = $b['body'];
 		// Insert a newline before and after a quote
@@ -177,7 +172,7 @@ function libertree_send(array &$b)
 		// Removal of tags and mentions
 		// #-tags
 		$body = preg_replace('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $body);
- 		// @-mentions
+		// @-mentions
 		$body = preg_replace('/@\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '@$2', $body);
 
 		// remove multiple newlines
@@ -198,7 +193,7 @@ function libertree_send(array &$b)
 		$params = [
 			'text' => $body,
 			'source' => $ltree_source
-		//	'token' => $ltree_api_token
+			//	'token' => $ltree_api_token
 		];
 
 		$result = DI::httpClient()->post($ltree_blog, $params)->getBodyString();
diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index fac44767..7acc6589 100644
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -14,6 +14,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
+use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\Tag;
 use Friendica\Model\User;
@@ -35,7 +36,7 @@ function ljpost_jot_nets(array &$jotnets_fields)
 		return;
 	}
 
-	if (DI::pConfig()->get(DI::userSession()->getLocalUserId(),'ljpost','post')) {
+	if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'post')) {
 		$jotnets_fields[] = [
 			'type' => 'checkbox',
 			'field' => [
@@ -57,7 +58,7 @@ function ljpost_settings(array &$data)
 	$ij_username = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'ij_username');
 	$def_enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'post_by_default');
 
-	$t= Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/ljpost/');
+	$t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/ljpost/');
 	$html = Renderer::replaceMacros($t, [
 		'$enabled'   => ['ljpost', DI::l10n()->t('Enable LiveJournal Post Addon'), $enabled],
 		'$username'  => ['ij_username', DI::l10n()->t('LiveJournal username'), $ij_username],
@@ -86,20 +87,16 @@ function ljpost_settings_post(array &$b)
 
 function ljpost_post_local(array &$b)
 {
-	// This can probably be changed to allow editing by pointing to a different API endpoint
-	if ($b['edit']) {
-		return;
-	}
-
 	if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
 		return;
 	}
 
-	if ($b['private'] || $b['parent']) {
+	// This can probably be changed to allow editing by pointing to a different API endpoint
+	if ($b['edit'] || ($b['private'] == Item::PRIVATE) || ($b['gravity'] != Item::GRAVITY_PARENT)) {
 		return;
 	}
 
-	$lj_post   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'ljpost','post'));
+	$lj_post   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'post'));
 	$lj_enable = (($lj_post && !empty($_REQUEST['ljpost_enable'])) ? intval($_REQUEST['ljpost_enable']) : 0);
 
 	if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'post_by_default'))) {
@@ -118,11 +115,11 @@ function ljpost_post_local(array &$b)
 
 function ljpost_send(array &$b)
 {
-	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
+	if ($b['deleted'] || ($b['private'] == Item::PRIVATE) || ($b['created'] !== $b['edited'])) {
 		return;
 	}
 
-	if (!strstr($b['postopts'],'ljpost')) {
+	if (!strstr($b['postopts'], 'ljpost')) {
 		return;
 	}
 
@@ -139,13 +136,13 @@ function ljpost_send(array &$b)
 	$user = User::getById($b['uid']);
 	$tz = $user['timezone'] ?: 'UTC';
 
-	$lj_username = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_username'));
-	$lj_password = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_password'));
-	$lj_journal = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_journal'));
-//	if(! $lj_journal)
-//		$lj_journal = $lj_username;
+	$lj_username = XML::escape(DI::pConfig()->get($b['uid'], 'ljpost', 'lj_username'));
+	$lj_password = XML::escape(DI::pConfig()->get($b['uid'], 'ljpost', 'lj_password'));
+	$lj_journal = XML::escape(DI::pConfig()->get($b['uid'], 'ljpost', 'lj_journal'));
+	//	if(! $lj_journal)
+	//		$lj_journal = $lj_username;
 
-	$lj_blog = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_blog'));
+	$lj_blog = XML::escape(DI::pConfig()->get($b['uid'], 'ljpost', 'lj_blog'));
 	if (!strlen($lj_blog)) {
 		$lj_blog = XML::escape('http://www.livejournal.com/interface/xmlrpc');
 	}
@@ -157,11 +154,11 @@ function ljpost_send(array &$b)
 		$tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]);
 
 		$date = DateTimeFormat::convert($b['created'], $tz);
-		$year = intval(substr($date,0,4));
-		$mon  = intval(substr($date,5,2));
-		$day  = intval(substr($date,8,2));
-		$hour = intval(substr($date,11,2));
-		$min  = intval(substr($date,14,2));
+		$year = intval(substr($date, 0, 4));
+		$mon  = intval(substr($date, 5, 2));
+		$day  = intval(substr($date, 8, 2));
+		$hour = intval(substr($date, 11, 2));
+		$min  = intval(substr($date, 14, 2));
 
 		$xml = <<< EOT
 <?xml version="1.0" encoding="utf-8"?>
diff --git a/pnut/pnut.php b/pnut/pnut.php
index e84f208b..32f60f6d 100644
--- a/pnut/pnut.php
+++ b/pnut/pnut.php
@@ -18,6 +18,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\DI;
+use Friendica\Model\Item;
 use Friendica\Model\Photo;
 use phpnut\phpnutException;
 
@@ -82,7 +83,7 @@ function pnut_connect()
 		$o = DI::l10n()->t('Error fetching token. Please try again.', ['code' => $e->getCode(), 'message' => $e->getMessage()]);
 	}
 
-	$o .= '<br /><a href="' . DI::baseUrl() . '/settings/connectors">' . DI::l10n()->t("return to the connector page").'</a>';
+	$o .= '<br /><a href="' . DI::baseUrl() . '/settings/connectors">' . DI::l10n()->t("return to the connector page") . '</a>';
 
 	return $o;
 }
@@ -119,14 +120,14 @@ function pnut_settings(array &$data)
 	}
 
 	$redirectUri  = DI::baseUrl() . '/pnut/connect';
-	$scope        = ['write_post','files'];
+	$scope        = ['write_post', 'files'];
 
 	$enabled       = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post') ?? false;
 	$def_enabled   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post_by_default') ?? false;
 	$client_id     = DI::config()->get('pnut', 'client_id');
 	$client_secret = DI::config()->get('pnut', 'client_secret');
 	$token         = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'access_token');
-	
+
 	$user_client = empty($client_id) || empty($client_secret);
 	if ($user_client) {
 		$client_id     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'client_id');
@@ -221,7 +222,7 @@ function pnut_hook_fork(array &$b)
 		return;
 	}
 
-	if (!strstr($post['postopts'] ?? '', 'pnut') || ($post['parent'] != $post['id']) || $post['private']) {
+	if (!strstr($post['postopts'] ?? '', 'pnut') || ($post['gravity'] != Item::GRAVITY_PARENT) || ($post['private'] == Item::PRIVATE)) {
 		$b['execute'] = false;
 		return;
 	}
@@ -229,15 +230,11 @@ function pnut_hook_fork(array &$b)
 
 function pnut_post_local(array &$b)
 {
-	if ($b['edit']) {
-		return;
-	}
-
 	if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
 		return;
 	}
 
-	if ($b['private'] || $b['parent']) {
+	if ($b['edit'] || ($b['private'] == Item::PRIVATE) || ($b['gravity'] != Item::GRAVITY_PARENT)) {
 		return;
 	}
 
@@ -265,7 +262,7 @@ function pnut_post_hook(array &$b)
 	/**
 	 * Post to pnut.io
 	 */
-	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
+	if ($b['deleted'] || ($b['private'] == Item::PRIVATE) || ($b['created'] !== $b['edited'])) {
 		return;
 	}
 
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 6600696e..2a8a530e 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -345,14 +345,14 @@ function pumpio_hook_fork(array &$b)
 
 	if (DI::pConfig()->get($post['uid'], 'pumpio', 'import')) {
 		// Don't fork if it isn't a reply to a pump.io post
-		if (($post['parent'] != $post['id']) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::PUMPIO])) {
+		if (($post['gravity'] != Item::GRAVITY_PARENT) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::PUMPIO])) {
 			Logger::notice('No pump.io parent found for item ' . $post['id']);
 			$b['execute'] = false;
 			return;
 		}
 	} else {
 		// Comments are never exported when we don't import the pumpio timeline
-		if (!strstr($post['postopts'], 'pumpio') || ($post['parent'] != $post['id']) || $post['private']) {
+		if (!strstr($post['postopts'], 'pumpio') || ($post['gravity'] != Item::GRAVITY_PARENT)|| ($post['private'] == Item::PRIVATE)) {
 			$b['execute'] = false;
 			return;
 		}
@@ -412,7 +412,7 @@ function pumpio_send(array &$b)
 
 		Logger::notice('pumpio_send: receiver ', $receiver);
 
-		if (!count($receiver) && ($b['private'] || !strstr($b['postopts'], 'pumpio'))) {
+		if (!count($receiver) && ($b['private'] == Item::PRIVATE) || !strstr($b['postopts'], 'pumpio'))) {
 			return;
 		}
 
@@ -1319,7 +1319,7 @@ function pumpio_getreceiver(array $b)
 {
 	$receiver = [];
 
-	if (!$b['private']) {
+	if ($b['private'] != Item::PRIVATE)) {
 		if (!strstr($b['postopts'], 'pumpio')) {
 			return $receiver;
 		}
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index f0372852..4bc32050 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -296,7 +296,7 @@ function statusnet_hook_fork(array &$b)
 
 	$post = $b['data'];
 
-	if ($post['deleted'] || ($post['created'] !== $post['edited']) || strpos($post['postopts'] ?? '', 'statusnet') === false || ($post['parent'] != $post['id']) || $post['private']) {
+	if ($post['deleted'] || ($post['created'] !== $post['edited']) || strpos($post['postopts'] ?? '', 'statusnet') === false || ($post['gravity'] != Item::GRAVITY_PARENT) || ($post['private'] == Item::PRIVATE)) {
 		$b['execute'] = false;
 		return;
 	}
@@ -336,7 +336,7 @@ function statusnet_post_hook(array &$b)
 	/**
 	 * Post to GNU Social
 	 */
-	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
+	if ($b['deleted'] || ($b['private'] == Item::PRIVATE) || ($b['created'] !== $b['edited'])) {
 		return;
 	}
 
@@ -439,11 +439,13 @@ function statusnet_addon_admin_post()
 		$secret = trim($_POST['secret'][$id]);
 		$key = trim($_POST['key'][$id]);
 		//$applicationname = (!empty($_POST['applicationname']) ? Strings::escapeTags(trim($_POST['applicationname'][$id])):'');
-		if ($sitename != '' &&
+		if (
+			$sitename != '' &&
 			$apiurl != '' &&
 			$secret != '' &&
 			$key != '' &&
-			empty($_POST['delete'][$id])) {
+			empty($_POST['delete'][$id])
+		) {
 
 			$sites[] = [
 				'sitename' => $sitename,
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 390c3c6c..1e9f5c7f 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -477,13 +477,13 @@ function tumblr_hook_fork(array &$b)
 
 	if (DI::pConfig()->get($post['uid'], 'tumblr', 'import')) {
 		// Don't post if it isn't a reply to a tumblr post
-		if (($post['parent'] != $post['id']) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::TUMBLR])) {
+		if (($post['gravity'] != Item::GRAVITY_PARENT) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::TUMBLR])) {
 			Logger::notice('No tumblr parent found', ['item' => $post['id']]);
 			$b['execute'] = false;
 			return;
 		}
-	} elseif (!strstr($post['postopts'] ?? '', 'tumblr') || ($post['parent'] != $post['id']) || $post['private']) {
-		DI::logger()->info('Activities are never exported when we don\'t import the tumblr timeline', ['uid' => $post['uid']]);
+	} elseif (!strstr($post['postopts'] ?? '', 'tumblr') || ($post['gravity'] != Item::GRAVITY_PARENT) || ($post['private'] == Item::PRIVATE)) {
+		DI::logger()->info('Post will not be exported', ['uid' => $post['uid'], 'postopts' => $post['postopts'], 'gravity' => $post['gravity'], 'private' => $post['private']]);
 		$b['execute'] = false;
 		return;
 	}
@@ -491,15 +491,11 @@ function tumblr_hook_fork(array &$b)
 
 function tumblr_post_local(array &$b)
 {
-	if ($b['edit']) {
-		return;
-	}
-
 	if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
 		return;
 	}
 
-	if ($b['private'] || $b['parent']) {
+	if ($b['edit'] || ($b['private'] == Item::PRIVATE) || ($b['gravity'] != Item::GRAVITY_PARENT)) {
 		return;
 	}
 
@@ -575,7 +571,7 @@ function tumblr_send(array &$b)
 			}
 		}
 		return;
-	} elseif ($b['private'] || !strstr($b['postopts'], 'tumblr')) {
+	} elseif (($b['private'] == Item::PRIVATE) || !strstr($b['postopts'], 'tumblr')) {
 		return;
 	}
 
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 11c163ef..10f8a2fb 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -170,7 +170,7 @@ function twitter_hook_fork(array &$b)
 	$post = $b['data'];
 
 	if (
-		$post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
+		$post['deleted'] || ($post['private'] == Item::PRIVATE) || ($post['created'] !== $post['edited']) ||
 		!strstr($post['postopts'], 'twitter') || ($post['gravity'] != Item::GRAVITY_PARENT)
 	) {
 		$b['execute'] = false;
@@ -184,7 +184,7 @@ function twitter_post_local(array &$b)
 		return;
 	}
 
-	if ($b['edit'] || $b['private'] || $b['parent']) {
+	if ($b['edit'] || ($b['private'] == Item::PRIVATE) || ($b['gravity'] != Item::GRAVITY_PARENT)) {
 		return;
 	}
 
@@ -211,7 +211,7 @@ function twitter_post_hook(array &$b)
 {
 	DI::logger()->debug('Invoke post hook', $b);
 
-	if (($b['gravity'] != Item::GRAVITY_PARENT) || !strstr($b['postopts'], 'twitter') || $b['private'] || $b['deleted'] || ($b['created'] !== $b['edited'])) {
+	if (($b['gravity'] != Item::GRAVITY_PARENT) || !strstr($b['postopts'], 'twitter') || ($b['private'] == Item::PRIVATE) || $b['deleted'] || ($b['created'] !== $b['edited'])) {
 		return;
 	}
 
diff --git a/wppost/wppost.php b/wppost/wppost.php
index e27079aa..dba738de 100644
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -108,8 +108,8 @@ function wppost_hook_fork(array &$b)
 	$post = $b['data'];
 
 	if (
-		$post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
-		!strstr($post['postopts'] ?? '', 'wppost') || ($post['parent'] != $post['id'])
+		$post['deleted'] || ($post['private'] == Item::PRIVATE) || ($post['created'] !== $post['edited']) ||
+		!strstr($post['postopts'] ?? '', 'wppost') || ($post['gravity'] != Item::GRAVITY_PARENT)
 	) {
 		$b['execute'] = false;
 		return;
@@ -118,18 +118,12 @@ function wppost_hook_fork(array &$b)
 
 function wppost_post_local(array &$b)
 {
-
-	// This can probably be changed to allow editing by pointing to a different API endpoint
-
-	if ($b['edit']) {
-		return;
-	}
-
 	if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
 		return;
 	}
 
-	if ($b['private'] || $b['parent']) {
+	// This can probably be changed to allow editing by pointing to a different API endpoint
+	if ($b['edit'] || ($b['private'] == Item::PRIVATE) || ($b['gravity'] != Item::GRAVITY_PARENT)) {
 		return;
 	}
 
@@ -152,12 +146,9 @@ function wppost_post_local(array &$b)
 	$b['postopts'] .= 'wppost';
 }
 
-
-
-
 function wppost_send(array &$b)
 {
-	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
+	if ($b['deleted'] || ($b['private'] == Item::PRIVATE) || ($b['created'] !== $b['edited'])) {
 		return;
 	}
 

From aa5130247b27093fbca5fa1126b857c83446eb14 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 16 Nov 2024 21:19:06 -0500
Subject: [PATCH 124/294] [pumpio] Remove two superfluous parentheses

- Thanks to @SteffenK9 for the report!
---
 pumpio/pumpio.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 2a8a530e..5e053d7c 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -412,7 +412,7 @@ function pumpio_send(array &$b)
 
 		Logger::notice('pumpio_send: receiver ', $receiver);
 
-		if (!count($receiver) && ($b['private'] == Item::PRIVATE) || !strstr($b['postopts'], 'pumpio'))) {
+		if (!count($receiver) && ($b['private'] == Item::PRIVATE) || !strstr($b['postopts'], 'pumpio')) {
 			return;
 		}
 
@@ -1319,7 +1319,7 @@ function pumpio_getreceiver(array $b)
 {
 	$receiver = [];
 
-	if ($b['private'] != Item::PRIVATE)) {
+	if ($b['private'] != Item::PRIVATE) {
 		if (!strstr($b['postopts'], 'pumpio')) {
 			return $receiver;
 		}

From a0c727ac35d3dadb3be077527af97612656c674f Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <ben.lort@gmail.com>
Date: Sun, 17 Nov 2024 13:23:16 +0000
Subject: [PATCH 125/294] [advancedcontentfilter] Remove unused vendor files

Thanks to @Art4 for the initial submission in https://github.com/friendica/friendica-addons/pull/1363
---
 advancedcontentfilter/vendor/autoload.php     |   18 +
 .../vendor/composer/ClassLoader.php           |  202 +-
 .../vendor/composer/InstalledVersions.php     |  359 +++
 .../vendor/composer/autoload_classmap.php     |    6 +-
 .../vendor/composer/autoload_files.php        |    2 +-
 .../vendor/composer/autoload_namespaces.php   |    2 +-
 .../vendor/composer/autoload_psr4.php         |    4 +-
 .../vendor/composer/autoload_real.php         |   53 +-
 .../vendor/composer/autoload_static.php       |    8 +-
 .../vendor/composer/installed.json            | 2354 +++++++++--------
 .../vendor/composer/installed.php             |  203 ++
 .../vendor/composer/platform_check.php        |   26 +
 .../vendor/psr/simple-cache/.editorconfig     |   12 -
 .../vendor/psr/simple-cache/LICENSE.md        |   21 -
 .../vendor/psr/simple-cache/README.md         |    8 -
 .../vendor/psr/simple-cache/composer.json     |   25 -
 .../psr/simple-cache/src/CacheException.php   |   10 -
 .../psr/simple-cache/src/CacheInterface.php   |  114 -
 .../src/InvalidArgumentException.php          |   13 -
 .../vendor/symfony/cache/.gitignore           |    3 -
 .../Adapter/AbstractRedisAdapterTest.php      |   47 -
 .../cache/Tests/Adapter/AdapterTestCase.php   |  175 --
 .../cache/Tests/Adapter/ApcuAdapterTest.php   |  124 -
 .../cache/Tests/Adapter/ArrayAdapterTest.php  |   56 -
 .../cache/Tests/Adapter/ChainAdapterTest.php  |  233 --
 .../Tests/Adapter/DoctrineAdapterTest.php     |   32 -
 .../Tests/Adapter/FilesystemAdapterTest.php   |   61 -
 .../Tests/Adapter/MaxIdLengthAdapterTest.php  |   87 -
 .../Tests/Adapter/MemcachedAdapterTest.php    |  204 --
 .../Adapter/NamespacedProxyAdapterTest.php    |   26 -
 .../cache/Tests/Adapter/NullAdapterTest.php   |  128 -
 .../cache/Tests/Adapter/PdoAdapterTest.php    |   73 -
 .../Tests/Adapter/PdoDbalAdapterTest.php      |   48 -
 .../Tests/Adapter/PhpArrayAdapterTest.php     |  135 -
 .../PhpArrayAdapterWithFallbackTest.php       |   51 -
 .../Tests/Adapter/PhpFilesAdapterTest.php     |   47 -
 .../cache/Tests/Adapter/PredisAdapterTest.php |   53 -
 .../Adapter/PredisClusterAdapterTest.php      |   26 -
 .../Adapter/PredisRedisClusterAdapterTest.php |   28 -
 .../cache/Tests/Adapter/ProxyAdapterTest.php  |   69 -
 .../cache/Tests/Adapter/RedisAdapterTest.php  |   92 -
 .../Tests/Adapter/RedisArrayAdapterTest.php   |   24 -
 .../Tests/Adapter/RedisClusterAdapterTest.php |   27 -
 .../Tests/Adapter/SimpleCacheAdapterTest.php  |   41 -
 .../Tests/Adapter/TagAwareAdapterTest.php     |  338 ---
 ...TagAwareAndProxyAdapterIntegrationTest.php |   38 -
 .../Tests/Adapter/TraceableAdapterTest.php    |  191 --
 .../Adapter/TraceableTagAwareAdapterTest.php  |   37 -
 .../symfony/cache/Tests/CacheItemTest.php     |   77 -
 .../cache/Tests/DoctrineProviderTest.php      |   45 -
 .../cache/Tests/Fixtures/ArrayCache.php       |   52 -
 .../cache/Tests/Fixtures/ExternalAdapter.php  |   76 -
 .../Tests/Simple/AbstractRedisCacheTest.php   |   47 -
 .../cache/Tests/Simple/ApcuCacheTest.php      |   35 -
 .../cache/Tests/Simple/ArrayCacheTest.php     |   25 -
 .../cache/Tests/Simple/CacheTestCase.php      |  150 --
 .../cache/Tests/Simple/ChainCacheTest.php     |  113 -
 .../cache/Tests/Simple/DoctrineCacheTest.php  |   31 -
 .../Tests/Simple/FilesystemCacheTest.php      |   34 -
 .../cache/Tests/Simple/MemcachedCacheTest.php |  178 --
 .../Simple/MemcachedCacheTextModeTest.php     |   25 -
 .../cache/Tests/Simple/NullCacheTest.php      |   96 -
 .../cache/Tests/Simple/PdoCacheTest.php       |   47 -
 .../cache/Tests/Simple/PdoDbalCacheTest.php   |   48 -
 .../cache/Tests/Simple/PhpArrayCacheTest.php  |  145 -
 .../Simple/PhpArrayCacheWithFallbackTest.php  |   57 -
 .../cache/Tests/Simple/PhpFilesCacheTest.php  |   42 -
 .../cache/Tests/Simple/Psr6CacheTest.php      |   30 -
 .../Tests/Simple/RedisArrayCacheTest.php      |   24 -
 .../cache/Tests/Simple/RedisCacheTest.php     |   82 -
 .../Tests/Simple/RedisClusterCacheTest.php    |   27 -
 .../cache/Tests/Simple/TraceableCacheTest.php |  171 --
 .../cache/Tests/Traits/PdoPruneableTrait.php  |   34 -
 .../vendor/symfony/cache/phpunit.xml.dist     |   50 -
 .../vendor/symfony/polyfill-apcu/Apcu.php     |  106 -
 .../vendor/symfony/polyfill-apcu/LICENSE      |   19 -
 .../vendor/symfony/polyfill-apcu/README.md    |   12 -
 .../symfony/polyfill-apcu/bootstrap.php       |   83 -
 .../symfony/polyfill-apcu/bootstrap80.php     |   75 -
 .../symfony/polyfill-apcu/composer.json       |   35 -
 80 files changed, 1986 insertions(+), 6019 deletions(-)
 create mode 100644 advancedcontentfilter/vendor/composer/InstalledVersions.php
 create mode 100644 advancedcontentfilter/vendor/composer/installed.php
 create mode 100644 advancedcontentfilter/vendor/composer/platform_check.php
 delete mode 100644 advancedcontentfilter/vendor/psr/simple-cache/.editorconfig
 delete mode 100644 advancedcontentfilter/vendor/psr/simple-cache/LICENSE.md
 delete mode 100644 advancedcontentfilter/vendor/psr/simple-cache/README.md
 delete mode 100644 advancedcontentfilter/vendor/psr/simple-cache/composer.json
 delete mode 100644 advancedcontentfilter/vendor/psr/simple-cache/src/CacheException.php
 delete mode 100644 advancedcontentfilter/vendor/psr/simple-cache/src/CacheInterface.php
 delete mode 100644 advancedcontentfilter/vendor/psr/simple-cache/src/InvalidArgumentException.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/.gitignore
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/AbstractRedisAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/AdapterTestCase.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ApcuAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ArrayAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ChainAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/DoctrineAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/FilesystemAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/MaxIdLengthAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/MemcachedAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/NamespacedProxyAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/NullAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PdoAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PdoDbalAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpFilesAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisClusterAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisRedisClusterAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ProxyAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisArrayAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisClusterAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/SimpleCacheAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TagAwareAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TagAwareAndProxyAdapterIntegrationTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TraceableAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TraceableTagAwareAdapterTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/CacheItemTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/DoctrineProviderTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Fixtures/ArrayCache.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Fixtures/ExternalAdapter.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Simple/AbstractRedisCacheTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ApcuCacheTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ArrayCacheTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Simple/CacheTestCase.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ChainCacheTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Simple/DoctrineCacheTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Simple/FilesystemCacheTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Simple/MemcachedCacheTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Simple/MemcachedCacheTextModeTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Simple/NullCacheTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PdoCacheTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PdoDbalCacheTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpArrayCacheTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpFilesCacheTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Simple/Psr6CacheTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisArrayCacheTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisCacheTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisClusterCacheTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Simple/TraceableCacheTest.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/Tests/Traits/PdoPruneableTrait.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/cache/phpunit.xml.dist
 delete mode 100644 advancedcontentfilter/vendor/symfony/polyfill-apcu/Apcu.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/polyfill-apcu/LICENSE
 delete mode 100644 advancedcontentfilter/vendor/symfony/polyfill-apcu/README.md
 delete mode 100644 advancedcontentfilter/vendor/symfony/polyfill-apcu/bootstrap.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/polyfill-apcu/bootstrap80.php
 delete mode 100644 advancedcontentfilter/vendor/symfony/polyfill-apcu/composer.json

diff --git a/advancedcontentfilter/vendor/autoload.php b/advancedcontentfilter/vendor/autoload.php
index 3e6193fa..2d273a02 100644
--- a/advancedcontentfilter/vendor/autoload.php
+++ b/advancedcontentfilter/vendor/autoload.php
@@ -2,6 +2,24 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, $err);
+        } elseif (!headers_sent()) {
+            echo $err;
+        }
+    }
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitAdvancedContentFilterAddon::getLoader();
diff --git a/advancedcontentfilter/vendor/composer/ClassLoader.php b/advancedcontentfilter/vendor/composer/ClassLoader.php
index 03b9bb9c..7824d8f7 100644
--- a/advancedcontentfilter/vendor/composer/ClassLoader.php
+++ b/advancedcontentfilter/vendor/composer/ClassLoader.php
@@ -37,26 +37,81 @@ namespace Composer\Autoload;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    http://www.php-fig.org/psr/psr-0/
- * @see    http://www.php-fig.org/psr/psr-4/
+ * @see    https://www.php-fig.org/psr/psr-0/
+ * @see    https://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {
+    /** @var \Closure(string):void */
+    private static $includeFile;
+
+    /** @var string|null */
+    private $vendorDir;
+
     // PSR-4
+    /**
+     * @var array<string, array<string, int>>
+     */
     private $prefixLengthsPsr4 = array();
+    /**
+     * @var array<string, list<string>>
+     */
     private $prefixDirsPsr4 = array();
+    /**
+     * @var list<string>
+     */
     private $fallbackDirsPsr4 = array();
 
     // PSR-0
+    /**
+     * List of PSR-0 prefixes
+     *
+     * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2')))
+     *
+     * @var array<string, array<string, list<string>>>
+     */
     private $prefixesPsr0 = array();
+    /**
+     * @var list<string>
+     */
     private $fallbackDirsPsr0 = array();
 
+    /** @var bool */
     private $useIncludePath = false;
+
+    /**
+     * @var array<string, string>
+     */
     private $classMap = array();
+
+    /** @var bool */
     private $classMapAuthoritative = false;
+
+    /**
+     * @var array<string, bool>
+     */
     private $missingClasses = array();
+
+    /** @var string|null */
     private $apcuPrefix;
 
+    /**
+     * @var array<string, self>
+     */
+    private static $registeredLoaders = array();
+
+    /**
+     * @param string|null $vendorDir
+     */
+    public function __construct($vendorDir = null)
+    {
+        $this->vendorDir = $vendorDir;
+        self::initializeIncludeClosure();
+    }
+
+    /**
+     * @return array<string, list<string>>
+     */
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
@@ -66,28 +121,42 @@ class ClassLoader
         return array();
     }
 
+    /**
+     * @return array<string, list<string>>
+     */
     public function getPrefixesPsr4()
     {
         return $this->prefixDirsPsr4;
     }
 
+    /**
+     * @return list<string>
+     */
     public function getFallbackDirs()
     {
         return $this->fallbackDirsPsr0;
     }
 
+    /**
+     * @return list<string>
+     */
     public function getFallbackDirsPsr4()
     {
         return $this->fallbackDirsPsr4;
     }
 
+    /**
+     * @return array<string, string> Array of classname => path
+     */
     public function getClassMap()
     {
         return $this->classMap;
     }
 
     /**
-     * @param array $classMap Class to filename map
+     * @param array<string, string> $classMap Class to filename map
+     *
+     * @return void
      */
     public function addClassMap(array $classMap)
     {
@@ -102,22 +171,25 @@ class ClassLoader
      * Registers a set of PSR-0 directories for a given prefix, either
      * appending or prepending to the ones previously set for this prefix.
      *
-     * @param string       $prefix  The prefix
-     * @param array|string $paths   The PSR-0 root directories
-     * @param bool         $prepend Whether to prepend the directories
+     * @param string              $prefix  The prefix
+     * @param list<string>|string $paths   The PSR-0 root directories
+     * @param bool                $prepend Whether to prepend the directories
+     *
+     * @return void
      */
     public function add($prefix, $paths, $prepend = false)
     {
+        $paths = (array) $paths;
         if (!$prefix) {
             if ($prepend) {
                 $this->fallbackDirsPsr0 = array_merge(
-                    (array) $paths,
+                    $paths,
                     $this->fallbackDirsPsr0
                 );
             } else {
                 $this->fallbackDirsPsr0 = array_merge(
                     $this->fallbackDirsPsr0,
-                    (array) $paths
+                    $paths
                 );
             }
 
@@ -126,19 +198,19 @@ class ClassLoader
 
         $first = $prefix[0];
         if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+            $this->prefixesPsr0[$first][$prefix] = $paths;
 
             return;
         }
         if ($prepend) {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
-                (array) $paths,
+                $paths,
                 $this->prefixesPsr0[$first][$prefix]
             );
         } else {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
                 $this->prefixesPsr0[$first][$prefix],
-                (array) $paths
+                $paths
             );
         }
     }
@@ -147,25 +219,28 @@ class ClassLoader
      * Registers a set of PSR-4 directories for a given namespace, either
      * appending or prepending to the ones previously set for this namespace.
      *
-     * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-4 base directories
-     * @param bool         $prepend Whether to prepend the directories
+     * @param string              $prefix  The prefix/namespace, with trailing '\\'
+     * @param list<string>|string $paths   The PSR-4 base directories
+     * @param bool                $prepend Whether to prepend the directories
      *
      * @throws \InvalidArgumentException
+     *
+     * @return void
      */
     public function addPsr4($prefix, $paths, $prepend = false)
     {
+        $paths = (array) $paths;
         if (!$prefix) {
             // Register directories for the root namespace.
             if ($prepend) {
                 $this->fallbackDirsPsr4 = array_merge(
-                    (array) $paths,
+                    $paths,
                     $this->fallbackDirsPsr4
                 );
             } else {
                 $this->fallbackDirsPsr4 = array_merge(
                     $this->fallbackDirsPsr4,
-                    (array) $paths
+                    $paths
                 );
             }
         } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
@@ -175,18 +250,18 @@ class ClassLoader
                 throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
             }
             $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+            $this->prefixDirsPsr4[$prefix] = $paths;
         } elseif ($prepend) {
             // Prepend directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
-                (array) $paths,
+                $paths,
                 $this->prefixDirsPsr4[$prefix]
             );
         } else {
             // Append directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
                 $this->prefixDirsPsr4[$prefix],
-                (array) $paths
+                $paths
             );
         }
     }
@@ -195,8 +270,10 @@ class ClassLoader
      * Registers a set of PSR-0 directories for a given prefix,
      * replacing any others previously set for this prefix.
      *
-     * @param string       $prefix The prefix
-     * @param array|string $paths  The PSR-0 base directories
+     * @param string              $prefix The prefix
+     * @param list<string>|string $paths  The PSR-0 base directories
+     *
+     * @return void
      */
     public function set($prefix, $paths)
     {
@@ -211,10 +288,12 @@ class ClassLoader
      * Registers a set of PSR-4 directories for a given namespace,
      * replacing any others previously set for this namespace.
      *
-     * @param string       $prefix The prefix/namespace, with trailing '\\'
-     * @param array|string $paths  The PSR-4 base directories
+     * @param string              $prefix The prefix/namespace, with trailing '\\'
+     * @param list<string>|string $paths  The PSR-4 base directories
      *
      * @throws \InvalidArgumentException
+     *
+     * @return void
      */
     public function setPsr4($prefix, $paths)
     {
@@ -234,6 +313,8 @@ class ClassLoader
      * Turns on searching the include path for class files.
      *
      * @param bool $useIncludePath
+     *
+     * @return void
      */
     public function setUseIncludePath($useIncludePath)
     {
@@ -256,6 +337,8 @@ class ClassLoader
      * that have not been registered with the class map.
      *
      * @param bool $classMapAuthoritative
+     *
+     * @return void
      */
     public function setClassMapAuthoritative($classMapAuthoritative)
     {
@@ -276,6 +359,8 @@ class ClassLoader
      * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
      *
      * @param string|null $apcuPrefix
+     *
+     * @return void
      */
     public function setApcuPrefix($apcuPrefix)
     {
@@ -296,33 +381,55 @@ class ClassLoader
      * Registers this instance as an autoloader.
      *
      * @param bool $prepend Whether to prepend the autoloader or not
+     *
+     * @return void
      */
     public function register($prepend = false)
     {
         spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+
+        if (null === $this->vendorDir) {
+            return;
+        }
+
+        if ($prepend) {
+            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
+        } else {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+            self::$registeredLoaders[$this->vendorDir] = $this;
+        }
     }
 
     /**
      * Unregisters this instance as an autoloader.
+     *
+     * @return void
      */
     public function unregister()
     {
         spl_autoload_unregister(array($this, 'loadClass'));
+
+        if (null !== $this->vendorDir) {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+        }
     }
 
     /**
      * Loads the given class or interface.
      *
      * @param  string    $class The name of the class
-     * @return bool|null True if loaded, null otherwise
+     * @return true|null True if loaded, null otherwise
      */
     public function loadClass($class)
     {
         if ($file = $this->findFile($class)) {
-            includeFile($file);
+            $includeFile = self::$includeFile;
+            $includeFile($file);
 
             return true;
         }
+
+        return null;
     }
 
     /**
@@ -367,6 +474,21 @@ class ClassLoader
         return $file;
     }
 
+    /**
+     * Returns the currently registered loaders keyed by their corresponding vendor directories.
+     *
+     * @return array<string, self>
+     */
+    public static function getRegisteredLoaders()
+    {
+        return self::$registeredLoaders;
+    }
+
+    /**
+     * @param  string       $class
+     * @param  string       $ext
+     * @return string|false
+     */
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
@@ -432,14 +554,26 @@ class ClassLoader
 
         return false;
     }
-}
 
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- */
-function includeFile($file)
-{
-    include $file;
+    /**
+     * @return void
+     */
+    private static function initializeIncludeClosure()
+    {
+        if (self::$includeFile !== null) {
+            return;
+        }
+
+        /**
+         * Scope isolated include.
+         *
+         * Prevents access to $this/self from included files.
+         *
+         * @param  string $file
+         * @return void
+         */
+        self::$includeFile = \Closure::bind(static function($file) {
+            include $file;
+        }, null, null);
+    }
 }
diff --git a/advancedcontentfilter/vendor/composer/InstalledVersions.php b/advancedcontentfilter/vendor/composer/InstalledVersions.php
new file mode 100644
index 00000000..51e734a7
--- /dev/null
+++ b/advancedcontentfilter/vendor/composer/InstalledVersions.php
@@ -0,0 +1,359 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * 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
+ *
+ * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
+ *
+ * To require its presence, you can require `composer-runtime-api ^2.0`
+ *
+ * @final
+ */
+class InstalledVersions
+{
+    /**
+     * @var mixed[]|null
+     * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
+     */
+    private static $installed;
+
+    /**
+     * @var bool|null
+     */
+    private static $canGetVendors;
+
+    /**
+     * @var array[]
+     * @psalm-var array<string, array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     */
+    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)));
+    }
+
+    /**
+     * Returns a list of all package names with a specific type e.g. 'library'
+     *
+     * @param  string   $type
+     * @return string[]
+     * @psalm-return list<string>
+     */
+    public static function getInstalledPackagesByType($type)
+    {
+        $packagesByType = array();
+
+        foreach (self::getInstalled() as $installed) {
+            foreach ($installed['versions'] as $name => $package) {
+                if (isset($package['type']) && $package['type'] === $type) {
+                    $packagesByType[] = $name;
+                }
+            }
+        }
+
+        return $packagesByType;
+    }
+
+    /**
+     * 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
+     * @param  bool   $includeDevRequirements
+     * @return bool
+     */
+    public static function isInstalled($packageName, $includeDevRequirements = true)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (isset($installed['versions'][$packageName])) {
+                return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
+            }
+        }
+
+        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((string) $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');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path.
+     */
+    public static function getInstallPath($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null;
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @return array
+     * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
+     */
+    public static function getRootPackage()
+    {
+        $installed = self::getInstalled();
+
+        return $installed[0]['root'];
+    }
+
+    /**
+     * Returns the raw installed.php data for custom implementations
+     *
+     * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
+     * @return array[]
+     * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}
+     */
+    public static function getRawData()
+    {
+        @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED);
+
+        if (null === self::$installed) {
+            // only require the installed.php file if this file is loaded from its dumped location,
+            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+            if (substr(__DIR__, -8, 1) !== 'C') {
+                self::$installed = include __DIR__ . '/installed.php';
+            } else {
+                self::$installed = array();
+            }
+        }
+
+        return self::$installed;
+    }
+
+    /**
+     * Returns the raw data of all installed.php which are currently loaded for custom implementations
+     *
+     * @return array[]
+     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     */
+    public static function getAllRawData()
+    {
+        return self::getInstalled();
+    }
+
+    /**
+     * 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, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $data
+     */
+    public static function reload($data)
+    {
+        self::$installed = $data;
+        self::$installedByVendor = array();
+    }
+
+    /**
+     * @return array[]
+     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     */
+    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')) {
+                    /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                    $required = require $vendorDir.'/composer/installed.php';
+                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
+                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
+                        self::$installed = $installed[count($installed) - 1];
+                    }
+                }
+            }
+        }
+
+        if (null === self::$installed) {
+            // only require the installed.php file if this file is loaded from its dumped location,
+            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+            if (substr(__DIR__, -8, 1) !== 'C') {
+                /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                $required = require __DIR__ . '/installed.php';
+                self::$installed = $required;
+            } else {
+                self::$installed = array();
+            }
+        }
+
+        if (self::$installed !== array()) {
+            $installed[] = self::$installed;
+        }
+
+        return $installed;
+    }
+}
diff --git a/advancedcontentfilter/vendor/composer/autoload_classmap.php b/advancedcontentfilter/vendor/composer/autoload_classmap.php
index 9f79be5c..fe2a622a 100644
--- a/advancedcontentfilter/vendor/composer/autoload_classmap.php
+++ b/advancedcontentfilter/vendor/composer/autoload_classmap.php
@@ -2,11 +2,12 @@
 
 // autoload_classmap.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
     'Attribute' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
+    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
     'FastRoute\\BadRouteException' => $vendorDir . '/nikic/fast-route/src/BadRouteException.php',
     'FastRoute\\DataGenerator' => $vendorDir . '/nikic/fast-route/src/DataGenerator.php',
     'FastRoute\\DataGenerator\\CharCountBased' => $vendorDir . '/nikic/fast-route/src/DataGenerator/CharCountBased.php',
@@ -154,7 +155,6 @@ return array(
     'Symfony\\Component\\Cache\\Adapter\\TagAwareAdapter' => $vendorDir . '/symfony/cache/Adapter/TagAwareAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\TagAwareAdapterInterface' => $vendorDir . '/symfony/cache/Adapter/TagAwareAdapterInterface.php',
     'Symfony\\Component\\Cache\\Adapter\\TraceableAdapter' => $vendorDir . '/symfony/cache/Adapter/TraceableAdapter.php',
-    'Symfony\\Component\\Cache\\Adapter\\TraceableAdapterEvent' => $vendorDir . '/symfony/cache/Adapter/TraceableAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\TraceableTagAwareAdapter' => $vendorDir . '/symfony/cache/Adapter/TraceableTagAwareAdapter.php',
     'Symfony\\Component\\Cache\\CacheItem' => $vendorDir . '/symfony/cache/CacheItem.php',
     'Symfony\\Component\\Cache\\DataCollector\\CacheDataCollector' => $vendorDir . '/symfony/cache/DataCollector/CacheDataCollector.php',
@@ -188,7 +188,6 @@ return array(
     'Symfony\\Component\\Cache\\Simple\\Psr6Cache' => $vendorDir . '/symfony/cache/Simple/Psr6Cache.php',
     'Symfony\\Component\\Cache\\Simple\\RedisCache' => $vendorDir . '/symfony/cache/Simple/RedisCache.php',
     'Symfony\\Component\\Cache\\Simple\\TraceableCache' => $vendorDir . '/symfony/cache/Simple/TraceableCache.php',
-    'Symfony\\Component\\Cache\\Simple\\TraceableCacheEvent' => $vendorDir . '/symfony/cache/Simple/TraceableCache.php',
     'Symfony\\Component\\Cache\\Traits\\AbstractAdapterTrait' => $vendorDir . '/symfony/cache/Traits/AbstractAdapterTrait.php',
     'Symfony\\Component\\Cache\\Traits\\AbstractTrait' => $vendorDir . '/symfony/cache/Traits/AbstractTrait.php',
     'Symfony\\Component\\Cache\\Traits\\ApcuTrait' => $vendorDir . '/symfony/cache/Traits/ApcuTrait.php',
@@ -197,7 +196,6 @@ return array(
     'Symfony\\Component\\Cache\\Traits\\DoctrineTrait' => $vendorDir . '/symfony/cache/Traits/DoctrineTrait.php',
     'Symfony\\Component\\Cache\\Traits\\FilesystemCommonTrait' => $vendorDir . '/symfony/cache/Traits/FilesystemCommonTrait.php',
     'Symfony\\Component\\Cache\\Traits\\FilesystemTrait' => $vendorDir . '/symfony/cache/Traits/FilesystemTrait.php',
-    'Symfony\\Component\\Cache\\Traits\\LazyValue' => $vendorDir . '/symfony/cache/Traits/PhpFilesTrait.php',
     'Symfony\\Component\\Cache\\Traits\\MemcachedTrait' => $vendorDir . '/symfony/cache/Traits/MemcachedTrait.php',
     'Symfony\\Component\\Cache\\Traits\\PdoTrait' => $vendorDir . '/symfony/cache/Traits/PdoTrait.php',
     'Symfony\\Component\\Cache\\Traits\\PhpArrayTrait' => $vendorDir . '/symfony/cache/Traits/PhpArrayTrait.php',
diff --git a/advancedcontentfilter/vendor/composer/autoload_files.php b/advancedcontentfilter/vendor/composer/autoload_files.php
index a5d3b964..aafd69e1 100644
--- a/advancedcontentfilter/vendor/composer/autoload_files.php
+++ b/advancedcontentfilter/vendor/composer/autoload_files.php
@@ -2,7 +2,7 @@
 
 // autoload_files.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
diff --git a/advancedcontentfilter/vendor/composer/autoload_namespaces.php b/advancedcontentfilter/vendor/composer/autoload_namespaces.php
index b7fc0125..15a2ff3a 100644
--- a/advancedcontentfilter/vendor/composer/autoload_namespaces.php
+++ b/advancedcontentfilter/vendor/composer/autoload_namespaces.php
@@ -2,7 +2,7 @@
 
 // autoload_namespaces.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
diff --git a/advancedcontentfilter/vendor/composer/autoload_psr4.php b/advancedcontentfilter/vendor/composer/autoload_psr4.php
index 3d716d56..4bf247ce 100644
--- a/advancedcontentfilter/vendor/composer/autoload_psr4.php
+++ b/advancedcontentfilter/vendor/composer/autoload_psr4.php
@@ -2,7 +2,7 @@
 
 // autoload_psr4.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
@@ -16,7 +16,7 @@ return array(
     'Slim\\' => array($vendorDir . '/slim/slim/Slim'),
     'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
     'Psr\\Http\\Server\\' => array($vendorDir . '/psr/http-server-handler/src', $vendorDir . '/psr/http-server-middleware/src'),
-    'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-factory/src', $vendorDir . '/psr/http-message/src'),
+    'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src', $vendorDir . '/psr/http-factory/src'),
     'Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
     'Psr\\Cache\\' => array($vendorDir . '/psr/cache/src'),
     'FastRoute\\' => array($vendorDir . '/nikic/fast-route/src'),
diff --git a/advancedcontentfilter/vendor/composer/autoload_real.php b/advancedcontentfilter/vendor/composer/autoload_real.php
index d6532d7d..b305aa00 100644
--- a/advancedcontentfilter/vendor/composer/autoload_real.php
+++ b/advancedcontentfilter/vendor/composer/autoload_real.php
@@ -22,52 +22,29 @@ class ComposerAutoloaderInitAdvancedContentFilterAddon
             return self::$loader;
         }
 
+        require __DIR__ . '/platform_check.php';
+
         spl_autoload_register(array('ComposerAutoloaderInitAdvancedContentFilterAddon', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
         spl_autoload_unregister(array('ComposerAutoloaderInitAdvancedContentFilterAddon', 'loadClassLoader'));
 
-        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
-        if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
-
-            call_user_func(\Composer\Autoload\ComposerStaticInitAdvancedContentFilterAddon::getInitializer($loader));
-        } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
-            $classMap = require __DIR__ . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
-            }
-        }
+        require __DIR__ . '/autoload_static.php';
+        call_user_func(\Composer\Autoload\ComposerStaticInitAdvancedContentFilterAddon::getInitializer($loader));
 
         $loader->register(true);
 
-        if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInitAdvancedContentFilterAddon::$files;
-        } else {
-            $includeFiles = require __DIR__ . '/autoload_files.php';
-        }
-        foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequireAdvancedContentFilterAddon($fileIdentifier, $file);
+        $filesToLoad = \Composer\Autoload\ComposerStaticInitAdvancedContentFilterAddon::$files;
+        $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
+            if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
+                $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
+
+                require $file;
+            }
+        }, null, null);
+        foreach ($filesToLoad as $fileIdentifier => $file) {
+            $requireFile($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
-
-function composerRequireAdvancedContentFilterAddon($fileIdentifier, $file)
-{
-    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
-        require $file;
-
-        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
-    }
-}
diff --git a/advancedcontentfilter/vendor/composer/autoload_static.php b/advancedcontentfilter/vendor/composer/autoload_static.php
index 57172a1a..8cc48b1a 100644
--- a/advancedcontentfilter/vendor/composer/autoload_static.php
+++ b/advancedcontentfilter/vendor/composer/autoload_static.php
@@ -83,8 +83,8 @@ class ComposerStaticInitAdvancedContentFilterAddon
         ),
         'Psr\\Http\\Message\\' => 
         array (
-            0 => __DIR__ . '/..' . '/psr/http-factory/src',
-            1 => __DIR__ . '/..' . '/psr/http-message/src',
+            0 => __DIR__ . '/..' . '/psr/http-message/src',
+            1 => __DIR__ . '/..' . '/psr/http-factory/src',
         ),
         'Psr\\Container\\' => 
         array (
@@ -102,6 +102,7 @@ class ComposerStaticInitAdvancedContentFilterAddon
 
     public static $classMap = array (
         'Attribute' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
+        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
         'FastRoute\\BadRouteException' => __DIR__ . '/..' . '/nikic/fast-route/src/BadRouteException.php',
         'FastRoute\\DataGenerator' => __DIR__ . '/..' . '/nikic/fast-route/src/DataGenerator.php',
         'FastRoute\\DataGenerator\\CharCountBased' => __DIR__ . '/..' . '/nikic/fast-route/src/DataGenerator/CharCountBased.php',
@@ -249,7 +250,6 @@ class ComposerStaticInitAdvancedContentFilterAddon
         'Symfony\\Component\\Cache\\Adapter\\TagAwareAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/TagAwareAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\TagAwareAdapterInterface' => __DIR__ . '/..' . '/symfony/cache/Adapter/TagAwareAdapterInterface.php',
         'Symfony\\Component\\Cache\\Adapter\\TraceableAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/TraceableAdapter.php',
-        'Symfony\\Component\\Cache\\Adapter\\TraceableAdapterEvent' => __DIR__ . '/..' . '/symfony/cache/Adapter/TraceableAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\TraceableTagAwareAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/TraceableTagAwareAdapter.php',
         'Symfony\\Component\\Cache\\CacheItem' => __DIR__ . '/..' . '/symfony/cache/CacheItem.php',
         'Symfony\\Component\\Cache\\DataCollector\\CacheDataCollector' => __DIR__ . '/..' . '/symfony/cache/DataCollector/CacheDataCollector.php',
@@ -283,7 +283,6 @@ class ComposerStaticInitAdvancedContentFilterAddon
         'Symfony\\Component\\Cache\\Simple\\Psr6Cache' => __DIR__ . '/..' . '/symfony/cache/Simple/Psr6Cache.php',
         'Symfony\\Component\\Cache\\Simple\\RedisCache' => __DIR__ . '/..' . '/symfony/cache/Simple/RedisCache.php',
         'Symfony\\Component\\Cache\\Simple\\TraceableCache' => __DIR__ . '/..' . '/symfony/cache/Simple/TraceableCache.php',
-        'Symfony\\Component\\Cache\\Simple\\TraceableCacheEvent' => __DIR__ . '/..' . '/symfony/cache/Simple/TraceableCache.php',
         'Symfony\\Component\\Cache\\Traits\\AbstractAdapterTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/AbstractAdapterTrait.php',
         'Symfony\\Component\\Cache\\Traits\\AbstractTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/AbstractTrait.php',
         'Symfony\\Component\\Cache\\Traits\\ApcuTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/ApcuTrait.php',
@@ -292,7 +291,6 @@ class ComposerStaticInitAdvancedContentFilterAddon
         'Symfony\\Component\\Cache\\Traits\\DoctrineTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/DoctrineTrait.php',
         'Symfony\\Component\\Cache\\Traits\\FilesystemCommonTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/FilesystemCommonTrait.php',
         'Symfony\\Component\\Cache\\Traits\\FilesystemTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/FilesystemTrait.php',
-        'Symfony\\Component\\Cache\\Traits\\LazyValue' => __DIR__ . '/..' . '/symfony/cache/Traits/PhpFilesTrait.php',
         'Symfony\\Component\\Cache\\Traits\\MemcachedTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/MemcachedTrait.php',
         'Symfony\\Component\\Cache\\Traits\\PdoTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/PdoTrait.php',
         'Symfony\\Component\\Cache\\Traits\\PhpArrayTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/PhpArrayTrait.php',
diff --git a/advancedcontentfilter/vendor/composer/installed.json b/advancedcontentfilter/vendor/composer/installed.json
index 07e02c7f..70c2dc41 100644
--- a/advancedcontentfilter/vendor/composer/installed.json
+++ b/advancedcontentfilter/vendor/composer/installed.json
@@ -1,1190 +1,1212 @@
-[
-    {
-        "name": "nikic/fast-route",
-        "version": "v1.3.0",
-        "version_normalized": "1.3.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/nikic/FastRoute.git",
-            "reference": "181d480e08d9476e61381e04a71b34dc0432e812"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/nikic/FastRoute/zipball/181d480e08d9476e61381e04a71b34dc0432e812",
-            "reference": "181d480e08d9476e61381e04a71b34dc0432e812",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.4.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "^4.8.35|~5.7"
-        },
-        "time": "2018-02-13T20:26:39+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "FastRoute\\": "src/"
+{
+    "packages": [
+        {
+            "name": "nikic/fast-route",
+            "version": "v1.3.0",
+            "version_normalized": "1.3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nikic/FastRoute.git",
+                "reference": "181d480e08d9476e61381e04a71b34dc0432e812"
             },
-            "files": [
-                "src/functions.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Nikita Popov",
-                "email": "nikic@php.net"
-            }
-        ],
-        "description": "Fast request router for PHP",
-        "keywords": [
-            "router",
-            "routing"
-        ]
-    },
-    {
-        "name": "psr/cache",
-        "version": "1.0.1",
-        "version_normalized": "1.0.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/cache.git",
-            "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8",
-            "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0"
-        },
-        "time": "2016-08-06T20:24:11+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Psr\\Cache\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interface for caching libraries",
-        "keywords": [
-            "cache",
-            "psr",
-            "psr-6"
-        ]
-    },
-    {
-        "name": "psr/container",
-        "version": "1.1.2",
-        "version_normalized": "1.1.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/container.git",
-            "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
-            "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.4.0"
-        },
-        "time": "2021-11-05T16:50:12+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Psr\\Container\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "https://www.php-fig.org/"
-            }
-        ],
-        "description": "Common Container Interface (PHP FIG PSR-11)",
-        "homepage": "https://github.com/php-fig/container",
-        "keywords": [
-            "PSR-11",
-            "container",
-            "container-interface",
-            "container-interop",
-            "psr"
-        ]
-    },
-    {
-        "name": "psr/http-factory",
-        "version": "1.0.2",
-        "version_normalized": "1.0.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/http-factory.git",
-            "reference": "e616d01114759c4c489f93b099585439f795fe35"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
-            "reference": "e616d01114759c4c489f93b099585439f795fe35",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.0.0",
-            "psr/http-message": "^1.0 || ^2.0"
-        },
-        "time": "2023-04-10T20:10:41+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Psr\\Http\\Message\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "https://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interfaces for PSR-7 HTTP message factories",
-        "keywords": [
-            "factory",
-            "http",
-            "message",
-            "psr",
-            "psr-17",
-            "psr-7",
-            "request",
-            "response"
-        ]
-    },
-    {
-        "name": "psr/http-message",
-        "version": "2.0",
-        "version_normalized": "2.0.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/http-message.git",
-            "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
-            "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
-            "shasum": ""
-        },
-        "require": {
-            "php": "^7.2 || ^8.0"
-        },
-        "time": "2023-04-04T09:54:51+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Psr\\Http\\Message\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "https://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interface for HTTP messages",
-        "homepage": "https://github.com/php-fig/http-message",
-        "keywords": [
-            "http",
-            "http-message",
-            "psr",
-            "psr-7",
-            "request",
-            "response"
-        ]
-    },
-    {
-        "name": "psr/http-server-handler",
-        "version": "1.0.2",
-        "version_normalized": "1.0.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/http-server-handler.git",
-            "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/84c4fb66179be4caaf8e97bd239203245302e7d4",
-            "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.0",
-            "psr/http-message": "^1.0 || ^2.0"
-        },
-        "time": "2023-04-10T20:06:20+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Psr\\Http\\Server\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "https://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interface for HTTP server-side request handler",
-        "keywords": [
-            "handler",
-            "http",
-            "http-interop",
-            "psr",
-            "psr-15",
-            "psr-7",
-            "request",
-            "response",
-            "server"
-        ]
-    },
-    {
-        "name": "psr/http-server-middleware",
-        "version": "1.0.2",
-        "version_normalized": "1.0.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/http-server-middleware.git",
-            "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/c1481f747daaa6a0782775cd6a8c26a1bf4a3829",
-            "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.0",
-            "psr/http-message": "^1.0 || ^2.0",
-            "psr/http-server-handler": "^1.0"
-        },
-        "time": "2023-04-11T06:14:47+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Psr\\Http\\Server\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "https://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interface for HTTP server-side middleware",
-        "keywords": [
-            "http",
-            "http-interop",
-            "middleware",
-            "psr",
-            "psr-15",
-            "psr-7",
-            "request",
-            "response"
-        ]
-    },
-    {
-        "name": "psr/log",
-        "version": "1.1.4",
-        "version_normalized": "1.1.4.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/log.git",
-            "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
-            "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0"
-        },
-        "time": "2021-05-03T11:20:27+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.1.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Psr\\Log\\": "Psr/Log/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "https://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interface for logging libraries",
-        "homepage": "https://github.com/php-fig/log",
-        "keywords": [
-            "log",
-            "psr",
-            "psr-3"
-        ]
-    },
-    {
-        "name": "slim/slim",
-        "version": "4.13.0",
-        "version_normalized": "4.13.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/slimphp/Slim.git",
-            "reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/slimphp/Slim/zipball/038fd5713d5a41636fdff0e8dcceedecdd17fc17",
-            "reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17",
-            "shasum": ""
-        },
-        "require": {
-            "ext-json": "*",
-            "nikic/fast-route": "^1.3",
-            "php": "^7.4 || ^8.0",
-            "psr/container": "^1.0 || ^2.0",
-            "psr/http-factory": "^1.0",
-            "psr/http-message": "^1.1 || ^2.0",
-            "psr/http-server-handler": "^1.0",
-            "psr/http-server-middleware": "^1.0",
-            "psr/log": "^1.1 || ^2.0 || ^3.0"
-        },
-        "require-dev": {
-            "adriansuter/php-autoload-override": "^1.4",
-            "ext-simplexml": "*",
-            "guzzlehttp/psr7": "^2.6",
-            "httpsoft/http-message": "^1.1",
-            "httpsoft/http-server-request": "^1.1",
-            "laminas/laminas-diactoros": "^2.17 || ^3",
-            "nyholm/psr7": "^1.8",
-            "nyholm/psr7-server": "^1.1",
-            "phpspec/prophecy": "^1.19",
-            "phpspec/prophecy-phpunit": "^2.1",
-            "phpstan/phpstan": "^1.10",
-            "phpunit/phpunit": "^9.6",
-            "slim/http": "^1.3",
-            "slim/psr7": "^1.6",
-            "squizlabs/php_codesniffer": "^3.9"
-        },
-        "suggest": {
-            "ext-simplexml": "Needed to support XML format in BodyParsingMiddleware",
-            "ext-xml": "Needed to support XML format in BodyParsingMiddleware",
-            "php-di/php-di": "PHP-DI is the recommended container library to be used with Slim",
-            "slim/psr7": "Slim PSR-7 implementation. See https://www.slimframework.com/docs/v4/start/installation.html for more information."
-        },
-        "time": "2024-03-03T21:25:30+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Slim\\": "Slim"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Josh Lockhart",
-                "email": "hello@joshlockhart.com",
-                "homepage": "https://joshlockhart.com"
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nikic/FastRoute/zipball/181d480e08d9476e61381e04a71b34dc0432e812",
+                "reference": "181d480e08d9476e61381e04a71b34dc0432e812",
+                "shasum": ""
             },
-            {
-                "name": "Andrew Smith",
-                "email": "a.smith@silentworks.co.uk",
-                "homepage": "http://silentworks.co.uk"
+            "require": {
+                "php": ">=5.4.0"
             },
-            {
-                "name": "Rob Allen",
-                "email": "rob@akrabat.com",
-                "homepage": "http://akrabat.com"
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35|~5.7"
             },
-            {
-                "name": "Pierre Berube",
-                "email": "pierre@lgse.com",
-                "homepage": "http://www.lgse.com"
+            "time": "2018-02-13T20:26:39+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "FastRoute\\": "src/"
+                },
+                "files": [
+                    "src/functions.php"
+                ]
             },
-            {
-                "name": "Gabriel Manricks",
-                "email": "gmanricks@me.com",
-                "homepage": "http://gabrielmanricks.com"
-            }
-        ],
-        "description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs",
-        "homepage": "https://www.slimframework.com",
-        "keywords": [
-            "api",
-            "framework",
-            "micro",
-            "router"
-        ],
-        "funding": [
-            {
-                "url": "https://opencollective.com/slimphp",
-                "type": "open_collective"
-            },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/slim/slim",
-                "type": "tidelift"
-            }
-        ]
-    },
-    {
-        "name": "symfony/cache",
-        "version": "v4.4.48",
-        "version_normalized": "4.4.48.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/cache.git",
-            "reference": "3b98ed664887ad197b8ede3da2432787212eb915"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/cache/zipball/3b98ed664887ad197b8ede3da2432787212eb915",
-            "reference": "3b98ed664887ad197b8ede3da2432787212eb915",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.1.3",
-            "psr/cache": "^1.0|^2.0",
-            "psr/log": "^1|^2|^3",
-            "symfony/cache-contracts": "^1.1.7|^2",
-            "symfony/polyfill-php73": "^1.9",
-            "symfony/polyfill-php80": "^1.16",
-            "symfony/service-contracts": "^1.1|^2",
-            "symfony/var-exporter": "^4.2|^5.0"
-        },
-        "conflict": {
-            "doctrine/dbal": "<2.7",
-            "symfony/dependency-injection": "<3.4",
-            "symfony/http-kernel": "<4.4|>=5.0",
-            "symfony/var-dumper": "<4.4"
-        },
-        "provide": {
-            "psr/cache-implementation": "1.0|2.0",
-            "psr/simple-cache-implementation": "1.0|2.0",
-            "symfony/cache-implementation": "1.0|2.0"
-        },
-        "require-dev": {
-            "cache/integration-tests": "dev-master",
-            "doctrine/cache": "^1.6|^2.0",
-            "doctrine/dbal": "^2.7|^3.0",
-            "predis/predis": "^1.1",
-            "psr/simple-cache": "^1.0|^2.0",
-            "symfony/config": "^4.2|^5.0",
-            "symfony/dependency-injection": "^3.4|^4.1|^5.0",
-            "symfony/filesystem": "^4.4|^5.0",
-            "symfony/http-kernel": "^4.4",
-            "symfony/var-dumper": "^4.4|^5.0"
-        },
-        "time": "2022-10-17T20:21:54+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\Cache\\": ""
-            },
-            "exclude-from-classmap": [
-                "/Tests/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Nicolas Grekas",
-                "email": "p@tchwork.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Provides extended PSR-6, PSR-16 (and tags) implementations",
-        "homepage": "https://symfony.com",
-        "keywords": [
-            "caching",
-            "psr6"
-        ],
-        "funding": [
-            {
-                "url": "https://symfony.com/sponsor",
-                "type": "custom"
-            },
-            {
-                "url": "https://github.com/fabpot",
-                "type": "github"
-            },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                "type": "tidelift"
-            }
-        ]
-    },
-    {
-        "name": "symfony/cache-contracts",
-        "version": "v2.5.2",
-        "version_normalized": "2.5.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/cache-contracts.git",
-            "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/64be4a7acb83b6f2bf6de9a02cee6dad41277ebc",
-            "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.2.5",
-            "psr/cache": "^1.0|^2.0|^3.0"
-        },
-        "suggest": {
-            "symfony/cache-implementation": ""
-        },
-        "time": "2022-01-02T09:53:40+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-main": "2.5-dev"
-            },
-            "thanks": {
-                "name": "symfony/contracts",
-                "url": "https://github.com/symfony/contracts"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Contracts\\Cache\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Nicolas Grekas",
-                "email": "p@tchwork.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Generic abstractions related to caching",
-        "homepage": "https://symfony.com",
-        "keywords": [
-            "abstractions",
-            "contracts",
-            "decoupling",
-            "interfaces",
-            "interoperability",
-            "standards"
-        ],
-        "funding": [
-            {
-                "url": "https://symfony.com/sponsor",
-                "type": "custom"
-            },
-            {
-                "url": "https://github.com/fabpot",
-                "type": "github"
-            },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                "type": "tidelift"
-            }
-        ]
-    },
-    {
-        "name": "symfony/deprecation-contracts",
-        "version": "v2.5.2",
-        "version_normalized": "2.5.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/deprecation-contracts.git",
-            "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
-            "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.1"
-        },
-        "time": "2022-01-02T09:53:40+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-main": "2.5-dev"
-            },
-            "thanks": {
-                "name": "symfony/contracts",
-                "url": "https://github.com/symfony/contracts"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "files": [
-                "function.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Nicolas Grekas",
-                "email": "p@tchwork.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "A generic function and convention to trigger deprecation notices",
-        "homepage": "https://symfony.com",
-        "funding": [
-            {
-                "url": "https://symfony.com/sponsor",
-                "type": "custom"
-            },
-            {
-                "url": "https://github.com/fabpot",
-                "type": "github"
-            },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                "type": "tidelift"
-            }
-        ]
-    },
-    {
-        "name": "symfony/expression-language",
-        "version": "v3.4.47",
-        "version_normalized": "3.4.47.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/expression-language.git",
-            "reference": "de38e66398fca1fcb9c48e80279910e6889cb28f"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/expression-language/zipball/de38e66398fca1fcb9c48e80279910e6889cb28f",
-            "reference": "de38e66398fca1fcb9c48e80279910e6889cb28f",
-            "shasum": ""
-        },
-        "require": {
-            "php": "^5.5.9|>=7.0.8",
-            "symfony/cache": "~3.1|~4.0",
-            "symfony/polyfill-php70": "~1.6"
-        },
-        "time": "2020-10-24T10:57:07+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\ExpressionLanguage\\": ""
-            },
-            "exclude-from-classmap": [
-                "/Tests/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony ExpressionLanguage Component",
-        "homepage": "https://symfony.com",
-        "funding": [
-            {
-                "url": "https://symfony.com/sponsor",
-                "type": "custom"
-            },
-            {
-                "url": "https://github.com/fabpot",
-                "type": "github"
-            },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                "type": "tidelift"
-            }
-        ]
-    },
-    {
-        "name": "symfony/polyfill-php70",
-        "version": "v1.20.0",
-        "version_normalized": "1.20.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/polyfill-php70.git",
-            "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/5f03a781d984aae42cebd18e7912fa80f02ee644",
-            "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.1"
-        },
-        "time": "2020-10-23T14:02:19+00:00",
-        "type": "metapackage",
-        "extra": {
-            "branch-alias": {
-                "dev-main": "1.20-dev"
-            },
-            "thanks": {
-                "name": "symfony/polyfill",
-                "url": "https://github.com/symfony/polyfill"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Nicolas Grekas",
-                "email": "p@tchwork.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
-        "homepage": "https://symfony.com",
-        "keywords": [
-            "compatibility",
-            "polyfill",
-            "portable",
-            "shim"
-        ],
-        "funding": [
-            {
-                "url": "https://symfony.com/sponsor",
-                "type": "custom"
-            },
-            {
-                "url": "https://github.com/fabpot",
-                "type": "github"
-            },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                "type": "tidelift"
-            }
-        ]
-    },
-    {
-        "name": "symfony/polyfill-php73",
-        "version": "v1.29.0",
-        "version_normalized": "1.29.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/polyfill-php73.git",
-            "reference": "21bd091060673a1177ae842c0ef8fe30893114d2"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2",
-            "reference": "21bd091060673a1177ae842c0ef8fe30893114d2",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.1"
-        },
-        "time": "2024-01-29T20:11:03+00:00",
-        "type": "library",
-        "extra": {
-            "thanks": {
-                "name": "symfony/polyfill",
-                "url": "https://github.com/symfony/polyfill"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "files": [
-                "bootstrap.php"
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
             ],
-            "psr-4": {
-                "Symfony\\Polyfill\\Php73\\": ""
-            },
-            "classmap": [
-                "Resources/stubs"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Nicolas Grekas",
-                "email": "p@tchwork.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
-        "homepage": "https://symfony.com",
-        "keywords": [
-            "compatibility",
-            "polyfill",
-            "portable",
-            "shim"
-        ],
-        "funding": [
-            {
-                "url": "https://symfony.com/sponsor",
-                "type": "custom"
-            },
-            {
-                "url": "https://github.com/fabpot",
-                "type": "github"
-            },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                "type": "tidelift"
-            }
-        ]
-    },
-    {
-        "name": "symfony/polyfill-php80",
-        "version": "v1.29.0",
-        "version_normalized": "1.29.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/polyfill-php80.git",
-            "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
-            "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.1"
-        },
-        "time": "2024-01-29T20:11:03+00:00",
-        "type": "library",
-        "extra": {
-            "thanks": {
-                "name": "symfony/polyfill",
-                "url": "https://github.com/symfony/polyfill"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "files": [
-                "bootstrap.php"
+            "authors": [
+                {
+                    "name": "Nikita Popov",
+                    "email": "nikic@php.net"
+                }
             ],
-            "psr-4": {
-                "Symfony\\Polyfill\\Php80\\": ""
-            },
-            "classmap": [
-                "Resources/stubs"
-            ]
+            "description": "Fast request router for PHP",
+            "keywords": [
+                "router",
+                "routing"
+            ],
+            "install-path": "../nikic/fast-route"
         },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Ion Bazan",
-                "email": "ion.bazan@gmail.com"
+        {
+            "name": "psr/cache",
+            "version": "1.0.1",
+            "version_normalized": "1.0.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/cache.git",
+                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8"
             },
-            {
-                "name": "Nicolas Grekas",
-                "email": "p@tchwork.com"
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8",
+                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8",
+                "shasum": ""
             },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
-        "homepage": "https://symfony.com",
-        "keywords": [
-            "compatibility",
-            "polyfill",
-            "portable",
-            "shim"
-        ],
-        "funding": [
-            {
-                "url": "https://symfony.com/sponsor",
-                "type": "custom"
+            "require": {
+                "php": ">=5.3.0"
             },
-            {
-                "url": "https://github.com/fabpot",
-                "type": "github"
+            "time": "2016-08-06T20:24:11+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
             },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                "type": "tidelift"
-            }
-        ]
-    },
-    {
-        "name": "symfony/service-contracts",
-        "version": "v2.5.2",
-        "version_normalized": "2.5.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/service-contracts.git",
-            "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
-            "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.2.5",
-            "psr/container": "^1.1",
-            "symfony/deprecation-contracts": "^2.1|^3"
-        },
-        "conflict": {
-            "ext-psr": "<1.1|>=2"
-        },
-        "suggest": {
-            "symfony/service-implementation": ""
-        },
-        "time": "2022-05-30T19:17:29+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-main": "2.5-dev"
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Cache\\": "src/"
+                }
             },
-            "thanks": {
-                "name": "symfony/contracts",
-                "url": "https://github.com/symfony/contracts"
-            }
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for caching libraries",
+            "keywords": [
+                "cache",
+                "psr",
+                "psr-6"
+            ],
+            "install-path": "../psr/cache"
         },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Contracts\\Service\\": ""
-            }
+        {
+            "name": "psr/container",
+            "version": "1.1.2",
+            "version_normalized": "1.1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/container.git",
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.4.0"
+            },
+            "time": "2021-11-05T16:50:12+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Container\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common Container Interface (PHP FIG PSR-11)",
+            "homepage": "https://github.com/php-fig/container",
+            "keywords": [
+                "PSR-11",
+                "container",
+                "container-interface",
+                "container-interop",
+                "psr"
+            ],
+            "install-path": "../psr/container"
         },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Nicolas Grekas",
-                "email": "p@tchwork.com"
+        {
+            "name": "psr/http-factory",
+            "version": "1.0.2",
+            "version_normalized": "1.0.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-factory.git",
+                "reference": "e616d01114759c4c489f93b099585439f795fe35"
             },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Generic abstractions related to writing services",
-        "homepage": "https://symfony.com",
-        "keywords": [
-            "abstractions",
-            "contracts",
-            "decoupling",
-            "interfaces",
-            "interoperability",
-            "standards"
-        ],
-        "funding": [
-            {
-                "url": "https://symfony.com/sponsor",
-                "type": "custom"
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
+                "reference": "e616d01114759c4c489f93b099585439f795fe35",
+                "shasum": ""
             },
-            {
-                "url": "https://github.com/fabpot",
-                "type": "github"
+            "require": {
+                "php": ">=7.0.0",
+                "psr/http-message": "^1.0 || ^2.0"
             },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                "type": "tidelift"
-            }
-        ]
-    },
-    {
-        "name": "symfony/var-exporter",
-        "version": "v5.4.35",
-        "version_normalized": "5.4.35.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/var-exporter.git",
-            "reference": "abb0a151b62d6b07e816487e20040464af96cae7"
+            "time": "2023-04-10T20:10:41+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interfaces for PSR-7 HTTP message factories",
+            "keywords": [
+                "factory",
+                "http",
+                "message",
+                "psr",
+                "psr-17",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "install-path": "../psr/http-factory"
         },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/var-exporter/zipball/abb0a151b62d6b07e816487e20040464af96cae7",
-            "reference": "abb0a151b62d6b07e816487e20040464af96cae7",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.2.5",
-            "symfony/polyfill-php80": "^1.16"
-        },
-        "require-dev": {
-            "symfony/var-dumper": "^4.4.9|^5.0.9|^6.0"
-        },
-        "time": "2024-01-23T13:51:25+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\VarExporter\\": ""
+        {
+            "name": "psr/http-message",
+            "version": "2.0",
+            "version_normalized": "2.0.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
             },
-            "exclude-from-classmap": [
-                "/Tests/"
-            ]
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "time": "2023-04-04T09:54:51+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "install-path": "../psr/http-message"
         },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Nicolas Grekas",
-                "email": "p@tchwork.com"
+        {
+            "name": "psr/http-server-handler",
+            "version": "1.0.2",
+            "version_normalized": "1.0.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-server-handler.git",
+                "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4"
             },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Allows exporting any serializable PHP data structure to plain PHP code",
-        "homepage": "https://symfony.com",
-        "keywords": [
-            "clone",
-            "construct",
-            "export",
-            "hydrate",
-            "instantiate",
-            "serialize"
-        ],
-        "funding": [
-            {
-                "url": "https://symfony.com/sponsor",
-                "type": "custom"
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/84c4fb66179be4caaf8e97bd239203245302e7d4",
+                "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4",
+                "shasum": ""
             },
-            {
-                "url": "https://github.com/fabpot",
-                "type": "github"
+            "require": {
+                "php": ">=7.0",
+                "psr/http-message": "^1.0 || ^2.0"
             },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                "type": "tidelift"
-            }
-        ]
-    }
-]
+            "time": "2023-04-10T20:06:20+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Server\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP server-side request handler",
+            "keywords": [
+                "handler",
+                "http",
+                "http-interop",
+                "psr",
+                "psr-15",
+                "psr-7",
+                "request",
+                "response",
+                "server"
+            ],
+            "install-path": "../psr/http-server-handler"
+        },
+        {
+            "name": "psr/http-server-middleware",
+            "version": "1.0.2",
+            "version_normalized": "1.0.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-server-middleware.git",
+                "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/c1481f747daaa6a0782775cd6a8c26a1bf4a3829",
+                "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0",
+                "psr/http-message": "^1.0 || ^2.0",
+                "psr/http-server-handler": "^1.0"
+            },
+            "time": "2023-04-11T06:14:47+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Server\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP server-side middleware",
+            "keywords": [
+                "http",
+                "http-interop",
+                "middleware",
+                "psr",
+                "psr-15",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "install-path": "../psr/http-server-middleware"
+        },
+        {
+            "name": "psr/log",
+            "version": "1.1.4",
+            "version_normalized": "1.1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "time": "2021-05-03T11:20:27+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Log\\": "Psr/Log/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "install-path": "../psr/log"
+        },
+        {
+            "name": "slim/slim",
+            "version": "4.13.0",
+            "version_normalized": "4.13.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/slimphp/Slim.git",
+                "reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/slimphp/Slim/zipball/038fd5713d5a41636fdff0e8dcceedecdd17fc17",
+                "reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "nikic/fast-route": "^1.3",
+                "php": "^7.4 || ^8.0",
+                "psr/container": "^1.0 || ^2.0",
+                "psr/http-factory": "^1.0",
+                "psr/http-message": "^1.1 || ^2.0",
+                "psr/http-server-handler": "^1.0",
+                "psr/http-server-middleware": "^1.0",
+                "psr/log": "^1.1 || ^2.0 || ^3.0"
+            },
+            "require-dev": {
+                "adriansuter/php-autoload-override": "^1.4",
+                "ext-simplexml": "*",
+                "guzzlehttp/psr7": "^2.6",
+                "httpsoft/http-message": "^1.1",
+                "httpsoft/http-server-request": "^1.1",
+                "laminas/laminas-diactoros": "^2.17 || ^3",
+                "nyholm/psr7": "^1.8",
+                "nyholm/psr7-server": "^1.1",
+                "phpspec/prophecy": "^1.19",
+                "phpspec/prophecy-phpunit": "^2.1",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^9.6",
+                "slim/http": "^1.3",
+                "slim/psr7": "^1.6",
+                "squizlabs/php_codesniffer": "^3.9"
+            },
+            "suggest": {
+                "ext-simplexml": "Needed to support XML format in BodyParsingMiddleware",
+                "ext-xml": "Needed to support XML format in BodyParsingMiddleware",
+                "php-di/php-di": "PHP-DI is the recommended container library to be used with Slim",
+                "slim/psr7": "Slim PSR-7 implementation. See https://www.slimframework.com/docs/v4/start/installation.html for more information."
+            },
+            "time": "2024-03-03T21:25:30+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Slim\\": "Slim"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Josh Lockhart",
+                    "email": "hello@joshlockhart.com",
+                    "homepage": "https://joshlockhart.com"
+                },
+                {
+                    "name": "Andrew Smith",
+                    "email": "a.smith@silentworks.co.uk",
+                    "homepage": "http://silentworks.co.uk"
+                },
+                {
+                    "name": "Rob Allen",
+                    "email": "rob@akrabat.com",
+                    "homepage": "http://akrabat.com"
+                },
+                {
+                    "name": "Pierre Berube",
+                    "email": "pierre@lgse.com",
+                    "homepage": "http://www.lgse.com"
+                },
+                {
+                    "name": "Gabriel Manricks",
+                    "email": "gmanricks@me.com",
+                    "homepage": "http://gabrielmanricks.com"
+                }
+            ],
+            "description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs",
+            "homepage": "https://www.slimframework.com",
+            "keywords": [
+                "api",
+                "framework",
+                "micro",
+                "router"
+            ],
+            "funding": [
+                {
+                    "url": "https://opencollective.com/slimphp",
+                    "type": "open_collective"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/slim/slim",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": "../slim/slim"
+        },
+        {
+            "name": "symfony/cache",
+            "version": "v4.4.48",
+            "version_normalized": "4.4.48.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/cache.git",
+                "reference": "3b98ed664887ad197b8ede3da2432787212eb915"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/3b98ed664887ad197b8ede3da2432787212eb915",
+                "reference": "3b98ed664887ad197b8ede3da2432787212eb915",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1.3",
+                "psr/cache": "^1.0|^2.0",
+                "psr/log": "^1|^2|^3",
+                "symfony/cache-contracts": "^1.1.7|^2",
+                "symfony/polyfill-php73": "^1.9",
+                "symfony/polyfill-php80": "^1.16",
+                "symfony/service-contracts": "^1.1|^2",
+                "symfony/var-exporter": "^4.2|^5.0"
+            },
+            "conflict": {
+                "doctrine/dbal": "<2.7",
+                "symfony/dependency-injection": "<3.4",
+                "symfony/http-kernel": "<4.4|>=5.0",
+                "symfony/var-dumper": "<4.4"
+            },
+            "provide": {
+                "psr/cache-implementation": "1.0|2.0",
+                "psr/simple-cache-implementation": "1.0|2.0",
+                "symfony/cache-implementation": "1.0|2.0"
+            },
+            "require-dev": {
+                "cache/integration-tests": "dev-master",
+                "doctrine/cache": "^1.6|^2.0",
+                "doctrine/dbal": "^2.7|^3.0",
+                "predis/predis": "^1.1",
+                "psr/simple-cache": "^1.0|^2.0",
+                "symfony/config": "^4.2|^5.0",
+                "symfony/dependency-injection": "^3.4|^4.1|^5.0",
+                "symfony/filesystem": "^4.4|^5.0",
+                "symfony/http-kernel": "^4.4",
+                "symfony/var-dumper": "^4.4|^5.0"
+            },
+            "time": "2022-10-17T20:21:54+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Cache\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides extended PSR-6, PSR-16 (and tags) implementations",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "caching",
+                "psr6"
+            ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": "../symfony/cache"
+        },
+        {
+            "name": "symfony/cache-contracts",
+            "version": "v2.5.2",
+            "version_normalized": "2.5.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/cache-contracts.git",
+                "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/64be4a7acb83b6f2bf6de9a02cee6dad41277ebc",
+                "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "psr/cache": "^1.0|^2.0|^3.0"
+            },
+            "suggest": {
+                "symfony/cache-implementation": ""
+            },
+            "time": "2022-01-02T09:53:40+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\Cache\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to caching",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": "../symfony/cache-contracts"
+        },
+        {
+            "name": "symfony/deprecation-contracts",
+            "version": "v2.5.2",
+            "version_normalized": "2.5.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "time": "2022-01-02T09:53:40+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A generic function and convention to trigger deprecation notices",
+            "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": "../symfony/deprecation-contracts"
+        },
+        {
+            "name": "symfony/expression-language",
+            "version": "v3.4.47",
+            "version_normalized": "3.4.47.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/expression-language.git",
+                "reference": "de38e66398fca1fcb9c48e80279910e6889cb28f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/expression-language/zipball/de38e66398fca1fcb9c48e80279910e6889cb28f",
+                "reference": "de38e66398fca1fcb9c48e80279910e6889cb28f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5.9|>=7.0.8",
+                "symfony/cache": "~3.1|~4.0",
+                "symfony/polyfill-php70": "~1.6"
+            },
+            "time": "2020-10-24T10:57:07+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\ExpressionLanguage\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony ExpressionLanguage Component",
+            "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": "../symfony/expression-language"
+        },
+        {
+            "name": "symfony/polyfill-php70",
+            "version": "v1.20.0",
+            "version_normalized": "1.20.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php70.git",
+                "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/5f03a781d984aae42cebd18e7912fa80f02ee644",
+                "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "time": "2020-10-23T14:02:19+00:00",
+            "type": "metapackage",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.20-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": null
+        },
+        {
+            "name": "symfony/polyfill-php73",
+            "version": "v1.29.0",
+            "version_normalized": "1.29.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php73.git",
+                "reference": "21bd091060673a1177ae842c0ef8fe30893114d2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2",
+                "reference": "21bd091060673a1177ae842c0ef8fe30893114d2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "time": "2024-01-29T20:11:03+00:00",
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php73\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": "../symfony/polyfill-php73"
+        },
+        {
+            "name": "symfony/polyfill-php80",
+            "version": "v1.29.0",
+            "version_normalized": "1.29.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "time": "2024-01-29T20:11:03+00:00",
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
+                },
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": "../symfony/polyfill-php80"
+        },
+        {
+            "name": "symfony/service-contracts",
+            "version": "v2.5.2",
+            "version_normalized": "2.5.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/service-contracts.git",
+                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
+                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "psr/container": "^1.1",
+                "symfony/deprecation-contracts": "^2.1|^3"
+            },
+            "conflict": {
+                "ext-psr": "<1.1|>=2"
+            },
+            "suggest": {
+                "symfony/service-implementation": ""
+            },
+            "time": "2022-05-30T19:17:29+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\Service\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to writing services",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": "../symfony/service-contracts"
+        },
+        {
+            "name": "symfony/var-exporter",
+            "version": "v5.4.35",
+            "version_normalized": "5.4.35.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/var-exporter.git",
+                "reference": "abb0a151b62d6b07e816487e20040464af96cae7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/abb0a151b62d6b07e816487e20040464af96cae7",
+                "reference": "abb0a151b62d6b07e816487e20040464af96cae7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/polyfill-php80": "^1.16"
+            },
+            "require-dev": {
+                "symfony/var-dumper": "^4.4.9|^5.0.9|^6.0"
+            },
+            "time": "2024-01-23T13:51:25+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\VarExporter\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Allows exporting any serializable PHP data structure to plain PHP code",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "clone",
+                "construct",
+                "export",
+                "hydrate",
+                "instantiate",
+                "serialize"
+            ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": "../symfony/var-exporter"
+        }
+    ],
+    "dev": false,
+    "dev-package-names": []
+}
diff --git a/advancedcontentfilter/vendor/composer/installed.php b/advancedcontentfilter/vendor/composer/installed.php
new file mode 100644
index 00000000..010b1da9
--- /dev/null
+++ b/advancedcontentfilter/vendor/composer/installed.php
@@ -0,0 +1,203 @@
+<?php return array(
+    'root' => array(
+        'name' => 'friendica-addons/advancedcontentfilter',
+        'pretty_version' => 'dev-develop',
+        'version' => 'dev-develop',
+        'reference' => 'feb7722f723b21e76fdf20a7ce4b42fa5ffcdcb9',
+        'type' => 'friendica-addon',
+        'install_path' => __DIR__ . '/../../',
+        'aliases' => array(),
+        'dev' => false,
+    ),
+    'versions' => array(
+        'friendica-addons/advancedcontentfilter' => array(
+            'pretty_version' => 'dev-develop',
+            'version' => 'dev-develop',
+            'reference' => 'feb7722f723b21e76fdf20a7ce4b42fa5ffcdcb9',
+            'type' => 'friendica-addon',
+            'install_path' => __DIR__ . '/../../',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'nikic/fast-route' => array(
+            'pretty_version' => 'v1.3.0',
+            'version' => '1.3.0.0',
+            'reference' => '181d480e08d9476e61381e04a71b34dc0432e812',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../nikic/fast-route',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'psr/cache' => array(
+            'pretty_version' => '1.0.1',
+            'version' => '1.0.1.0',
+            'reference' => 'd11b50ad223250cf17b86e38383413f5a6764bf8',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/cache',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'psr/cache-implementation' => array(
+            'dev_requirement' => false,
+            'provided' => array(
+                0 => '1.0|2.0',
+            ),
+        ),
+        'psr/container' => array(
+            'pretty_version' => '1.1.2',
+            'version' => '1.1.2.0',
+            'reference' => '513e0666f7216c7459170d56df27dfcefe1689ea',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/container',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'psr/http-factory' => array(
+            'pretty_version' => '1.0.2',
+            'version' => '1.0.2.0',
+            'reference' => 'e616d01114759c4c489f93b099585439f795fe35',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/http-factory',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'psr/http-message' => array(
+            'pretty_version' => '2.0',
+            'version' => '2.0.0.0',
+            'reference' => '402d35bcb92c70c026d1a6a9883f06b2ead23d71',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/http-message',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'psr/http-server-handler' => array(
+            'pretty_version' => '1.0.2',
+            'version' => '1.0.2.0',
+            'reference' => '84c4fb66179be4caaf8e97bd239203245302e7d4',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/http-server-handler',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'psr/http-server-middleware' => array(
+            'pretty_version' => '1.0.2',
+            'version' => '1.0.2.0',
+            'reference' => 'c1481f747daaa6a0782775cd6a8c26a1bf4a3829',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/http-server-middleware',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'psr/log' => array(
+            'pretty_version' => '1.1.4',
+            'version' => '1.1.4.0',
+            'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/log',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'psr/simple-cache-implementation' => array(
+            'dev_requirement' => false,
+            'provided' => array(
+                0 => '1.0|2.0',
+            ),
+        ),
+        'slim/slim' => array(
+            'pretty_version' => '4.13.0',
+            'version' => '4.13.0.0',
+            'reference' => '038fd5713d5a41636fdff0e8dcceedecdd17fc17',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../slim/slim',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'symfony/cache' => array(
+            'pretty_version' => 'v4.4.48',
+            'version' => '4.4.48.0',
+            'reference' => '3b98ed664887ad197b8ede3da2432787212eb915',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/cache',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'symfony/cache-contracts' => array(
+            'pretty_version' => 'v2.5.2',
+            'version' => '2.5.2.0',
+            'reference' => '64be4a7acb83b6f2bf6de9a02cee6dad41277ebc',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/cache-contracts',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'symfony/cache-implementation' => array(
+            'dev_requirement' => false,
+            'provided' => array(
+                0 => '1.0|2.0',
+            ),
+        ),
+        'symfony/deprecation-contracts' => array(
+            'pretty_version' => 'v2.5.2',
+            'version' => '2.5.2.0',
+            'reference' => 'e8b495ea28c1d97b5e0c121748d6f9b53d075c66',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/deprecation-contracts',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'symfony/expression-language' => array(
+            'pretty_version' => 'v3.4.47',
+            'version' => '3.4.47.0',
+            'reference' => 'de38e66398fca1fcb9c48e80279910e6889cb28f',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/expression-language',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'symfony/polyfill-php70' => array(
+            'pretty_version' => 'v1.20.0',
+            'version' => '1.20.0.0',
+            'reference' => '5f03a781d984aae42cebd18e7912fa80f02ee644',
+            'type' => 'metapackage',
+            'install_path' => null,
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'symfony/polyfill-php73' => array(
+            'pretty_version' => 'v1.29.0',
+            'version' => '1.29.0.0',
+            'reference' => '21bd091060673a1177ae842c0ef8fe30893114d2',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/polyfill-php73',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'symfony/polyfill-php80' => array(
+            'pretty_version' => 'v1.29.0',
+            'version' => '1.29.0.0',
+            'reference' => '87b68208d5c1188808dd7839ee1e6c8ec3b02f1b',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/polyfill-php80',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'symfony/service-contracts' => array(
+            'pretty_version' => 'v2.5.2',
+            'version' => '2.5.2.0',
+            'reference' => '4b426aac47d6427cc1a1d0f7e2ac724627f5966c',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/service-contracts',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'symfony/var-exporter' => array(
+            'pretty_version' => 'v5.4.35',
+            'version' => '5.4.35.0',
+            'reference' => 'abb0a151b62d6b07e816487e20040464af96cae7',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/var-exporter',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+    ),
+);
diff --git a/advancedcontentfilter/vendor/composer/platform_check.php b/advancedcontentfilter/vendor/composer/platform_check.php
new file mode 100644
index 00000000..580fa960
--- /dev/null
+++ b/advancedcontentfilter/vendor/composer/platform_check.php
@@ -0,0 +1,26 @@
+<?php
+
+// platform_check.php @generated by Composer
+
+$issues = array();
+
+if (!(PHP_VERSION_ID >= 70400)) {
+    $issues[] = 'Your Composer dependencies require a PHP version ">= 7.4.0". You are running ' . PHP_VERSION . '.';
+}
+
+if ($issues) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
+        } elseif (!headers_sent()) {
+            echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
+        }
+    }
+    trigger_error(
+        'Composer detected issues in your platform: ' . implode(' ', $issues),
+        E_USER_ERROR
+    );
+}
diff --git a/advancedcontentfilter/vendor/psr/simple-cache/.editorconfig b/advancedcontentfilter/vendor/psr/simple-cache/.editorconfig
deleted file mode 100644
index 48542cbb..00000000
--- a/advancedcontentfilter/vendor/psr/simple-cache/.editorconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-; This file is for unifying the coding style for different editors and IDEs.
-; More information at http://editorconfig.org
-
-root = true
-
-[*]
-charset = utf-8
-indent_size = 4
-indent_style = space
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
diff --git a/advancedcontentfilter/vendor/psr/simple-cache/LICENSE.md b/advancedcontentfilter/vendor/psr/simple-cache/LICENSE.md
deleted file mode 100644
index e49a7c85..00000000
--- a/advancedcontentfilter/vendor/psr/simple-cache/LICENSE.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# The MIT License (MIT)
-
-Copyright (c) 2016 PHP Framework Interoperability Group
-
-> 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/advancedcontentfilter/vendor/psr/simple-cache/README.md b/advancedcontentfilter/vendor/psr/simple-cache/README.md
deleted file mode 100644
index 43641d17..00000000
--- a/advancedcontentfilter/vendor/psr/simple-cache/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-PHP FIG Simple Cache PSR
-========================
-
-This repository holds all interfaces related to PSR-16.
-
-Note that this is not a cache implementation of its own. It is merely an interface that describes a cache implementation. See [the specification](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-16-simple-cache.md) for more details.
-
-You can find implementations of the specification by looking for packages providing the [psr/simple-cache-implementation](https://packagist.org/providers/psr/simple-cache-implementation) virtual package.
diff --git a/advancedcontentfilter/vendor/psr/simple-cache/composer.json b/advancedcontentfilter/vendor/psr/simple-cache/composer.json
deleted file mode 100644
index 2978fa55..00000000
--- a/advancedcontentfilter/vendor/psr/simple-cache/composer.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "name": "psr/simple-cache",
-    "description": "Common interfaces for simple caching",
-    "keywords": ["psr", "psr-16", "cache", "simple-cache", "caching"],
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "PHP-FIG",
-            "homepage": "http://www.php-fig.org/"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Psr\\SimpleCache\\": "src/"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        }
-    }
-}
diff --git a/advancedcontentfilter/vendor/psr/simple-cache/src/CacheException.php b/advancedcontentfilter/vendor/psr/simple-cache/src/CacheException.php
deleted file mode 100644
index eba53815..00000000
--- a/advancedcontentfilter/vendor/psr/simple-cache/src/CacheException.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Psr\SimpleCache;
-
-/**
- * Interface used for all types of exceptions thrown by the implementing library.
- */
-interface CacheException
-{
-}
diff --git a/advancedcontentfilter/vendor/psr/simple-cache/src/CacheInterface.php b/advancedcontentfilter/vendor/psr/simple-cache/src/CacheInterface.php
deleted file mode 100644
index 99e8d957..00000000
--- a/advancedcontentfilter/vendor/psr/simple-cache/src/CacheInterface.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-namespace Psr\SimpleCache;
-
-interface CacheInterface
-{
-    /**
-     * Fetches a value from the cache.
-     *
-     * @param string $key     The unique key of this item in the cache.
-     * @param mixed  $default Default value to return if the key does not exist.
-     *
-     * @return mixed The value of the item from the cache, or $default in case of cache miss.
-     *
-     * @throws \Psr\SimpleCache\InvalidArgumentException
-     *   MUST be thrown if the $key string is not a legal value.
-     */
-    public function get($key, $default = null);
-
-    /**
-     * Persists data in the cache, uniquely referenced by a key with an optional expiration TTL time.
-     *
-     * @param string                 $key   The key of the item to store.
-     * @param mixed                  $value The value of the item to store, must be serializable.
-     * @param null|int|\DateInterval $ttl   Optional. The TTL value of this item. If no value is sent and
-     *                                      the driver supports TTL then the library may set a default value
-     *                                      for it or let the driver take care of that.
-     *
-     * @return bool True on success and false on failure.
-     *
-     * @throws \Psr\SimpleCache\InvalidArgumentException
-     *   MUST be thrown if the $key string is not a legal value.
-     */
-    public function set($key, $value, $ttl = null);
-
-    /**
-     * Delete an item from the cache by its unique key.
-     *
-     * @param string $key The unique cache key of the item to delete.
-     *
-     * @return bool True if the item was successfully removed. False if there was an error.
-     *
-     * @throws \Psr\SimpleCache\InvalidArgumentException
-     *   MUST be thrown if the $key string is not a legal value.
-     */
-    public function delete($key);
-
-    /**
-     * Wipes clean the entire cache's keys.
-     *
-     * @return bool True on success and false on failure.
-     */
-    public function clear();
-
-    /**
-     * Obtains multiple cache items by their unique keys.
-     *
-     * @param iterable $keys    A list of keys that can obtained in a single operation.
-     * @param mixed    $default Default value to return for keys that do not exist.
-     *
-     * @return iterable A list of key => value pairs. Cache keys that do not exist or are stale will have $default as value.
-     *
-     * @throws \Psr\SimpleCache\InvalidArgumentException
-     *   MUST be thrown if $keys is neither an array nor a Traversable,
-     *   or if any of the $keys are not a legal value.
-     */
-    public function getMultiple($keys, $default = null);
-
-    /**
-     * Persists a set of key => value pairs in the cache, with an optional TTL.
-     *
-     * @param iterable               $values A list of key => value pairs for a multiple-set operation.
-     * @param null|int|\DateInterval $ttl    Optional. The TTL value of this item. If no value is sent and
-     *                                       the driver supports TTL then the library may set a default value
-     *                                       for it or let the driver take care of that.
-     *
-     * @return bool True on success and false on failure.
-     *
-     * @throws \Psr\SimpleCache\InvalidArgumentException
-     *   MUST be thrown if $values is neither an array nor a Traversable,
-     *   or if any of the $values are not a legal value.
-     */
-    public function setMultiple($values, $ttl = null);
-
-    /**
-     * Deletes multiple cache items in a single operation.
-     *
-     * @param iterable $keys A list of string-based keys to be deleted.
-     *
-     * @return bool True if the items were successfully removed. False if there was an error.
-     *
-     * @throws \Psr\SimpleCache\InvalidArgumentException
-     *   MUST be thrown if $keys is neither an array nor a Traversable,
-     *   or if any of the $keys are not a legal value.
-     */
-    public function deleteMultiple($keys);
-
-    /**
-     * Determines whether an item is present in the cache.
-     *
-     * NOTE: It is recommended that has() is only to be used for cache warming type purposes
-     * and not to be used within your live applications operations for get/set, as this method
-     * is subject to a race condition where your has() will return true and immediately after,
-     * another script can remove it making the state of your app out of date.
-     *
-     * @param string $key The cache item key.
-     *
-     * @return bool
-     *
-     * @throws \Psr\SimpleCache\InvalidArgumentException
-     *   MUST be thrown if the $key string is not a legal value.
-     */
-    public function has($key);
-}
diff --git a/advancedcontentfilter/vendor/psr/simple-cache/src/InvalidArgumentException.php b/advancedcontentfilter/vendor/psr/simple-cache/src/InvalidArgumentException.php
deleted file mode 100644
index 6a9524a2..00000000
--- a/advancedcontentfilter/vendor/psr/simple-cache/src/InvalidArgumentException.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Psr\SimpleCache;
-
-/**
- * Exception interface for invalid cache arguments.
- *
- * When an invalid argument is passed it must throw an exception which implements
- * this interface
- */
-interface InvalidArgumentException extends CacheException
-{
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/.gitignore b/advancedcontentfilter/vendor/symfony/cache/.gitignore
deleted file mode 100644
index 5414c2c6..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-composer.lock
-phpunit.xml
-vendor/
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/AbstractRedisAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/AbstractRedisAdapterTest.php
deleted file mode 100644
index 0e8ed001..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/AbstractRedisAdapterTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Symfony\Component\Cache\Adapter\RedisAdapter;
-
-abstract class AbstractRedisAdapterTest extends AdapterTestCase
-{
-    protected $skippedTests = [
-        'testExpiration' => 'Testing expiration slows down the test suite',
-        'testHasItemReturnsFalseWhenDeferredItemIsExpired' => 'Testing expiration slows down the test suite',
-        'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
-    ];
-
-    protected static $redis;
-
-    public function createCachePool($defaultLifetime = 0)
-    {
-        return new RedisAdapter(self::$redis, str_replace('\\', '.', __CLASS__), $defaultLifetime);
-    }
-
-    public static function setUpBeforeClass()
-    {
-        if (!\extension_loaded('redis')) {
-            self::markTestSkipped('Extension redis required.');
-        }
-        try {
-            (new \Redis())->connect(getenv('REDIS_HOST'));
-        } catch (\Exception $e) {
-            self::markTestSkipped($e->getMessage());
-        }
-    }
-
-    public static function tearDownAfterClass()
-    {
-        self::$redis = null;
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/AdapterTestCase.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/AdapterTestCase.php
deleted file mode 100644
index 5758a286..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/AdapterTestCase.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Cache\IntegrationTests\CachePoolTest;
-use Psr\Cache\CacheItemPoolInterface;
-use Symfony\Component\Cache\PruneableInterface;
-
-abstract class AdapterTestCase extends CachePoolTest
-{
-    protected function setUp()
-    {
-        parent::setUp();
-
-        if (!\array_key_exists('testDeferredSaveWithoutCommit', $this->skippedTests) && \defined('HHVM_VERSION')) {
-            $this->skippedTests['testDeferredSaveWithoutCommit'] = 'Destructors are called late on HHVM.';
-        }
-
-        if (!\array_key_exists('testPrune', $this->skippedTests) && !$this->createCachePool() instanceof PruneableInterface) {
-            $this->skippedTests['testPrune'] = 'Not a pruneable cache pool.';
-        }
-    }
-
-    public function testDefaultLifeTime()
-    {
-        if (isset($this->skippedTests[__FUNCTION__])) {
-            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
-        }
-
-        $cache = $this->createCachePool(2);
-
-        $item = $cache->getItem('key.dlt');
-        $item->set('value');
-        $cache->save($item);
-        sleep(1);
-
-        $item = $cache->getItem('key.dlt');
-        $this->assertTrue($item->isHit());
-
-        sleep(2);
-        $item = $cache->getItem('key.dlt');
-        $this->assertFalse($item->isHit());
-    }
-
-    public function testExpiration()
-    {
-        if (isset($this->skippedTests[__FUNCTION__])) {
-            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
-        }
-
-        $cache = $this->createCachePool();
-        $cache->save($cache->getItem('k1')->set('v1')->expiresAfter(2));
-        $cache->save($cache->getItem('k2')->set('v2')->expiresAfter(366 * 86400));
-
-        sleep(3);
-        $item = $cache->getItem('k1');
-        $this->assertFalse($item->isHit());
-        $this->assertNull($item->get(), "Item's value must be null when isHit() is false.");
-
-        $item = $cache->getItem('k2');
-        $this->assertTrue($item->isHit());
-        $this->assertSame('v2', $item->get());
-    }
-
-    public function testNotUnserializable()
-    {
-        if (isset($this->skippedTests[__FUNCTION__])) {
-            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
-        }
-
-        $cache = $this->createCachePool();
-
-        $item = $cache->getItem('foo');
-        $cache->save($item->set(new NotUnserializable()));
-
-        $item = $cache->getItem('foo');
-        $this->assertFalse($item->isHit());
-
-        foreach ($cache->getItems(['foo']) as $item) {
-        }
-        $cache->save($item->set(new NotUnserializable()));
-
-        foreach ($cache->getItems(['foo']) as $item) {
-        }
-        $this->assertFalse($item->isHit());
-    }
-
-    public function testPrune()
-    {
-        if (isset($this->skippedTests[__FUNCTION__])) {
-            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
-        }
-
-        if (!method_exists($this, 'isPruned')) {
-            $this->fail('Test classes for pruneable caches must implement `isPruned($cache, $name)` method.');
-        }
-
-        /** @var PruneableInterface|CacheItemPoolInterface $cache */
-        $cache = $this->createCachePool();
-
-        $doSet = function ($name, $value, \DateInterval $expiresAfter = null) use ($cache) {
-            $item = $cache->getItem($name);
-            $item->set($value);
-
-            if ($expiresAfter) {
-                $item->expiresAfter($expiresAfter);
-            }
-
-            $cache->save($item);
-        };
-
-        $doSet('foo', 'foo-val', new \DateInterval('PT05S'));
-        $doSet('bar', 'bar-val', new \DateInterval('PT10S'));
-        $doSet('baz', 'baz-val', new \DateInterval('PT15S'));
-        $doSet('qux', 'qux-val', new \DateInterval('PT20S'));
-
-        sleep(30);
-        $cache->prune();
-        $this->assertTrue($this->isPruned($cache, 'foo'));
-        $this->assertTrue($this->isPruned($cache, 'bar'));
-        $this->assertTrue($this->isPruned($cache, 'baz'));
-        $this->assertTrue($this->isPruned($cache, 'qux'));
-
-        $doSet('foo', 'foo-val');
-        $doSet('bar', 'bar-val', new \DateInterval('PT20S'));
-        $doSet('baz', 'baz-val', new \DateInterval('PT40S'));
-        $doSet('qux', 'qux-val', new \DateInterval('PT80S'));
-
-        $cache->prune();
-        $this->assertFalse($this->isPruned($cache, 'foo'));
-        $this->assertFalse($this->isPruned($cache, 'bar'));
-        $this->assertFalse($this->isPruned($cache, 'baz'));
-        $this->assertFalse($this->isPruned($cache, 'qux'));
-
-        sleep(30);
-        $cache->prune();
-        $this->assertFalse($this->isPruned($cache, 'foo'));
-        $this->assertTrue($this->isPruned($cache, 'bar'));
-        $this->assertFalse($this->isPruned($cache, 'baz'));
-        $this->assertFalse($this->isPruned($cache, 'qux'));
-
-        sleep(30);
-        $cache->prune();
-        $this->assertFalse($this->isPruned($cache, 'foo'));
-        $this->assertTrue($this->isPruned($cache, 'baz'));
-        $this->assertFalse($this->isPruned($cache, 'qux'));
-
-        sleep(30);
-        $cache->prune();
-        $this->assertFalse($this->isPruned($cache, 'foo'));
-        $this->assertTrue($this->isPruned($cache, 'qux'));
-    }
-}
-
-class NotUnserializable implements \Serializable
-{
-    public function serialize()
-    {
-        return serialize(123);
-    }
-
-    public function unserialize($ser)
-    {
-        throw new \Exception(__CLASS__);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ApcuAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ApcuAdapterTest.php
deleted file mode 100644
index f55a1b9b..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ApcuAdapterTest.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Psr\Log\NullLogger;
-use Symfony\Component\Cache\Adapter\ApcuAdapter;
-
-class ApcuAdapterTest extends AdapterTestCase
-{
-    protected $skippedTests = [
-        'testExpiration' => 'Testing expiration slows down the test suite',
-        'testHasItemReturnsFalseWhenDeferredItemIsExpired' => 'Testing expiration slows down the test suite',
-        'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
-    ];
-
-    public function createCachePool($defaultLifetime = 0)
-    {
-        if (!\function_exists('apcu_fetch') || !filter_var(ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN)) {
-            $this->markTestSkipped('APCu extension is required.');
-        }
-        if ('cli' === \PHP_SAPI && !filter_var(ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN)) {
-            if ('testWithCliSapi' !== $this->getName()) {
-                $this->markTestSkipped('apc.enable_cli=1 is required.');
-            }
-        }
-        if ('\\' === \DIRECTORY_SEPARATOR) {
-            $this->markTestSkipped('Fails transiently on Windows.');
-        }
-
-        return new ApcuAdapter(str_replace('\\', '.', __CLASS__), $defaultLifetime);
-    }
-
-    public function testUnserializable()
-    {
-        $pool = $this->createCachePool();
-
-        $item = $pool->getItem('foo');
-        $item->set(function () {});
-
-        $this->assertFalse($pool->save($item));
-
-        $item = $pool->getItem('foo');
-        $this->assertFalse($item->isHit());
-    }
-
-    public function testVersion()
-    {
-        $namespace = str_replace('\\', '.', static::class);
-
-        $pool1 = new ApcuAdapter($namespace, 0, 'p1');
-
-        $item = $pool1->getItem('foo');
-        $this->assertFalse($item->isHit());
-        $this->assertTrue($pool1->save($item->set('bar')));
-
-        $item = $pool1->getItem('foo');
-        $this->assertTrue($item->isHit());
-        $this->assertSame('bar', $item->get());
-
-        $pool2 = new ApcuAdapter($namespace, 0, 'p2');
-
-        $item = $pool2->getItem('foo');
-        $this->assertFalse($item->isHit());
-        $this->assertNull($item->get());
-
-        $item = $pool1->getItem('foo');
-        $this->assertFalse($item->isHit());
-        $this->assertNull($item->get());
-    }
-
-    public function testNamespace()
-    {
-        $namespace = str_replace('\\', '.', static::class);
-
-        $pool1 = new ApcuAdapter($namespace.'_1', 0, 'p1');
-
-        $item = $pool1->getItem('foo');
-        $this->assertFalse($item->isHit());
-        $this->assertTrue($pool1->save($item->set('bar')));
-
-        $item = $pool1->getItem('foo');
-        $this->assertTrue($item->isHit());
-        $this->assertSame('bar', $item->get());
-
-        $pool2 = new ApcuAdapter($namespace.'_2', 0, 'p1');
-
-        $item = $pool2->getItem('foo');
-        $this->assertFalse($item->isHit());
-        $this->assertNull($item->get());
-
-        $item = $pool1->getItem('foo');
-        $this->assertTrue($item->isHit());
-        $this->assertSame('bar', $item->get());
-    }
-
-    public function testWithCliSapi()
-    {
-        try {
-            // disable PHPUnit error handler to mimic a production environment
-            $isCalled = false;
-            set_error_handler(function () use (&$isCalled) {
-                $isCalled = true;
-            });
-            $pool = new ApcuAdapter(str_replace('\\', '.', __CLASS__));
-            $pool->setLogger(new NullLogger());
-
-            $item = $pool->getItem('foo');
-            $item->isHit();
-            $pool->save($item->set('bar'));
-            $this->assertFalse($isCalled);
-        } finally {
-            restore_error_handler();
-        }
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ArrayAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ArrayAdapterTest.php
deleted file mode 100644
index e6adc9d0..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ArrayAdapterTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Symfony\Component\Cache\Adapter\ArrayAdapter;
-
-/**
- * @group time-sensitive
- */
-class ArrayAdapterTest extends AdapterTestCase
-{
-    protected $skippedTests = [
-        'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayAdapter is not.',
-        'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayAdapter is not.',
-    ];
-
-    public function createCachePool($defaultLifetime = 0)
-    {
-        return new ArrayAdapter($defaultLifetime);
-    }
-
-    public function testGetValuesHitAndMiss()
-    {
-        /** @var ArrayAdapter $cache */
-        $cache = $this->createCachePool();
-
-        // Hit
-        $item = $cache->getItem('foo');
-        $item->set('4711');
-        $cache->save($item);
-
-        $fooItem = $cache->getItem('foo');
-        $this->assertTrue($fooItem->isHit());
-        $this->assertEquals('4711', $fooItem->get());
-
-        // Miss (should be present as NULL in $values)
-        $cache->getItem('bar');
-
-        $values = $cache->getValues();
-
-        $this->assertCount(2, $values);
-        $this->assertArrayHasKey('foo', $values);
-        $this->assertSame(serialize('4711'), $values['foo']);
-        $this->assertArrayHasKey('bar', $values);
-        $this->assertNull($values['bar']);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ChainAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ChainAdapterTest.php
deleted file mode 100644
index be811d6f..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ChainAdapterTest.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use PHPUnit\Framework\MockObject\MockObject;
-use Symfony\Component\Cache\Adapter\AdapterInterface;
-use Symfony\Component\Cache\Adapter\ArrayAdapter;
-use Symfony\Component\Cache\Adapter\ChainAdapter;
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
-use Symfony\Component\Cache\PruneableInterface;
-use Symfony\Component\Cache\Tests\Fixtures\ExternalAdapter;
-
-/**
- * @author Kévin Dunglas <dunglas@gmail.com>
- * @group time-sensitive
- */
-class ChainAdapterTest extends AdapterTestCase
-{
-    public function createCachePool($defaultLifetime = 0)
-    {
-        return new ChainAdapter([new ArrayAdapter($defaultLifetime), new ExternalAdapter($defaultLifetime), new FilesystemAdapter('', $defaultLifetime)], $defaultLifetime);
-    }
-
-    public function testEmptyAdaptersException()
-    {
-        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('At least one adapter must be specified.');
-        new ChainAdapter([]);
-    }
-
-    public function testInvalidAdapterException()
-    {
-        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('The class "stdClass" does not implement');
-        new ChainAdapter([new \stdClass()]);
-    }
-
-    public function testPrune()
-    {
-        if (isset($this->skippedTests[__FUNCTION__])) {
-            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
-        }
-
-        $cache = new ChainAdapter([
-            $this->getPruneableMock(),
-            $this->getNonPruneableMock(),
-            $this->getPruneableMock(),
-        ]);
-        $this->assertTrue($cache->prune());
-
-        $cache = new ChainAdapter([
-            $this->getPruneableMock(),
-            $this->getFailingPruneableMock(),
-            $this->getPruneableMock(),
-        ]);
-        $this->assertFalse($cache->prune());
-    }
-
-    public function testMultipleCachesExpirationWhenCommonTtlIsNotSet()
-    {
-        if (isset($this->skippedTests[__FUNCTION__])) {
-            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
-        }
-
-        $adapter1 = new ArrayAdapter(4);
-        $adapter2 = new ArrayAdapter(2);
-
-        $cache = new ChainAdapter([$adapter1, $adapter2]);
-
-        $cache->save($cache->getItem('key')->set('value'));
-
-        $item = $adapter1->getItem('key');
-        $this->assertTrue($item->isHit());
-        $this->assertEquals('value', $item->get());
-
-        $item = $adapter2->getItem('key');
-        $this->assertTrue($item->isHit());
-        $this->assertEquals('value', $item->get());
-
-        sleep(2);
-
-        $item = $adapter1->getItem('key');
-        $this->assertTrue($item->isHit());
-        $this->assertEquals('value', $item->get());
-
-        $item = $adapter2->getItem('key');
-        $this->assertFalse($item->isHit());
-
-        sleep(2);
-
-        $item = $adapter1->getItem('key');
-        $this->assertFalse($item->isHit());
-
-        $adapter2->save($adapter2->getItem('key1')->set('value1'));
-
-        $item = $cache->getItem('key1');
-        $this->assertTrue($item->isHit());
-        $this->assertEquals('value1', $item->get());
-
-        sleep(2);
-
-        $item = $adapter1->getItem('key1');
-        $this->assertTrue($item->isHit());
-        $this->assertEquals('value1', $item->get());
-
-        $item = $adapter2->getItem('key1');
-        $this->assertFalse($item->isHit());
-
-        sleep(2);
-
-        $item = $adapter1->getItem('key1');
-        $this->assertFalse($item->isHit());
-    }
-
-    public function testMultipleCachesExpirationWhenCommonTtlIsSet()
-    {
-        if (isset($this->skippedTests[__FUNCTION__])) {
-            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
-        }
-
-        $adapter1 = new ArrayAdapter(4);
-        $adapter2 = new ArrayAdapter(2);
-
-        $cache = new ChainAdapter([$adapter1, $adapter2], 6);
-
-        $cache->save($cache->getItem('key')->set('value'));
-
-        $item = $adapter1->getItem('key');
-        $this->assertTrue($item->isHit());
-        $this->assertEquals('value', $item->get());
-
-        $item = $adapter2->getItem('key');
-        $this->assertTrue($item->isHit());
-        $this->assertEquals('value', $item->get());
-
-        sleep(2);
-
-        $item = $adapter1->getItem('key');
-        $this->assertTrue($item->isHit());
-        $this->assertEquals('value', $item->get());
-
-        $item = $adapter2->getItem('key');
-        $this->assertFalse($item->isHit());
-
-        sleep(2);
-
-        $item = $adapter1->getItem('key');
-        $this->assertFalse($item->isHit());
-
-        $adapter2->save($adapter2->getItem('key1')->set('value1'));
-
-        $item = $cache->getItem('key1');
-        $this->assertTrue($item->isHit());
-        $this->assertEquals('value1', $item->get());
-
-        sleep(2);
-
-        $item = $adapter1->getItem('key1');
-        $this->assertTrue($item->isHit());
-        $this->assertEquals('value1', $item->get());
-
-        $item = $adapter2->getItem('key1');
-        $this->assertFalse($item->isHit());
-
-        sleep(2);
-
-        $item = $adapter1->getItem('key1');
-        $this->assertTrue($item->isHit());
-        $this->assertEquals('value1', $item->get());
-
-        sleep(2);
-
-        $item = $adapter1->getItem('key1');
-        $this->assertFalse($item->isHit());
-    }
-
-    /**
-     * @return MockObject|PruneableCacheInterface
-     */
-    private function getPruneableMock()
-    {
-        $pruneable = $this
-            ->getMockBuilder(PruneableCacheInterface::class)
-            ->getMock();
-
-        $pruneable
-            ->expects($this->atLeastOnce())
-            ->method('prune')
-            ->willReturn(true);
-
-        return $pruneable;
-    }
-
-    /**
-     * @return MockObject|PruneableCacheInterface
-     */
-    private function getFailingPruneableMock()
-    {
-        $pruneable = $this
-            ->getMockBuilder(PruneableCacheInterface::class)
-            ->getMock();
-
-        $pruneable
-            ->expects($this->atLeastOnce())
-            ->method('prune')
-            ->willReturn(false);
-
-        return $pruneable;
-    }
-
-    /**
-     * @return MockObject|AdapterInterface
-     */
-    private function getNonPruneableMock()
-    {
-        return $this
-            ->getMockBuilder(AdapterInterface::class)
-            ->getMock();
-    }
-}
-
-interface PruneableCacheInterface extends PruneableInterface, AdapterInterface
-{
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/DoctrineAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/DoctrineAdapterTest.php
deleted file mode 100644
index 8f520cb5..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/DoctrineAdapterTest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Symfony\Component\Cache\Adapter\DoctrineAdapter;
-use Symfony\Component\Cache\Tests\Fixtures\ArrayCache;
-
-/**
- * @group time-sensitive
- */
-class DoctrineAdapterTest extends AdapterTestCase
-{
-    protected $skippedTests = [
-        'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayCache is not.',
-        'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayCache is not.',
-        'testNotUnserializable' => 'ArrayCache does not use serialize/unserialize',
-    ];
-
-    public function createCachePool($defaultLifetime = 0)
-    {
-        return new DoctrineAdapter(new ArrayCache($defaultLifetime), '', $defaultLifetime);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/FilesystemAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/FilesystemAdapterTest.php
deleted file mode 100644
index fa830682..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/FilesystemAdapterTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Psr\Cache\CacheItemPoolInterface;
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
-
-/**
- * @group time-sensitive
- */
-class FilesystemAdapterTest extends AdapterTestCase
-{
-    public function createCachePool($defaultLifetime = 0)
-    {
-        return new FilesystemAdapter('', $defaultLifetime);
-    }
-
-    public static function tearDownAfterClass()
-    {
-        self::rmdir(sys_get_temp_dir().'/symfony-cache');
-    }
-
-    public static function rmdir($dir)
-    {
-        if (!file_exists($dir)) {
-            return;
-        }
-        if (!$dir || 0 !== strpos(\dirname($dir), sys_get_temp_dir())) {
-            throw new \Exception(__METHOD__."() operates only on subdirs of system's temp dir");
-        }
-        $children = new \RecursiveIteratorIterator(
-            new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
-            \RecursiveIteratorIterator::CHILD_FIRST
-        );
-        foreach ($children as $child) {
-            if ($child->isDir()) {
-                rmdir($child);
-            } else {
-                unlink($child);
-            }
-        }
-        rmdir($dir);
-    }
-
-    protected function isPruned(CacheItemPoolInterface $cache, $name)
-    {
-        $getFileMethod = (new \ReflectionObject($cache))->getMethod('getFile');
-        $getFileMethod->setAccessible(true);
-
-        return !file_exists($getFileMethod->invoke($cache, $name));
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/MaxIdLengthAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/MaxIdLengthAdapterTest.php
deleted file mode 100644
index 536e2c2d..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/MaxIdLengthAdapterTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\Cache\Adapter\AbstractAdapter;
-
-class MaxIdLengthAdapterTest extends TestCase
-{
-    public function testLongKey()
-    {
-        $cache = $this->getMockBuilder(MaxIdLengthAdapter::class)
-            ->setConstructorArgs([str_repeat('-', 10)])
-            ->setMethods(['doHave', 'doFetch', 'doDelete', 'doSave', 'doClear'])
-            ->getMock();
-
-        $cache->expects($this->exactly(2))
-            ->method('doHave')
-            ->withConsecutive(
-                [$this->equalTo('----------:0GTYWa9n4ed8vqNlOT2iEr:')],
-                [$this->equalTo('----------:---------------------------------------')]
-            );
-
-        $cache->hasItem(str_repeat('-', 40));
-        $cache->hasItem(str_repeat('-', 39));
-    }
-
-    public function testLongKeyVersioning()
-    {
-        $cache = $this->getMockBuilder(MaxIdLengthAdapter::class)
-            ->setConstructorArgs([str_repeat('-', 26)])
-            ->getMock();
-
-        $cache
-            ->method('doFetch')
-            ->willReturn(['2:']);
-
-        $reflectionClass = new \ReflectionClass(AbstractAdapter::class);
-
-        $reflectionMethod = $reflectionClass->getMethod('getId');
-        $reflectionMethod->setAccessible(true);
-
-        // No versioning enabled
-        $this->assertEquals('--------------------------:------------', $reflectionMethod->invokeArgs($cache, [str_repeat('-', 12)]));
-        $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 12)])));
-        $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 23)])));
-        $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 40)])));
-
-        $reflectionProperty = $reflectionClass->getProperty('versioningIsEnabled');
-        $reflectionProperty->setAccessible(true);
-        $reflectionProperty->setValue($cache, true);
-
-        // Versioning enabled
-        $this->assertEquals('--------------------------:2:------------', $reflectionMethod->invokeArgs($cache, [str_repeat('-', 12)]));
-        $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 12)])));
-        $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 23)])));
-        $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 40)])));
-    }
-
-    public function testTooLongNamespace()
-    {
-        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Namespace must be 26 chars max, 40 given ("----------------------------------------")');
-        $this->getMockBuilder(MaxIdLengthAdapter::class)
-            ->setConstructorArgs([str_repeat('-', 40)])
-            ->getMock();
-    }
-}
-
-abstract class MaxIdLengthAdapter extends AbstractAdapter
-{
-    protected $maxIdLength = 50;
-
-    public function __construct($ns)
-    {
-        parent::__construct($ns);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/MemcachedAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/MemcachedAdapterTest.php
deleted file mode 100644
index a9a397dd..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/MemcachedAdapterTest.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Symfony\Component\Cache\Adapter\AbstractAdapter;
-use Symfony\Component\Cache\Adapter\MemcachedAdapter;
-
-class MemcachedAdapterTest extends AdapterTestCase
-{
-    protected $skippedTests = [
-        'testHasItemReturnsFalseWhenDeferredItemIsExpired' => 'Testing expiration slows down the test suite',
-        'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
-    ];
-
-    protected static $client;
-
-    public static function setUpBeforeClass()
-    {
-        if (!MemcachedAdapter::isSupported()) {
-            self::markTestSkipped('Extension memcached >=2.2.0 required.');
-        }
-        self::$client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['binary_protocol' => false]);
-        self::$client->get('foo');
-        $code = self::$client->getResultCode();
-
-        if (\Memcached::RES_SUCCESS !== $code && \Memcached::RES_NOTFOUND !== $code) {
-            self::markTestSkipped('Memcached error: '.strtolower(self::$client->getResultMessage()));
-        }
-    }
-
-    public function createCachePool($defaultLifetime = 0)
-    {
-        $client = $defaultLifetime ? AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST')) : self::$client;
-
-        return new MemcachedAdapter($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
-    }
-
-    public function testOptions()
-    {
-        $client = MemcachedAdapter::createConnection([], [
-            'libketama_compatible' => false,
-            'distribution' => 'modula',
-            'compression' => true,
-            'serializer' => 'php',
-            'hash' => 'md5',
-        ]);
-
-        $this->assertSame(\Memcached::SERIALIZER_PHP, $client->getOption(\Memcached::OPT_SERIALIZER));
-        $this->assertSame(\Memcached::HASH_MD5, $client->getOption(\Memcached::OPT_HASH));
-        $this->assertTrue($client->getOption(\Memcached::OPT_COMPRESSION));
-        $this->assertSame(0, $client->getOption(\Memcached::OPT_LIBKETAMA_COMPATIBLE));
-        $this->assertSame(\Memcached::DISTRIBUTION_MODULA, $client->getOption(\Memcached::OPT_DISTRIBUTION));
-    }
-
-    /**
-     * @dataProvider provideBadOptions
-     */
-    public function testBadOptions($name, $value)
-    {
-        if (\PHP_VERSION_ID < 80000) {
-            $this->expectException('ErrorException');
-            $this->expectExceptionMessage('constant(): Couldn\'t find constant Memcached::');
-        } else {
-            $this->expectException('Error');
-            $this->expectExceptionMessage('Undefined constant Memcached::');
-        }
-
-        MemcachedAdapter::createConnection([], [$name => $value]);
-    }
-
-    public function provideBadOptions()
-    {
-        return [
-            ['foo', 'bar'],
-            ['hash', 'zyx'],
-            ['serializer', 'zyx'],
-            ['distribution', 'zyx'],
-        ];
-    }
-
-    public function testDefaultOptions()
-    {
-        $this->assertTrue(MemcachedAdapter::isSupported());
-
-        $client = MemcachedAdapter::createConnection([]);
-
-        $this->assertTrue($client->getOption(\Memcached::OPT_COMPRESSION));
-        $this->assertSame(1, $client->getOption(\Memcached::OPT_BINARY_PROTOCOL));
-        $this->assertSame(1, $client->getOption(\Memcached::OPT_TCP_NODELAY));
-        $this->assertSame(1, $client->getOption(\Memcached::OPT_LIBKETAMA_COMPATIBLE));
-    }
-
-    public function testOptionSerializer()
-    {
-        $this->expectException('Symfony\Component\Cache\Exception\CacheException');
-        $this->expectExceptionMessage('MemcachedAdapter: "serializer" option must be "php" or "igbinary".');
-        if (!\Memcached::HAVE_JSON) {
-            $this->markTestSkipped('Memcached::HAVE_JSON required');
-        }
-
-        new MemcachedAdapter(MemcachedAdapter::createConnection([], ['serializer' => 'json']));
-    }
-
-    /**
-     * @dataProvider provideServersSetting
-     */
-    public function testServersSetting($dsn, $host, $port)
-    {
-        $client1 = MemcachedAdapter::createConnection($dsn);
-        $client2 = MemcachedAdapter::createConnection([$dsn]);
-        $client3 = MemcachedAdapter::createConnection([[$host, $port]]);
-        $expect = [
-            'host' => $host,
-            'port' => $port,
-        ];
-
-        $f = function ($s) { return ['host' => $s['host'], 'port' => $s['port']]; };
-        $this->assertSame([$expect], array_map($f, $client1->getServerList()));
-        $this->assertSame([$expect], array_map($f, $client2->getServerList()));
-        $this->assertSame([$expect], array_map($f, $client3->getServerList()));
-    }
-
-    public function provideServersSetting()
-    {
-        yield [
-            'memcached://127.0.0.1/50',
-            '127.0.0.1',
-            11211,
-        ];
-        yield [
-            'memcached://localhost:11222?weight=25',
-            'localhost',
-            11222,
-        ];
-        if (filter_var(ini_get('memcached.use_sasl'), \FILTER_VALIDATE_BOOLEAN)) {
-            yield [
-                'memcached://user:password@127.0.0.1?weight=50',
-                '127.0.0.1',
-                11211,
-            ];
-        }
-        yield [
-            'memcached:///var/run/memcached.sock?weight=25',
-            '/var/run/memcached.sock',
-            0,
-        ];
-        yield [
-            'memcached:///var/local/run/memcached.socket?weight=25',
-            '/var/local/run/memcached.socket',
-            0,
-        ];
-        if (filter_var(ini_get('memcached.use_sasl'), \FILTER_VALIDATE_BOOLEAN)) {
-            yield [
-                'memcached://user:password@/var/local/run/memcached.socket?weight=25',
-                '/var/local/run/memcached.socket',
-                0,
-            ];
-        }
-    }
-
-    /**
-     * @dataProvider provideDsnWithOptions
-     */
-    public function testDsnWithOptions($dsn, array $options, array $expectedOptions)
-    {
-        $client = MemcachedAdapter::createConnection($dsn, $options);
-
-        foreach ($expectedOptions as $option => $expect) {
-            $this->assertSame($expect, $client->getOption($option));
-        }
-    }
-
-    public function provideDsnWithOptions()
-    {
-        if (!class_exists('\Memcached')) {
-            self::markTestSkipped('Extension memcached required.');
-        }
-
-        yield [
-            'memcached://localhost:11222?retry_timeout=10',
-            [\Memcached::OPT_RETRY_TIMEOUT => 8],
-            [\Memcached::OPT_RETRY_TIMEOUT => 10],
-        ];
-        yield [
-            'memcached://localhost:11222?socket_recv_size=1&socket_send_size=2',
-            [\Memcached::OPT_RETRY_TIMEOUT => 8],
-            [\Memcached::OPT_SOCKET_RECV_SIZE => 1, \Memcached::OPT_SOCKET_SEND_SIZE => 2, \Memcached::OPT_RETRY_TIMEOUT => 8],
-        ];
-    }
-
-    public function testClear()
-    {
-        $this->assertTrue($this->createCachePool()->clear());
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/NamespacedProxyAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/NamespacedProxyAdapterTest.php
deleted file mode 100644
index c2714033..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/NamespacedProxyAdapterTest.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Symfony\Component\Cache\Adapter\ArrayAdapter;
-use Symfony\Component\Cache\Adapter\ProxyAdapter;
-
-/**
- * @group time-sensitive
- */
-class NamespacedProxyAdapterTest extends ProxyAdapterTest
-{
-    public function createCachePool($defaultLifetime = 0)
-    {
-        return new ProxyAdapter(new ArrayAdapter($defaultLifetime), 'foo', $defaultLifetime);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/NullAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/NullAdapterTest.php
deleted file mode 100644
index b771fa0e..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/NullAdapterTest.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use PHPUnit\Framework\TestCase;
-use Psr\Cache\CacheItemInterface;
-use Symfony\Component\Cache\Adapter\NullAdapter;
-
-/**
- * @group time-sensitive
- */
-class NullAdapterTest extends TestCase
-{
-    public function createCachePool()
-    {
-        return new NullAdapter();
-    }
-
-    public function testGetItem()
-    {
-        $adapter = $this->createCachePool();
-
-        $item = $adapter->getItem('key');
-        $this->assertFalse($item->isHit());
-        $this->assertNull($item->get(), "Item's value must be null when isHit is false.");
-    }
-
-    public function testHasItem()
-    {
-        $this->assertFalse($this->createCachePool()->hasItem('key'));
-    }
-
-    public function testGetItems()
-    {
-        $adapter = $this->createCachePool();
-
-        $keys = ['foo', 'bar', 'baz', 'biz'];
-
-        /** @var CacheItemInterface[] $items */
-        $items = $adapter->getItems($keys);
-        $count = 0;
-
-        foreach ($items as $key => $item) {
-            $itemKey = $item->getKey();
-
-            $this->assertEquals($itemKey, $key, 'Keys must be preserved when fetching multiple items');
-            $this->assertContains($key, $keys, 'Cache key can not change.');
-            $this->assertFalse($item->isHit());
-
-            // Remove $key for $keys
-            foreach ($keys as $k => $v) {
-                if ($v === $key) {
-                    unset($keys[$k]);
-                }
-            }
-
-            ++$count;
-        }
-
-        $this->assertSame(4, $count);
-    }
-
-    public function testIsHit()
-    {
-        $adapter = $this->createCachePool();
-
-        $item = $adapter->getItem('key');
-        $this->assertFalse($item->isHit());
-    }
-
-    public function testClear()
-    {
-        $this->assertTrue($this->createCachePool()->clear());
-    }
-
-    public function testDeleteItem()
-    {
-        $this->assertTrue($this->createCachePool()->deleteItem('key'));
-    }
-
-    public function testDeleteItems()
-    {
-        $this->assertTrue($this->createCachePool()->deleteItems(['key', 'foo', 'bar']));
-    }
-
-    public function testSave()
-    {
-        $adapter = $this->createCachePool();
-
-        $item = $adapter->getItem('key');
-        $this->assertFalse($item->isHit());
-        $this->assertNull($item->get(), "Item's value must be null when isHit is false.");
-
-        $this->assertFalse($adapter->save($item));
-    }
-
-    public function testDeferredSave()
-    {
-        $adapter = $this->createCachePool();
-
-        $item = $adapter->getItem('key');
-        $this->assertFalse($item->isHit());
-        $this->assertNull($item->get(), "Item's value must be null when isHit is false.");
-
-        $this->assertFalse($adapter->saveDeferred($item));
-    }
-
-    public function testCommit()
-    {
-        $adapter = $this->createCachePool();
-
-        $item = $adapter->getItem('key');
-        $this->assertFalse($item->isHit());
-        $this->assertNull($item->get(), "Item's value must be null when isHit is false.");
-
-        $this->assertFalse($adapter->saveDeferred($item));
-        $this->assertFalse($this->createCachePool()->commit());
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PdoAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PdoAdapterTest.php
deleted file mode 100644
index dd2a9118..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PdoAdapterTest.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Symfony\Component\Cache\Adapter\PdoAdapter;
-use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
-
-/**
- * @group time-sensitive
- */
-class PdoAdapterTest extends AdapterTestCase
-{
-    use PdoPruneableTrait;
-
-    protected static $dbFile;
-
-    public static function setUpBeforeClass()
-    {
-        if (!\extension_loaded('pdo_sqlite')) {
-            self::markTestSkipped('Extension pdo_sqlite required.');
-        }
-
-        self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
-
-        $pool = new PdoAdapter('sqlite:'.self::$dbFile);
-        $pool->createTable();
-    }
-
-    public static function tearDownAfterClass()
-    {
-        @unlink(self::$dbFile);
-    }
-
-    public function createCachePool($defaultLifetime = 0)
-    {
-        return new PdoAdapter('sqlite:'.self::$dbFile, 'ns', $defaultLifetime);
-    }
-
-    public function testCleanupExpiredItems()
-    {
-        $pdo = new \PDO('sqlite:'.self::$dbFile);
-
-        $getCacheItemCount = function () use ($pdo) {
-            return (int) $pdo->query('SELECT COUNT(*) FROM cache_items')->fetch(\PDO::FETCH_COLUMN);
-        };
-
-        $this->assertSame(0, $getCacheItemCount());
-
-        $cache = $this->createCachePool();
-
-        $item = $cache->getItem('some_nice_key');
-        $item->expiresAfter(1);
-        $item->set(1);
-
-        $cache->save($item);
-        $this->assertSame(1, $getCacheItemCount());
-
-        sleep(2);
-
-        $newItem = $cache->getItem($item->getKey());
-        $this->assertFalse($newItem->isHit());
-        $this->assertSame(0, $getCacheItemCount(), 'PDOAdapter must clean up expired items');
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PdoDbalAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PdoDbalAdapterTest.php
deleted file mode 100644
index aa53958c..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PdoDbalAdapterTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Doctrine\DBAL\DriverManager;
-use Symfony\Component\Cache\Adapter\PdoAdapter;
-use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
-
-/**
- * @group time-sensitive
- */
-class PdoDbalAdapterTest extends AdapterTestCase
-{
-    use PdoPruneableTrait;
-
-    protected static $dbFile;
-
-    public static function setUpBeforeClass()
-    {
-        if (!\extension_loaded('pdo_sqlite')) {
-            self::markTestSkipped('Extension pdo_sqlite required.');
-        }
-
-        self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
-
-        $pool = new PdoAdapter(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]));
-        $pool->createTable();
-    }
-
-    public static function tearDownAfterClass()
-    {
-        @unlink(self::$dbFile);
-    }
-
-    public function createCachePool($defaultLifetime = 0)
-    {
-        return new PdoAdapter(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]), '', $defaultLifetime);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterTest.php
deleted file mode 100644
index f88a7187..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterTest.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Psr\Cache\CacheItemInterface;
-use Symfony\Component\Cache\Adapter\NullAdapter;
-use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
-
-/**
- * @group time-sensitive
- */
-class PhpArrayAdapterTest extends AdapterTestCase
-{
-    protected $skippedTests = [
-        'testBasicUsage' => 'PhpArrayAdapter is read-only.',
-        'testBasicUsageWithLongKey' => 'PhpArrayAdapter is read-only.',
-        'testClear' => 'PhpArrayAdapter is read-only.',
-        'testClearWithDeferredItems' => 'PhpArrayAdapter is read-only.',
-        'testDeleteItem' => 'PhpArrayAdapter is read-only.',
-        'testSaveExpired' => 'PhpArrayAdapter is read-only.',
-        'testSaveWithoutExpire' => 'PhpArrayAdapter is read-only.',
-        'testDeferredSave' => 'PhpArrayAdapter is read-only.',
-        'testDeferredSaveWithoutCommit' => 'PhpArrayAdapter is read-only.',
-        'testDeleteItems' => 'PhpArrayAdapter is read-only.',
-        'testDeleteDeferredItem' => 'PhpArrayAdapter is read-only.',
-        'testCommit' => 'PhpArrayAdapter is read-only.',
-        'testSaveDeferredWhenChangingValues' => 'PhpArrayAdapter is read-only.',
-        'testSaveDeferredOverwrite' => 'PhpArrayAdapter is read-only.',
-        'testIsHitDeferred' => 'PhpArrayAdapter is read-only.',
-
-        'testExpiresAt' => 'PhpArrayAdapter does not support expiration.',
-        'testExpiresAtWithNull' => 'PhpArrayAdapter does not support expiration.',
-        'testExpiresAfterWithNull' => 'PhpArrayAdapter does not support expiration.',
-        'testDeferredExpired' => 'PhpArrayAdapter does not support expiration.',
-        'testExpiration' => 'PhpArrayAdapter does not support expiration.',
-
-        'testGetItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
-        'testGetItemsInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
-        'testHasItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
-        'testDeleteItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
-        'testDeleteItemsInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
-
-        'testDefaultLifeTime' => 'PhpArrayAdapter does not allow configuring a default lifetime.',
-        'testPrune' => 'PhpArrayAdapter just proxies',
-    ];
-
-    protected static $file;
-
-    public static function setUpBeforeClass()
-    {
-        self::$file = sys_get_temp_dir().'/symfony-cache/php-array-adapter-test.php';
-    }
-
-    protected function tearDown()
-    {
-        $this->createCachePool()->clear();
-
-        if (file_exists(sys_get_temp_dir().'/symfony-cache')) {
-            FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
-        }
-    }
-
-    public function createCachePool()
-    {
-        return new PhpArrayAdapterWrapper(self::$file, new NullAdapter());
-    }
-
-    public function testStore()
-    {
-        $arrayWithRefs = [];
-        $arrayWithRefs[0] = 123;
-        $arrayWithRefs[1] = &$arrayWithRefs[0];
-
-        $object = (object) [
-            'foo' => 'bar',
-            'foo2' => 'bar2',
-        ];
-
-        $expected = [
-            'null' => null,
-            'serializedString' => serialize($object),
-            'arrayWithRefs' => $arrayWithRefs,
-            'object' => $object,
-            'arrayWithObject' => ['bar' => $object],
-        ];
-
-        $adapter = $this->createCachePool();
-        $adapter->warmUp($expected);
-
-        foreach ($expected as $key => $value) {
-            $this->assertSame(serialize($value), serialize($adapter->getItem($key)->get()), 'Warm up should create a PHP file that OPCache can load in memory');
-        }
-    }
-
-    public function testStoredFile()
-    {
-        $expected = [
-            'integer' => 42,
-            'float' => 42.42,
-            'boolean' => true,
-            'array_simple' => ['foo', 'bar'],
-            'array_associative' => ['foo' => 'bar', 'foo2' => 'bar2'],
-        ];
-
-        $adapter = $this->createCachePool();
-        $adapter->warmUp($expected);
-
-        $values = eval(substr(file_get_contents(self::$file), 6));
-
-        $this->assertSame($expected, $values, 'Warm up should create a PHP file that OPCache can load in memory');
-    }
-}
-
-class PhpArrayAdapterWrapper extends PhpArrayAdapter
-{
-    public function save(CacheItemInterface $item)
-    {
-        \call_user_func(\Closure::bind(function () use ($item) {
-            $this->values[$item->getKey()] = $item->get();
-            $this->warmUp($this->values);
-            $this->values = eval(substr(file_get_contents($this->file), 6));
-        }, $this, PhpArrayAdapter::class));
-
-        return true;
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php
deleted file mode 100644
index 0bfd5c39..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
-use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
-
-/**
- * @group time-sensitive
- */
-class PhpArrayAdapterWithFallbackTest extends AdapterTestCase
-{
-    protected $skippedTests = [
-        'testGetItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
-        'testGetItemsInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
-        'testHasItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
-        'testDeleteItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
-        'testDeleteItemsInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
-        'testPrune' => 'PhpArrayAdapter just proxies',
-    ];
-
-    protected static $file;
-
-    public static function setUpBeforeClass()
-    {
-        self::$file = sys_get_temp_dir().'/symfony-cache/php-array-adapter-test.php';
-    }
-
-    protected function tearDown()
-    {
-        $this->createCachePool()->clear();
-
-        if (file_exists(sys_get_temp_dir().'/symfony-cache')) {
-            FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
-        }
-    }
-
-    public function createCachePool($defaultLifetime = 0)
-    {
-        return new PhpArrayAdapter(self::$file, new FilesystemAdapter('php-array-fallback', $defaultLifetime));
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpFilesAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpFilesAdapterTest.php
deleted file mode 100644
index 247160d5..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpFilesAdapterTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Psr\Cache\CacheItemPoolInterface;
-use Symfony\Component\Cache\Adapter\PhpFilesAdapter;
-
-/**
- * @group time-sensitive
- */
-class PhpFilesAdapterTest extends AdapterTestCase
-{
-    protected $skippedTests = [
-        'testDefaultLifeTime' => 'PhpFilesAdapter does not allow configuring a default lifetime.',
-    ];
-
-    public function createCachePool()
-    {
-        if (!PhpFilesAdapter::isSupported()) {
-            $this->markTestSkipped('OPcache extension is not enabled.');
-        }
-
-        return new PhpFilesAdapter('sf-cache');
-    }
-
-    public static function tearDownAfterClass()
-    {
-        FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
-    }
-
-    protected function isPruned(CacheItemPoolInterface $cache, $name)
-    {
-        $getFileMethod = (new \ReflectionObject($cache))->getMethod('getFile');
-        $getFileMethod->setAccessible(true);
-
-        return !file_exists($getFileMethod->invoke($cache, $name));
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisAdapterTest.php
deleted file mode 100644
index 6aadbf26..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisAdapterTest.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Predis\Connection\StreamConnection;
-use Symfony\Component\Cache\Adapter\RedisAdapter;
-
-class PredisAdapterTest extends AbstractRedisAdapterTest
-{
-    public static function setUpBeforeClass()
-    {
-        parent::setUpBeforeClass();
-        self::$redis = new \Predis\Client(['host' => getenv('REDIS_HOST')]);
-    }
-
-    public function testCreateConnection()
-    {
-        $redisHost = getenv('REDIS_HOST');
-
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost.'/1', ['class' => \Predis\Client::class, 'timeout' => 3]);
-        $this->assertInstanceOf(\Predis\Client::class, $redis);
-
-        $connection = $redis->getConnection();
-        $this->assertInstanceOf(StreamConnection::class, $connection);
-
-        $params = [
-            'scheme' => 'tcp',
-            'host' => $redisHost,
-            'path' => '',
-            'dbindex' => '1',
-            'port' => 6379,
-            'class' => 'Predis\Client',
-            'timeout' => 3,
-            'persistent' => 0,
-            'persistent_id' => null,
-            'read_timeout' => 0,
-            'retry_interval' => 0,
-            'lazy' => false,
-            'database' => '1',
-            'password' => null,
-        ];
-        $this->assertSame($params, $connection->getParameters()->toArray());
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisClusterAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisClusterAdapterTest.php
deleted file mode 100644
index 1afabaf1..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisClusterAdapterTest.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-class PredisClusterAdapterTest extends AbstractRedisAdapterTest
-{
-    public static function setUpBeforeClass()
-    {
-        parent::setUpBeforeClass();
-        self::$redis = new \Predis\Client([['host' => getenv('REDIS_HOST')]]);
-    }
-
-    public static function tearDownAfterClass()
-    {
-        self::$redis = null;
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisRedisClusterAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisRedisClusterAdapterTest.php
deleted file mode 100644
index 5b09919e..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisRedisClusterAdapterTest.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-class PredisRedisClusterAdapterTest extends AbstractRedisAdapterTest
-{
-    public static function setUpBeforeClass()
-    {
-        if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) {
-            self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
-        }
-        self::$redis = new \Predis\Client(explode(' ', $hosts), ['cluster' => 'redis']);
-    }
-
-    public static function tearDownAfterClass()
-    {
-        self::$redis = null;
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ProxyAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ProxyAdapterTest.php
deleted file mode 100644
index 810cb31a..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ProxyAdapterTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Psr\Cache\CacheItemInterface;
-use Symfony\Component\Cache\Adapter\ArrayAdapter;
-use Symfony\Component\Cache\Adapter\ProxyAdapter;
-use Symfony\Component\Cache\CacheItem;
-
-/**
- * @group time-sensitive
- */
-class ProxyAdapterTest extends AdapterTestCase
-{
-    protected $skippedTests = [
-        'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayAdapter is not.',
-        'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayAdapter is not.',
-        'testPrune' => 'ProxyAdapter just proxies',
-    ];
-
-    public function createCachePool($defaultLifetime = 0)
-    {
-        return new ProxyAdapter(new ArrayAdapter(), '', $defaultLifetime);
-    }
-
-    public function testProxyfiedItem()
-    {
-        $this->expectException('Exception');
-        $this->expectExceptionMessage('OK bar');
-        $item = new CacheItem();
-        $pool = new ProxyAdapter(new TestingArrayAdapter($item));
-
-        $proxyItem = $pool->getItem('foo');
-
-        $this->assertNotSame($item, $proxyItem);
-        $pool->save($proxyItem->set('bar'));
-    }
-}
-
-class TestingArrayAdapter extends ArrayAdapter
-{
-    private $item;
-
-    public function __construct(CacheItemInterface $item)
-    {
-        $this->item = $item;
-    }
-
-    public function getItem($key)
-    {
-        return $this->item;
-    }
-
-    public function save(CacheItemInterface $item)
-    {
-        if ($item === $this->item) {
-            throw new \Exception('OK '.$item->get());
-        }
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisAdapterTest.php
deleted file mode 100644
index 6ec6321a..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisAdapterTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Symfony\Component\Cache\Adapter\AbstractAdapter;
-use Symfony\Component\Cache\Adapter\RedisAdapter;
-use Symfony\Component\Cache\Traits\RedisProxy;
-
-class RedisAdapterTest extends AbstractRedisAdapterTest
-{
-    public static function setUpBeforeClass()
-    {
-        parent::setUpBeforeClass();
-        self::$redis = AbstractAdapter::createConnection('redis://'.getenv('REDIS_HOST'), ['lazy' => true]);
-    }
-
-    public function createCachePool($defaultLifetime = 0)
-    {
-        $adapter = parent::createCachePool($defaultLifetime);
-        $this->assertInstanceOf(RedisProxy::class, self::$redis);
-
-        return $adapter;
-    }
-
-    public function testCreateConnection()
-    {
-        $redisHost = getenv('REDIS_HOST');
-
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost);
-        $this->assertInstanceOf(\Redis::class, $redis);
-        $this->assertTrue($redis->isConnected());
-        $this->assertSame(0, $redis->getDbNum());
-
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost.'/2');
-        $this->assertSame(2, $redis->getDbNum());
-
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost, ['timeout' => 3]);
-        $this->assertEquals(3, $redis->getTimeout());
-
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost.'?timeout=4');
-        $this->assertEquals(4, $redis->getTimeout());
-
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost, ['read_timeout' => 5]);
-        $this->assertEquals(5, $redis->getReadTimeout());
-    }
-
-    /**
-     * @dataProvider provideFailedCreateConnection
-     */
-    public function testFailedCreateConnection($dsn)
-    {
-        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Redis connection ');
-        RedisAdapter::createConnection($dsn);
-    }
-
-    public function provideFailedCreateConnection()
-    {
-        return [
-            ['redis://localhost:1234'],
-            ['redis://foo@localhost'],
-            ['redis://localhost/123'],
-        ];
-    }
-
-    /**
-     * @dataProvider provideInvalidCreateConnection
-     */
-    public function testInvalidCreateConnection($dsn)
-    {
-        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Invalid Redis DSN');
-        RedisAdapter::createConnection($dsn);
-    }
-
-    public function provideInvalidCreateConnection()
-    {
-        return [
-            ['foo://localhost'],
-            ['redis://'],
-        ];
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisArrayAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisArrayAdapterTest.php
deleted file mode 100644
index bd9def32..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisArrayAdapterTest.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-class RedisArrayAdapterTest extends AbstractRedisAdapterTest
-{
-    public static function setUpBeforeClass()
-    {
-        parent::setupBeforeClass();
-        if (!class_exists('RedisArray')) {
-            self::markTestSkipped('The RedisArray class is required.');
-        }
-        self::$redis = new \RedisArray([getenv('REDIS_HOST')], ['lazy_connect' => true]);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisClusterAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisClusterAdapterTest.php
deleted file mode 100644
index 9c339d2d..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisClusterAdapterTest.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-class RedisClusterAdapterTest extends AbstractRedisAdapterTest
-{
-    public static function setUpBeforeClass()
-    {
-        if (!class_exists('RedisCluster')) {
-            self::markTestSkipped('The RedisCluster class is required.');
-        }
-        if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) {
-            self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
-        }
-
-        self::$redis = new \RedisCluster(null, explode(' ', $hosts));
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/SimpleCacheAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/SimpleCacheAdapterTest.php
deleted file mode 100644
index d8470a2e..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/SimpleCacheAdapterTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Symfony\Component\Cache\Adapter\SimpleCacheAdapter;
-use Symfony\Component\Cache\Simple\ArrayCache;
-use Symfony\Component\Cache\Simple\FilesystemCache;
-
-/**
- * @group time-sensitive
- */
-class SimpleCacheAdapterTest extends AdapterTestCase
-{
-    protected $skippedTests = [
-        'testPrune' => 'SimpleCache just proxies',
-    ];
-
-    public function createCachePool($defaultLifetime = 0)
-    {
-        return new SimpleCacheAdapter(new FilesystemCache(), '', $defaultLifetime);
-    }
-
-    public function testValidCacheKeyWithNamespace()
-    {
-        $cache = new SimpleCacheAdapter(new ArrayCache(), 'some_namespace', 0);
-        $item = $cache->getItem('my_key');
-        $item->set('someValue');
-        $cache->save($item);
-
-        $this->assertTrue($cache->getItem('my_key')->isHit(), 'Stored item is successfully retrieved.');
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TagAwareAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TagAwareAdapterTest.php
deleted file mode 100644
index 11907a03..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TagAwareAdapterTest.php
+++ /dev/null
@@ -1,338 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use PHPUnit\Framework\MockObject\MockObject;
-use Psr\Cache\CacheItemInterface;
-use Symfony\Component\Cache\Adapter\AdapterInterface;
-use Symfony\Component\Cache\Adapter\ArrayAdapter;
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
-use Symfony\Component\Cache\Adapter\TagAwareAdapter;
-
-/**
- * @group time-sensitive
- */
-class TagAwareAdapterTest extends AdapterTestCase
-{
-    public function createCachePool($defaultLifetime = 0)
-    {
-        return new TagAwareAdapter(new FilesystemAdapter('', $defaultLifetime));
-    }
-
-    public static function tearDownAfterClass()
-    {
-        FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
-    }
-
-    public function testInvalidTag()
-    {
-        $this->expectException('Psr\Cache\InvalidArgumentException');
-        $pool = $this->createCachePool();
-        $item = $pool->getItem('foo');
-        $item->tag(':');
-    }
-
-    public function testInvalidateTags()
-    {
-        $pool = $this->createCachePool();
-
-        $i0 = $pool->getItem('i0');
-        $i1 = $pool->getItem('i1');
-        $i2 = $pool->getItem('i2');
-        $i3 = $pool->getItem('i3');
-        $foo = $pool->getItem('foo');
-
-        $pool->save($i0->tag('bar'));
-        $pool->save($i1->tag('foo'));
-        $pool->save($i2->tag('foo')->tag('bar'));
-        $pool->save($i3->tag('foo')->tag('baz'));
-        $pool->save($foo);
-
-        $pool->invalidateTags(['bar']);
-
-        $this->assertFalse($pool->getItem('i0')->isHit());
-        $this->assertTrue($pool->getItem('i1')->isHit());
-        $this->assertFalse($pool->getItem('i2')->isHit());
-        $this->assertTrue($pool->getItem('i3')->isHit());
-        $this->assertTrue($pool->getItem('foo')->isHit());
-
-        $pool->invalidateTags(['foo']);
-
-        $this->assertFalse($pool->getItem('i1')->isHit());
-        $this->assertFalse($pool->getItem('i3')->isHit());
-        $this->assertTrue($pool->getItem('foo')->isHit());
-
-        $anotherPoolInstance = $this->createCachePool();
-
-        $this->assertFalse($anotherPoolInstance->getItem('i1')->isHit());
-        $this->assertFalse($anotherPoolInstance->getItem('i3')->isHit());
-        $this->assertTrue($anotherPoolInstance->getItem('foo')->isHit());
-    }
-
-    public function testInvalidateCommits()
-    {
-        $pool1 = $this->createCachePool();
-
-        $foo = $pool1->getItem('foo');
-        $foo->tag('tag');
-
-        $pool1->saveDeferred($foo->set('foo'));
-        $pool1->invalidateTags(['tag']);
-
-        $pool2 = $this->createCachePool();
-        $foo = $pool2->getItem('foo');
-
-        $this->assertTrue($foo->isHit());
-    }
-
-    public function testTagsAreCleanedOnSave()
-    {
-        $pool = $this->createCachePool();
-
-        $i = $pool->getItem('k');
-        $pool->save($i->tag('foo'));
-
-        $i = $pool->getItem('k');
-        $pool->save($i->tag('bar'));
-
-        $pool->invalidateTags(['foo']);
-        $this->assertTrue($pool->getItem('k')->isHit());
-    }
-
-    public function testTagsAreCleanedOnDelete()
-    {
-        $pool = $this->createCachePool();
-
-        $i = $pool->getItem('k');
-        $pool->save($i->tag('foo'));
-        $pool->deleteItem('k');
-
-        $pool->save($pool->getItem('k'));
-        $pool->invalidateTags(['foo']);
-
-        $this->assertTrue($pool->getItem('k')->isHit());
-    }
-
-    public function testTagItemExpiry()
-    {
-        $pool = $this->createCachePool(10);
-
-        $item = $pool->getItem('foo');
-        $item->tag(['baz']);
-        $item->expiresAfter(100);
-
-        $pool->save($item);
-        $pool->invalidateTags(['baz']);
-        $this->assertFalse($pool->getItem('foo')->isHit());
-
-        sleep(20);
-
-        $this->assertFalse($pool->getItem('foo')->isHit());
-    }
-
-    public function testGetPreviousTags()
-    {
-        $pool = $this->createCachePool();
-
-        $i = $pool->getItem('k');
-        $pool->save($i->tag('foo'));
-
-        $i = $pool->getItem('k');
-        $this->assertSame(['foo' => 'foo'], $i->getPreviousTags());
-    }
-
-    public function testPrune()
-    {
-        $cache = new TagAwareAdapter($this->getPruneableMock());
-        $this->assertTrue($cache->prune());
-
-        $cache = new TagAwareAdapter($this->getNonPruneableMock());
-        $this->assertFalse($cache->prune());
-
-        $cache = new TagAwareAdapter($this->getFailingPruneableMock());
-        $this->assertFalse($cache->prune());
-    }
-
-    public function testKnownTagVersionsTtl()
-    {
-        $itemsPool = new FilesystemAdapter('', 10);
-        $tagsPool = $this
-            ->getMockBuilder(AdapterInterface::class)
-            ->getMock();
-
-        $pool = new TagAwareAdapter($itemsPool, $tagsPool, 10);
-
-        $item = $pool->getItem('foo');
-        $item->tag(['baz']);
-        $item->expiresAfter(100);
-
-        $tag = $this->getMockBuilder(CacheItemInterface::class)->getMock();
-        $tag->expects(self::exactly(2))->method('get')->willReturn(10);
-
-        $tagsPool->expects(self::exactly(2))->method('getItems')->willReturn([
-            'baz'.TagAwareAdapter::TAGS_PREFIX => $tag,
-        ]);
-
-        $pool->save($item);
-        $this->assertTrue($pool->getItem('foo')->isHit());
-        $this->assertTrue($pool->getItem('foo')->isHit());
-
-        sleep(20);
-
-        $this->assertTrue($pool->getItem('foo')->isHit());
-
-        sleep(5);
-
-        $this->assertTrue($pool->getItem('foo')->isHit());
-    }
-
-    public function testTagEntryIsCreatedForItemWithoutTags()
-    {
-        $pool = $this->createCachePool();
-
-        $itemKey = 'foo';
-        $item = $pool->getItem($itemKey);
-        $pool->save($item);
-
-        $adapter = new FilesystemAdapter();
-        $this->assertTrue($adapter->hasItem(TagAwareAdapter::TAGS_PREFIX.$itemKey));
-    }
-
-    public function testHasItemReturnsFalseWhenPoolDoesNotHaveItemTags()
-    {
-        $pool = $this->createCachePool();
-
-        $itemKey = 'foo';
-        $item = $pool->getItem($itemKey);
-        $pool->save($item);
-
-        $anotherPool = $this->createCachePool();
-
-        $adapter = new FilesystemAdapter();
-        $adapter->deleteItem(TagAwareAdapter::TAGS_PREFIX.$itemKey); //simulate item losing tags pair
-
-        $this->assertFalse($anotherPool->hasItem($itemKey));
-    }
-
-    public function testGetItemReturnsCacheMissWhenPoolDoesNotHaveItemTags()
-    {
-        $pool = $this->createCachePool();
-
-        $itemKey = 'foo';
-        $item = $pool->getItem($itemKey);
-        $pool->save($item);
-
-        $anotherPool = $this->createCachePool();
-
-        $adapter = new FilesystemAdapter();
-        $adapter->deleteItem(TagAwareAdapter::TAGS_PREFIX.$itemKey); //simulate item losing tags pair
-
-        $item = $anotherPool->getItem($itemKey);
-        $this->assertFalse($item->isHit());
-    }
-
-    public function testHasItemReturnsFalseWhenPoolDoesNotHaveItemAndOnlyHasTags()
-    {
-        $pool = $this->createCachePool();
-
-        $itemKey = 'foo';
-        $item = $pool->getItem($itemKey);
-        $pool->save($item);
-
-        $anotherPool = $this->createCachePool();
-
-        $adapter = new FilesystemAdapter();
-        $adapter->deleteItem($itemKey); //simulate losing item but keeping tags
-
-        $this->assertFalse($anotherPool->hasItem($itemKey));
-    }
-
-    public function testInvalidateTagsWithArrayAdapter()
-    {
-        $adapter = new TagAwareAdapter(new ArrayAdapter());
-
-        $item = $adapter->getItem('foo');
-
-        $this->assertFalse($item->isHit());
-
-        $item->tag('bar');
-        $item->expiresAfter(100);
-        $adapter->save($item);
-
-        $this->assertTrue($adapter->getItem('foo')->isHit());
-
-        $adapter->invalidateTags(['bar']);
-
-        $this->assertFalse($adapter->getItem('foo')->isHit());
-    }
-
-    public function testGetItemReturnsCacheMissWhenPoolDoesNotHaveItemAndOnlyHasTags()
-    {
-        $pool = $this->createCachePool();
-
-        $itemKey = 'foo';
-        $item = $pool->getItem($itemKey);
-        $pool->save($item);
-
-        $anotherPool = $this->createCachePool();
-
-        $adapter = new FilesystemAdapter();
-        $adapter->deleteItem($itemKey); //simulate losing item but keeping tags
-
-        $item = $anotherPool->getItem($itemKey);
-        $this->assertFalse($item->isHit());
-    }
-
-    /**
-     * @return MockObject|PruneableCacheInterface
-     */
-    private function getPruneableMock()
-    {
-        $pruneable = $this
-            ->getMockBuilder(PruneableCacheInterface::class)
-            ->getMock();
-
-        $pruneable
-            ->expects($this->atLeastOnce())
-            ->method('prune')
-            ->willReturn(true);
-
-        return $pruneable;
-    }
-
-    /**
-     * @return MockObject|PruneableCacheInterface
-     */
-    private function getFailingPruneableMock()
-    {
-        $pruneable = $this
-            ->getMockBuilder(PruneableCacheInterface::class)
-            ->getMock();
-
-        $pruneable
-            ->expects($this->atLeastOnce())
-            ->method('prune')
-            ->willReturn(false);
-
-        return $pruneable;
-    }
-
-    /**
-     * @return MockObject|AdapterInterface
-     */
-    private function getNonPruneableMock()
-    {
-        return $this
-            ->getMockBuilder(AdapterInterface::class)
-            ->getMock();
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TagAwareAndProxyAdapterIntegrationTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TagAwareAndProxyAdapterIntegrationTest.php
deleted file mode 100644
index b11c1f28..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TagAwareAndProxyAdapterIntegrationTest.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use PHPUnit\Framework\TestCase;
-use Psr\Cache\CacheItemPoolInterface;
-use Symfony\Component\Cache\Adapter\ArrayAdapter;
-use Symfony\Component\Cache\Adapter\ProxyAdapter;
-use Symfony\Component\Cache\Adapter\TagAwareAdapter;
-use Symfony\Component\Cache\Tests\Fixtures\ExternalAdapter;
-
-class TagAwareAndProxyAdapterIntegrationTest extends TestCase
-{
-    /**
-     * @dataProvider dataProvider
-     */
-    public function testIntegrationUsingProxiedAdapter(CacheItemPoolInterface $proxiedAdapter)
-    {
-        $cache = new TagAwareAdapter(new ProxyAdapter($proxiedAdapter));
-
-        $item = $cache->getItem('foo');
-        $item->tag(['tag1', 'tag2']);
-        $item->set('bar');
-        $cache->save($item);
-
-        $this->assertSame('bar', $cache->getItem('foo')->get());
-    }
-
-    public function dataProvider()
-    {
-        return [
-            [new ArrayAdapter()],
-            // also testing with a non-AdapterInterface implementation
-            // because the ProxyAdapter behaves slightly different for those
-            [new ExternalAdapter()],
-        ];
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TraceableAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TraceableAdapterTest.php
deleted file mode 100644
index 35eba7d7..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TraceableAdapterTest.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
-use Symfony\Component\Cache\Adapter\TraceableAdapter;
-
-/**
- * @group time-sensitive
- */
-class TraceableAdapterTest extends AdapterTestCase
-{
-    protected $skippedTests = [
-        'testPrune' => 'TraceableAdapter just proxies',
-    ];
-
-    public function createCachePool($defaultLifetime = 0)
-    {
-        return new TraceableAdapter(new FilesystemAdapter('', $defaultLifetime));
-    }
-
-    public function testGetItemMissTrace()
-    {
-        $pool = $this->createCachePool();
-        $pool->getItem('k');
-        $calls = $pool->getCalls();
-        $this->assertCount(1, $calls);
-
-        $call = $calls[0];
-        $this->assertSame('getItem', $call->name);
-        $this->assertSame(['k' => false], $call->result);
-        $this->assertSame(0, $call->hits);
-        $this->assertSame(1, $call->misses);
-        $this->assertNotEmpty($call->start);
-        $this->assertNotEmpty($call->end);
-    }
-
-    public function testGetItemHitTrace()
-    {
-        $pool = $this->createCachePool();
-        $item = $pool->getItem('k')->set('foo');
-        $pool->save($item);
-        $pool->getItem('k');
-        $calls = $pool->getCalls();
-        $this->assertCount(3, $calls);
-
-        $call = $calls[2];
-        $this->assertSame(1, $call->hits);
-        $this->assertSame(0, $call->misses);
-    }
-
-    public function testGetItemsMissTrace()
-    {
-        $pool = $this->createCachePool();
-        $arg = ['k0', 'k1'];
-        $items = $pool->getItems($arg);
-        foreach ($items as $item) {
-        }
-        $calls = $pool->getCalls();
-        $this->assertCount(1, $calls);
-
-        $call = $calls[0];
-        $this->assertSame('getItems', $call->name);
-        $this->assertSame(['k0' => false, 'k1' => false], $call->result);
-        $this->assertSame(2, $call->misses);
-        $this->assertNotEmpty($call->start);
-        $this->assertNotEmpty($call->end);
-    }
-
-    public function testHasItemMissTrace()
-    {
-        $pool = $this->createCachePool();
-        $pool->hasItem('k');
-        $calls = $pool->getCalls();
-        $this->assertCount(1, $calls);
-
-        $call = $calls[0];
-        $this->assertSame('hasItem', $call->name);
-        $this->assertSame(['k' => false], $call->result);
-        $this->assertNotEmpty($call->start);
-        $this->assertNotEmpty($call->end);
-    }
-
-    public function testHasItemHitTrace()
-    {
-        $pool = $this->createCachePool();
-        $item = $pool->getItem('k')->set('foo');
-        $pool->save($item);
-        $pool->hasItem('k');
-        $calls = $pool->getCalls();
-        $this->assertCount(3, $calls);
-
-        $call = $calls[2];
-        $this->assertSame('hasItem', $call->name);
-        $this->assertSame(['k' => true], $call->result);
-        $this->assertNotEmpty($call->start);
-        $this->assertNotEmpty($call->end);
-    }
-
-    public function testDeleteItemTrace()
-    {
-        $pool = $this->createCachePool();
-        $pool->deleteItem('k');
-        $calls = $pool->getCalls();
-        $this->assertCount(1, $calls);
-
-        $call = $calls[0];
-        $this->assertSame('deleteItem', $call->name);
-        $this->assertSame(['k' => true], $call->result);
-        $this->assertSame(0, $call->hits);
-        $this->assertSame(0, $call->misses);
-        $this->assertNotEmpty($call->start);
-        $this->assertNotEmpty($call->end);
-    }
-
-    public function testDeleteItemsTrace()
-    {
-        $pool = $this->createCachePool();
-        $arg = ['k0', 'k1'];
-        $pool->deleteItems($arg);
-        $calls = $pool->getCalls();
-        $this->assertCount(1, $calls);
-
-        $call = $calls[0];
-        $this->assertSame('deleteItems', $call->name);
-        $this->assertSame(['keys' => $arg, 'result' => true], $call->result);
-        $this->assertSame(0, $call->hits);
-        $this->assertSame(0, $call->misses);
-        $this->assertNotEmpty($call->start);
-        $this->assertNotEmpty($call->end);
-    }
-
-    public function testSaveTrace()
-    {
-        $pool = $this->createCachePool();
-        $item = $pool->getItem('k')->set('foo');
-        $pool->save($item);
-        $calls = $pool->getCalls();
-        $this->assertCount(2, $calls);
-
-        $call = $calls[1];
-        $this->assertSame('save', $call->name);
-        $this->assertSame(['k' => true], $call->result);
-        $this->assertSame(0, $call->hits);
-        $this->assertSame(0, $call->misses);
-        $this->assertNotEmpty($call->start);
-        $this->assertNotEmpty($call->end);
-    }
-
-    public function testSaveDeferredTrace()
-    {
-        $pool = $this->createCachePool();
-        $item = $pool->getItem('k')->set('foo');
-        $pool->saveDeferred($item);
-        $calls = $pool->getCalls();
-        $this->assertCount(2, $calls);
-
-        $call = $calls[1];
-        $this->assertSame('saveDeferred', $call->name);
-        $this->assertSame(['k' => true], $call->result);
-        $this->assertSame(0, $call->hits);
-        $this->assertSame(0, $call->misses);
-        $this->assertNotEmpty($call->start);
-        $this->assertNotEmpty($call->end);
-    }
-
-    public function testCommitTrace()
-    {
-        $pool = $this->createCachePool();
-        $pool->commit();
-        $calls = $pool->getCalls();
-        $this->assertCount(1, $calls);
-
-        $call = $calls[0];
-        $this->assertSame('commit', $call->name);
-        $this->assertTrue($call->result);
-        $this->assertSame(0, $call->hits);
-        $this->assertSame(0, $call->misses);
-        $this->assertNotEmpty($call->start);
-        $this->assertNotEmpty($call->end);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TraceableTagAwareAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TraceableTagAwareAdapterTest.php
deleted file mode 100644
index 5cd4185c..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TraceableTagAwareAdapterTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
-use Symfony\Component\Cache\Adapter\TagAwareAdapter;
-use Symfony\Component\Cache\Adapter\TraceableTagAwareAdapter;
-
-/**
- * @group time-sensitive
- */
-class TraceableTagAwareAdapterTest extends TraceableAdapterTest
-{
-    public function testInvalidateTags()
-    {
-        $pool = new TraceableTagAwareAdapter(new TagAwareAdapter(new FilesystemAdapter()));
-        $pool->invalidateTags(['foo']);
-        $calls = $pool->getCalls();
-        $this->assertCount(1, $calls);
-
-        $call = $calls[0];
-        $this->assertSame('invalidateTags', $call->name);
-        $this->assertSame(0, $call->hits);
-        $this->assertSame(0, $call->misses);
-        $this->assertNotEmpty($call->start);
-        $this->assertNotEmpty($call->end);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/CacheItemTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/CacheItemTest.php
deleted file mode 100644
index 28c681d1..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/CacheItemTest.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\Cache\CacheItem;
-
-class CacheItemTest extends TestCase
-{
-    public function testValidKey()
-    {
-        $this->assertSame('foo', CacheItem::validateKey('foo'));
-    }
-
-    /**
-     * @dataProvider provideInvalidKey
-     */
-    public function testInvalidKey($key)
-    {
-        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Cache key');
-        CacheItem::validateKey($key);
-    }
-
-    public function provideInvalidKey()
-    {
-        return [
-            [''],
-            ['{'],
-            ['}'],
-            ['('],
-            [')'],
-            ['/'],
-            ['\\'],
-            ['@'],
-            [':'],
-            [true],
-            [null],
-            [1],
-            [1.1],
-            [[[]]],
-            [new \Exception('foo')],
-        ];
-    }
-
-    public function testTag()
-    {
-        $item = new CacheItem();
-
-        $this->assertSame($item, $item->tag('foo'));
-        $this->assertSame($item, $item->tag(['bar', 'baz']));
-
-        \call_user_func(\Closure::bind(function () use ($item) {
-            $this->assertSame(['foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz'], $item->tags);
-        }, $this, CacheItem::class));
-    }
-
-    /**
-     * @dataProvider provideInvalidKey
-     */
-    public function testInvalidTag($tag)
-    {
-        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Cache tag');
-        $item = new CacheItem();
-        $item->tag($tag);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/DoctrineProviderTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/DoctrineProviderTest.php
deleted file mode 100644
index 91a5516a..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/DoctrineProviderTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests;
-
-use Doctrine\Common\Cache\CacheProvider;
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\Cache\Adapter\ArrayAdapter;
-use Symfony\Component\Cache\DoctrineProvider;
-
-class DoctrineProviderTest extends TestCase
-{
-    public function testProvider()
-    {
-        $pool = new ArrayAdapter();
-        $cache = new DoctrineProvider($pool);
-
-        $this->assertInstanceOf(CacheProvider::class, $cache);
-
-        $key = '{}()/\@:';
-
-        $this->assertTrue($cache->delete($key));
-        $this->assertFalse($cache->contains($key));
-
-        $this->assertTrue($cache->save($key, 'bar'));
-        $this->assertTrue($cache->contains($key));
-        $this->assertSame('bar', $cache->fetch($key));
-
-        $this->assertTrue($cache->delete($key));
-        $this->assertFalse($cache->fetch($key));
-        $this->assertTrue($cache->save($key, 'bar'));
-
-        $cache->flushAll();
-        $this->assertFalse($cache->fetch($key));
-        $this->assertFalse($cache->contains($key));
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Fixtures/ArrayCache.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Fixtures/ArrayCache.php
deleted file mode 100644
index 13b4f330..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Fixtures/ArrayCache.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace Symfony\Component\Cache\Tests\Fixtures;
-
-use Doctrine\Common\Cache\CacheProvider;
-
-class ArrayCache extends CacheProvider
-{
-    private $data = [];
-
-    protected function doFetch($id)
-    {
-        return $this->doContains($id) ? $this->data[$id][0] : false;
-    }
-
-    protected function doContains($id)
-    {
-        if (!isset($this->data[$id])) {
-            return false;
-        }
-
-        $expiry = $this->data[$id][1];
-
-        return !$expiry || time() < $expiry || !$this->doDelete($id);
-    }
-
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        $this->data[$id] = [$data, $lifeTime ? time() + $lifeTime : false];
-
-        return true;
-    }
-
-    protected function doDelete($id)
-    {
-        unset($this->data[$id]);
-
-        return true;
-    }
-
-    protected function doFlush()
-    {
-        $this->data = [];
-
-        return true;
-    }
-
-    protected function doGetStats()
-    {
-        return null;
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Fixtures/ExternalAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Fixtures/ExternalAdapter.php
deleted file mode 100644
index be1f9901..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Fixtures/ExternalAdapter.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Fixtures;
-
-use Psr\Cache\CacheItemInterface;
-use Psr\Cache\CacheItemPoolInterface;
-use Symfony\Component\Cache\Adapter\ArrayAdapter;
-
-/**
- * Adapter not implementing the {@see \Symfony\Component\Cache\Adapter\AdapterInterface}.
- *
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-class ExternalAdapter implements CacheItemPoolInterface
-{
-    private $cache;
-
-    public function __construct($defaultLifetime = 0)
-    {
-        $this->cache = new ArrayAdapter($defaultLifetime);
-    }
-
-    public function getItem($key)
-    {
-        return $this->cache->getItem($key);
-    }
-
-    public function getItems(array $keys = [])
-    {
-        return $this->cache->getItems($keys);
-    }
-
-    public function hasItem($key)
-    {
-        return $this->cache->hasItem($key);
-    }
-
-    public function clear()
-    {
-        return $this->cache->clear();
-    }
-
-    public function deleteItem($key)
-    {
-        return $this->cache->deleteItem($key);
-    }
-
-    public function deleteItems(array $keys)
-    {
-        return $this->cache->deleteItems($keys);
-    }
-
-    public function save(CacheItemInterface $item)
-    {
-        return $this->cache->save($item);
-    }
-
-    public function saveDeferred(CacheItemInterface $item)
-    {
-        return $this->cache->saveDeferred($item);
-    }
-
-    public function commit()
-    {
-        return $this->cache->commit();
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/AbstractRedisCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/AbstractRedisCacheTest.php
deleted file mode 100644
index 7a6cabe8..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/AbstractRedisCacheTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Simple;
-
-use Symfony\Component\Cache\Simple\RedisCache;
-
-abstract class AbstractRedisCacheTest extends CacheTestCase
-{
-    protected $skippedTests = [
-        'testSetTtl' => 'Testing expiration slows down the test suite',
-        'testSetMultipleTtl' => 'Testing expiration slows down the test suite',
-        'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
-    ];
-
-    protected static $redis;
-
-    public function createSimpleCache($defaultLifetime = 0)
-    {
-        return new RedisCache(self::$redis, str_replace('\\', '.', __CLASS__), $defaultLifetime);
-    }
-
-    public static function setUpBeforeClass()
-    {
-        if (!\extension_loaded('redis')) {
-            self::markTestSkipped('Extension redis required.');
-        }
-        try {
-            (new \Redis())->connect(getenv('REDIS_HOST'));
-        } catch (\Exception $e) {
-            self::markTestSkipped($e->getMessage());
-        }
-    }
-
-    public static function tearDownAfterClass()
-    {
-        self::$redis = null;
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ApcuCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ApcuCacheTest.php
deleted file mode 100644
index fad0c043..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ApcuCacheTest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Simple;
-
-use Symfony\Component\Cache\Simple\ApcuCache;
-
-class ApcuCacheTest extends CacheTestCase
-{
-    protected $skippedTests = [
-        'testSetTtl' => 'Testing expiration slows down the test suite',
-        'testSetMultipleTtl' => 'Testing expiration slows down the test suite',
-        'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
-    ];
-
-    public function createSimpleCache($defaultLifetime = 0)
-    {
-        if (!\function_exists('apcu_fetch') || !filter_var(ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN) || ('cli' === \PHP_SAPI && !filter_var(ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN))) {
-            $this->markTestSkipped('APCu extension is required.');
-        }
-        if ('\\' === \DIRECTORY_SEPARATOR) {
-            $this->markTestSkipped('Fails transiently on Windows.');
-        }
-
-        return new ApcuCache(str_replace('\\', '.', __CLASS__), $defaultLifetime);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ArrayCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ArrayCacheTest.php
deleted file mode 100644
index 26c3e14d..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ArrayCacheTest.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Simple;
-
-use Symfony\Component\Cache\Simple\ArrayCache;
-
-/**
- * @group time-sensitive
- */
-class ArrayCacheTest extends CacheTestCase
-{
-    public function createSimpleCache($defaultLifetime = 0)
-    {
-        return new ArrayCache($defaultLifetime);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/CacheTestCase.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/CacheTestCase.php
deleted file mode 100644
index ff9944a3..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/CacheTestCase.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Simple;
-
-use Cache\IntegrationTests\SimpleCacheTest;
-use Psr\SimpleCache\CacheInterface;
-use Symfony\Component\Cache\PruneableInterface;
-
-abstract class CacheTestCase extends SimpleCacheTest
-{
-    protected function setUp()
-    {
-        parent::setUp();
-
-        if (!\array_key_exists('testPrune', $this->skippedTests) && !$this->createSimpleCache() instanceof PruneableInterface) {
-            $this->skippedTests['testPrune'] = 'Not a pruneable cache pool.';
-        }
-    }
-
-    public static function validKeys()
-    {
-        if (\defined('HHVM_VERSION')) {
-            return parent::validKeys();
-        }
-
-        return array_merge(parent::validKeys(), [["a\0b"]]);
-    }
-
-    public function testDefaultLifeTime()
-    {
-        if (isset($this->skippedTests[__FUNCTION__])) {
-            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
-        }
-
-        $cache = $this->createSimpleCache(2);
-        $cache->clear();
-
-        $cache->set('key.dlt', 'value');
-        sleep(1);
-
-        $this->assertSame('value', $cache->get('key.dlt'));
-
-        sleep(2);
-        $this->assertNull($cache->get('key.dlt'));
-
-        $cache->clear();
-    }
-
-    public function testNotUnserializable()
-    {
-        if (isset($this->skippedTests[__FUNCTION__])) {
-            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
-        }
-
-        $cache = $this->createSimpleCache();
-        $cache->clear();
-
-        $cache->set('foo', new NotUnserializable());
-
-        $this->assertNull($cache->get('foo'));
-
-        $cache->setMultiple(['foo' => new NotUnserializable()]);
-
-        foreach ($cache->getMultiple(['foo']) as $value) {
-        }
-        $this->assertNull($value);
-
-        $cache->clear();
-    }
-
-    public function testPrune()
-    {
-        if (isset($this->skippedTests[__FUNCTION__])) {
-            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
-        }
-
-        if (!method_exists($this, 'isPruned')) {
-            $this->fail('Test classes for pruneable caches must implement `isPruned($cache, $name)` method.');
-        }
-
-        /** @var PruneableInterface|CacheInterface $cache */
-        $cache = $this->createSimpleCache();
-        $cache->clear();
-
-        $cache->set('foo', 'foo-val', new \DateInterval('PT05S'));
-        $cache->set('bar', 'bar-val', new \DateInterval('PT10S'));
-        $cache->set('baz', 'baz-val', new \DateInterval('PT15S'));
-        $cache->set('qux', 'qux-val', new \DateInterval('PT20S'));
-
-        sleep(30);
-        $cache->prune();
-        $this->assertTrue($this->isPruned($cache, 'foo'));
-        $this->assertTrue($this->isPruned($cache, 'bar'));
-        $this->assertTrue($this->isPruned($cache, 'baz'));
-        $this->assertTrue($this->isPruned($cache, 'qux'));
-
-        $cache->set('foo', 'foo-val');
-        $cache->set('bar', 'bar-val', new \DateInterval('PT20S'));
-        $cache->set('baz', 'baz-val', new \DateInterval('PT40S'));
-        $cache->set('qux', 'qux-val', new \DateInterval('PT80S'));
-
-        $cache->prune();
-        $this->assertFalse($this->isPruned($cache, 'foo'));
-        $this->assertFalse($this->isPruned($cache, 'bar'));
-        $this->assertFalse($this->isPruned($cache, 'baz'));
-        $this->assertFalse($this->isPruned($cache, 'qux'));
-
-        sleep(30);
-        $cache->prune();
-        $this->assertFalse($this->isPruned($cache, 'foo'));
-        $this->assertTrue($this->isPruned($cache, 'bar'));
-        $this->assertFalse($this->isPruned($cache, 'baz'));
-        $this->assertFalse($this->isPruned($cache, 'qux'));
-
-        sleep(30);
-        $cache->prune();
-        $this->assertFalse($this->isPruned($cache, 'foo'));
-        $this->assertTrue($this->isPruned($cache, 'baz'));
-        $this->assertFalse($this->isPruned($cache, 'qux'));
-
-        sleep(30);
-        $cache->prune();
-        $this->assertFalse($this->isPruned($cache, 'foo'));
-        $this->assertTrue($this->isPruned($cache, 'qux'));
-
-        $cache->clear();
-    }
-}
-
-class NotUnserializable implements \Serializable
-{
-    public function serialize()
-    {
-        return serialize(123);
-    }
-
-    public function unserialize($ser)
-    {
-        throw new \Exception(__CLASS__);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ChainCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ChainCacheTest.php
deleted file mode 100644
index f216bc1f..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ChainCacheTest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Simple;
-
-use PHPUnit\Framework\MockObject\MockObject;
-use Psr\SimpleCache\CacheInterface;
-use Symfony\Component\Cache\PruneableInterface;
-use Symfony\Component\Cache\Simple\ArrayCache;
-use Symfony\Component\Cache\Simple\ChainCache;
-use Symfony\Component\Cache\Simple\FilesystemCache;
-
-/**
- * @group time-sensitive
- */
-class ChainCacheTest extends CacheTestCase
-{
-    public function createSimpleCache($defaultLifetime = 0)
-    {
-        return new ChainCache([new ArrayCache($defaultLifetime), new FilesystemCache('', $defaultLifetime)], $defaultLifetime);
-    }
-
-    public function testEmptyCachesException()
-    {
-        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('At least one cache must be specified.');
-        new ChainCache([]);
-    }
-
-    public function testInvalidCacheException()
-    {
-        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('The class "stdClass" does not implement');
-        new ChainCache([new \stdClass()]);
-    }
-
-    public function testPrune()
-    {
-        if (isset($this->skippedTests[__FUNCTION__])) {
-            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
-        }
-
-        $cache = new ChainCache([
-            $this->getPruneableMock(),
-            $this->getNonPruneableMock(),
-            $this->getPruneableMock(),
-        ]);
-        $this->assertTrue($cache->prune());
-
-        $cache = new ChainCache([
-            $this->getPruneableMock(),
-            $this->getFailingPruneableMock(),
-            $this->getPruneableMock(),
-        ]);
-        $this->assertFalse($cache->prune());
-    }
-
-    /**
-     * @return MockObject|PruneableCacheInterface
-     */
-    private function getPruneableMock()
-    {
-        $pruneable = $this
-            ->getMockBuilder(PruneableCacheInterface::class)
-            ->getMock();
-
-        $pruneable
-            ->expects($this->atLeastOnce())
-            ->method('prune')
-            ->willReturn(true);
-
-        return $pruneable;
-    }
-
-    /**
-     * @return MockObject|PruneableCacheInterface
-     */
-    private function getFailingPruneableMock()
-    {
-        $pruneable = $this
-            ->getMockBuilder(PruneableCacheInterface::class)
-            ->getMock();
-
-        $pruneable
-            ->expects($this->atLeastOnce())
-            ->method('prune')
-            ->willReturn(false);
-
-        return $pruneable;
-    }
-
-    /**
-     * @return MockObject|CacheInterface
-     */
-    private function getNonPruneableMock()
-    {
-        return $this
-            ->getMockBuilder(CacheInterface::class)
-            ->getMock();
-    }
-}
-
-interface PruneableCacheInterface extends PruneableInterface, CacheInterface
-{
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/DoctrineCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/DoctrineCacheTest.php
deleted file mode 100644
index af4331d6..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/DoctrineCacheTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Simple;
-
-use Symfony\Component\Cache\Simple\DoctrineCache;
-use Symfony\Component\Cache\Tests\Fixtures\ArrayCache;
-
-/**
- * @group time-sensitive
- */
-class DoctrineCacheTest extends CacheTestCase
-{
-    protected $skippedTests = [
-        'testObjectDoesNotChangeInCache' => 'ArrayCache does not use serialize/unserialize',
-        'testNotUnserializable' => 'ArrayCache does not use serialize/unserialize',
-    ];
-
-    public function createSimpleCache($defaultLifetime = 0)
-    {
-        return new DoctrineCache(new ArrayCache($defaultLifetime), '', $defaultLifetime);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/FilesystemCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/FilesystemCacheTest.php
deleted file mode 100644
index 620305a5..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/FilesystemCacheTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Simple;
-
-use Psr\SimpleCache\CacheInterface;
-use Symfony\Component\Cache\Simple\FilesystemCache;
-
-/**
- * @group time-sensitive
- */
-class FilesystemCacheTest extends CacheTestCase
-{
-    public function createSimpleCache($defaultLifetime = 0)
-    {
-        return new FilesystemCache('', $defaultLifetime);
-    }
-
-    protected function isPruned(CacheInterface $cache, $name)
-    {
-        $getFileMethod = (new \ReflectionObject($cache))->getMethod('getFile');
-        $getFileMethod->setAccessible(true);
-
-        return !file_exists($getFileMethod->invoke($cache, $name));
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/MemcachedCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/MemcachedCacheTest.php
deleted file mode 100644
index 6df682e9..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/MemcachedCacheTest.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Simple;
-
-use Symfony\Component\Cache\Adapter\AbstractAdapter;
-use Symfony\Component\Cache\Simple\MemcachedCache;
-
-class MemcachedCacheTest extends CacheTestCase
-{
-    protected $skippedTests = [
-        'testSetTtl' => 'Testing expiration slows down the test suite',
-        'testSetMultipleTtl' => 'Testing expiration slows down the test suite',
-        'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
-    ];
-
-    protected static $client;
-
-    public static function setUpBeforeClass()
-    {
-        if (!MemcachedCache::isSupported()) {
-            self::markTestSkipped('Extension memcached >=2.2.0 required.');
-        }
-        self::$client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'));
-        self::$client->get('foo');
-        $code = self::$client->getResultCode();
-
-        if (\Memcached::RES_SUCCESS !== $code && \Memcached::RES_NOTFOUND !== $code) {
-            self::markTestSkipped('Memcached error: '.strtolower(self::$client->getResultMessage()));
-        }
-    }
-
-    public function createSimpleCache($defaultLifetime = 0)
-    {
-        $client = $defaultLifetime ? AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['binary_protocol' => false]) : self::$client;
-
-        return new MemcachedCache($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
-    }
-
-    public function testCreatePersistentConnectionShouldNotDupServerList()
-    {
-        $instance = MemcachedCache::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['persistent_id' => 'persistent']);
-        $this->assertCount(1, $instance->getServerList());
-
-        $instance = MemcachedCache::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['persistent_id' => 'persistent']);
-        $this->assertCount(1, $instance->getServerList());
-    }
-
-    public function testOptions()
-    {
-        $client = MemcachedCache::createConnection([], [
-            'libketama_compatible' => false,
-            'distribution' => 'modula',
-            'compression' => true,
-            'serializer' => 'php',
-            'hash' => 'md5',
-        ]);
-
-        $this->assertSame(\Memcached::SERIALIZER_PHP, $client->getOption(\Memcached::OPT_SERIALIZER));
-        $this->assertSame(\Memcached::HASH_MD5, $client->getOption(\Memcached::OPT_HASH));
-        $this->assertTrue($client->getOption(\Memcached::OPT_COMPRESSION));
-        $this->assertSame(0, $client->getOption(\Memcached::OPT_LIBKETAMA_COMPATIBLE));
-        $this->assertSame(\Memcached::DISTRIBUTION_MODULA, $client->getOption(\Memcached::OPT_DISTRIBUTION));
-    }
-
-    /**
-     * @dataProvider provideBadOptions
-     */
-    public function testBadOptions($name, $value)
-    {
-        if (\PHP_VERSION_ID < 80000) {
-            $this->expectException('ErrorException');
-            $this->expectExceptionMessage('constant(): Couldn\'t find constant Memcached::');
-        } else {
-            $this->expectException('Error');
-            $this->expectExceptionMessage('Undefined constant Memcached::');
-        }
-
-        MemcachedCache::createConnection([], [$name => $value]);
-    }
-
-    public function provideBadOptions()
-    {
-        return [
-            ['foo', 'bar'],
-            ['hash', 'zyx'],
-            ['serializer', 'zyx'],
-            ['distribution', 'zyx'],
-        ];
-    }
-
-    public function testDefaultOptions()
-    {
-        $this->assertTrue(MemcachedCache::isSupported());
-
-        $client = MemcachedCache::createConnection([]);
-
-        $this->assertTrue($client->getOption(\Memcached::OPT_COMPRESSION));
-        $this->assertSame(1, $client->getOption(\Memcached::OPT_BINARY_PROTOCOL));
-        $this->assertSame(1, $client->getOption(\Memcached::OPT_LIBKETAMA_COMPATIBLE));
-    }
-
-    public function testOptionSerializer()
-    {
-        $this->expectException('Symfony\Component\Cache\Exception\CacheException');
-        $this->expectExceptionMessage('MemcachedAdapter: "serializer" option must be "php" or "igbinary".');
-        if (!\Memcached::HAVE_JSON) {
-            $this->markTestSkipped('Memcached::HAVE_JSON required');
-        }
-
-        new MemcachedCache(MemcachedCache::createConnection([], ['serializer' => 'json']));
-    }
-
-    /**
-     * @dataProvider provideServersSetting
-     */
-    public function testServersSetting($dsn, $host, $port)
-    {
-        $client1 = MemcachedCache::createConnection($dsn);
-        $client2 = MemcachedCache::createConnection([$dsn]);
-        $client3 = MemcachedCache::createConnection([[$host, $port]]);
-        $expect = [
-            'host' => $host,
-            'port' => $port,
-        ];
-
-        $f = function ($s) { return ['host' => $s['host'], 'port' => $s['port']]; };
-        $this->assertSame([$expect], array_map($f, $client1->getServerList()));
-        $this->assertSame([$expect], array_map($f, $client2->getServerList()));
-        $this->assertSame([$expect], array_map($f, $client3->getServerList()));
-    }
-
-    public function provideServersSetting()
-    {
-        yield [
-            'memcached://127.0.0.1/50',
-            '127.0.0.1',
-            11211,
-        ];
-        yield [
-            'memcached://localhost:11222?weight=25',
-            'localhost',
-            11222,
-        ];
-        if (filter_var(ini_get('memcached.use_sasl'), \FILTER_VALIDATE_BOOLEAN)) {
-            yield [
-                'memcached://user:password@127.0.0.1?weight=50',
-                '127.0.0.1',
-                11211,
-            ];
-        }
-        yield [
-            'memcached:///var/run/memcached.sock?weight=25',
-            '/var/run/memcached.sock',
-            0,
-        ];
-        yield [
-            'memcached:///var/local/run/memcached.socket?weight=25',
-            '/var/local/run/memcached.socket',
-            0,
-        ];
-        if (filter_var(ini_get('memcached.use_sasl'), \FILTER_VALIDATE_BOOLEAN)) {
-            yield [
-                'memcached://user:password@/var/local/run/memcached.socket?weight=25',
-                '/var/local/run/memcached.socket',
-                0,
-            ];
-        }
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/MemcachedCacheTextModeTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/MemcachedCacheTextModeTest.php
deleted file mode 100644
index 13865a60..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/MemcachedCacheTextModeTest.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Simple;
-
-use Symfony\Component\Cache\Adapter\AbstractAdapter;
-use Symfony\Component\Cache\Simple\MemcachedCache;
-
-class MemcachedCacheTextModeTest extends MemcachedCacheTest
-{
-    public function createSimpleCache($defaultLifetime = 0)
-    {
-        $client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['binary_protocol' => false]);
-
-        return new MemcachedCache($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/NullCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/NullCacheTest.php
deleted file mode 100644
index 31f42c32..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/NullCacheTest.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Simple;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\Cache\Simple\NullCache;
-
-/**
- * @group time-sensitive
- */
-class NullCacheTest extends TestCase
-{
-    public function createCachePool()
-    {
-        return new NullCache();
-    }
-
-    public function testGetItem()
-    {
-        $cache = $this->createCachePool();
-
-        $this->assertNull($cache->get('key'));
-    }
-
-    public function testHas()
-    {
-        $this->assertFalse($this->createCachePool()->has('key'));
-    }
-
-    public function testGetMultiple()
-    {
-        $cache = $this->createCachePool();
-
-        $keys = ['foo', 'bar', 'baz', 'biz'];
-
-        $default = new \stdClass();
-        $items = $cache->getMultiple($keys, $default);
-        $count = 0;
-
-        foreach ($items as $key => $item) {
-            $this->assertContains($key, $keys, 'Cache key can not change.');
-            $this->assertSame($default, $item);
-
-            // Remove $key for $keys
-            foreach ($keys as $k => $v) {
-                if ($v === $key) {
-                    unset($keys[$k]);
-                }
-            }
-
-            ++$count;
-        }
-
-        $this->assertSame(4, $count);
-    }
-
-    public function testClear()
-    {
-        $this->assertTrue($this->createCachePool()->clear());
-    }
-
-    public function testDelete()
-    {
-        $this->assertTrue($this->createCachePool()->delete('key'));
-    }
-
-    public function testDeleteMultiple()
-    {
-        $this->assertTrue($this->createCachePool()->deleteMultiple(['key', 'foo', 'bar']));
-    }
-
-    public function testSet()
-    {
-        $cache = $this->createCachePool();
-
-        $this->assertFalse($cache->set('key', 'val'));
-        $this->assertNull($cache->get('key'));
-    }
-
-    public function testSetMultiple()
-    {
-        $cache = $this->createCachePool();
-
-        $this->assertFalse($cache->setMultiple(['key' => 'val']));
-        $this->assertNull($cache->get('key'));
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PdoCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PdoCacheTest.php
deleted file mode 100644
index f5a26341..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PdoCacheTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Simple;
-
-use Symfony\Component\Cache\Simple\PdoCache;
-use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
-
-/**
- * @group time-sensitive
- */
-class PdoCacheTest extends CacheTestCase
-{
-    use PdoPruneableTrait;
-
-    protected static $dbFile;
-
-    public static function setUpBeforeClass()
-    {
-        if (!\extension_loaded('pdo_sqlite')) {
-            self::markTestSkipped('Extension pdo_sqlite required.');
-        }
-
-        self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
-
-        $pool = new PdoCache('sqlite:'.self::$dbFile);
-        $pool->createTable();
-    }
-
-    public static function tearDownAfterClass()
-    {
-        @unlink(self::$dbFile);
-    }
-
-    public function createSimpleCache($defaultLifetime = 0)
-    {
-        return new PdoCache('sqlite:'.self::$dbFile, 'ns', $defaultLifetime);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PdoDbalCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PdoDbalCacheTest.php
deleted file mode 100644
index 4da2b603..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PdoDbalCacheTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Simple;
-
-use Doctrine\DBAL\DriverManager;
-use Symfony\Component\Cache\Simple\PdoCache;
-use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
-
-/**
- * @group time-sensitive
- */
-class PdoDbalCacheTest extends CacheTestCase
-{
-    use PdoPruneableTrait;
-
-    protected static $dbFile;
-
-    public static function setUpBeforeClass()
-    {
-        if (!\extension_loaded('pdo_sqlite')) {
-            self::markTestSkipped('Extension pdo_sqlite required.');
-        }
-
-        self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
-
-        $pool = new PdoCache(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]));
-        $pool->createTable();
-    }
-
-    public static function tearDownAfterClass()
-    {
-        @unlink(self::$dbFile);
-    }
-
-    public function createSimpleCache($defaultLifetime = 0)
-    {
-        return new PdoCache(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]), '', $defaultLifetime);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpArrayCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpArrayCacheTest.php
deleted file mode 100644
index bcd7dea5..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpArrayCacheTest.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Simple;
-
-use Symfony\Component\Cache\Simple\NullCache;
-use Symfony\Component\Cache\Simple\PhpArrayCache;
-use Symfony\Component\Cache\Tests\Adapter\FilesystemAdapterTest;
-
-/**
- * @group time-sensitive
- */
-class PhpArrayCacheTest extends CacheTestCase
-{
-    protected $skippedTests = [
-        'testBasicUsageWithLongKey' => 'PhpArrayCache does no writes',
-
-        'testDelete' => 'PhpArrayCache does no writes',
-        'testDeleteMultiple' => 'PhpArrayCache does no writes',
-        'testDeleteMultipleGenerator' => 'PhpArrayCache does no writes',
-
-        'testSetTtl' => 'PhpArrayCache does no expiration',
-        'testSetMultipleTtl' => 'PhpArrayCache does no expiration',
-        'testSetExpiredTtl' => 'PhpArrayCache does no expiration',
-        'testSetMultipleExpiredTtl' => 'PhpArrayCache does no expiration',
-
-        'testGetInvalidKeys' => 'PhpArrayCache does no validation',
-        'testGetMultipleInvalidKeys' => 'PhpArrayCache does no validation',
-        'testSetInvalidKeys' => 'PhpArrayCache does no validation',
-        'testDeleteInvalidKeys' => 'PhpArrayCache does no validation',
-        'testDeleteMultipleInvalidKeys' => 'PhpArrayCache does no validation',
-        'testSetInvalidTtl' => 'PhpArrayCache does no validation',
-        'testSetMultipleInvalidKeys' => 'PhpArrayCache does no validation',
-        'testSetMultipleInvalidTtl' => 'PhpArrayCache does no validation',
-        'testHasInvalidKeys' => 'PhpArrayCache does no validation',
-        'testSetValidData' => 'PhpArrayCache does no validation',
-
-        'testDefaultLifeTime' => 'PhpArrayCache does not allow configuring a default lifetime.',
-        'testPrune' => 'PhpArrayCache just proxies',
-    ];
-
-    protected static $file;
-
-    public static function setUpBeforeClass()
-    {
-        self::$file = sys_get_temp_dir().'/symfony-cache/php-array-adapter-test.php';
-    }
-
-    protected function tearDown()
-    {
-        $this->createSimpleCache()->clear();
-
-        if (file_exists(sys_get_temp_dir().'/symfony-cache')) {
-            FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
-        }
-    }
-
-    public function createSimpleCache()
-    {
-        return new PhpArrayCacheWrapper(self::$file, new NullCache());
-    }
-
-    public function testStore()
-    {
-        $arrayWithRefs = [];
-        $arrayWithRefs[0] = 123;
-        $arrayWithRefs[1] = &$arrayWithRefs[0];
-
-        $object = (object) [
-            'foo' => 'bar',
-            'foo2' => 'bar2',
-        ];
-
-        $expected = [
-            'null' => null,
-            'serializedString' => serialize($object),
-            'arrayWithRefs' => $arrayWithRefs,
-            'object' => $object,
-            'arrayWithObject' => ['bar' => $object],
-        ];
-
-        $cache = new PhpArrayCache(self::$file, new NullCache());
-        $cache->warmUp($expected);
-
-        foreach ($expected as $key => $value) {
-            $this->assertSame(serialize($value), serialize($cache->get($key)), 'Warm up should create a PHP file that OPCache can load in memory');
-        }
-    }
-
-    public function testStoredFile()
-    {
-        $expected = [
-            'integer' => 42,
-            'float' => 42.42,
-            'boolean' => true,
-            'array_simple' => ['foo', 'bar'],
-            'array_associative' => ['foo' => 'bar', 'foo2' => 'bar2'],
-        ];
-
-        $cache = new PhpArrayCache(self::$file, new NullCache());
-        $cache->warmUp($expected);
-
-        $values = eval(substr(file_get_contents(self::$file), 6));
-
-        $this->assertSame($expected, $values, 'Warm up should create a PHP file that OPCache can load in memory');
-    }
-}
-
-class PhpArrayCacheWrapper extends PhpArrayCache
-{
-    public function set($key, $value, $ttl = null)
-    {
-        \call_user_func(\Closure::bind(function () use ($key, $value) {
-            $this->values[$key] = $value;
-            $this->warmUp($this->values);
-            $this->values = eval(substr(file_get_contents($this->file), 6));
-        }, $this, PhpArrayCache::class));
-
-        return true;
-    }
-
-    public function setMultiple($values, $ttl = null)
-    {
-        if (!\is_array($values) && !$values instanceof \Traversable) {
-            return parent::setMultiple($values, $ttl);
-        }
-        \call_user_func(\Closure::bind(function () use ($values) {
-            foreach ($values as $key => $value) {
-                $this->values[$key] = $value;
-            }
-            $this->warmUp($this->values);
-            $this->values = eval(substr(file_get_contents($this->file), 6));
-        }, $this, PhpArrayCache::class));
-
-        return true;
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php
deleted file mode 100644
index b08c1604..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Simple;
-
-use Symfony\Component\Cache\Simple\FilesystemCache;
-use Symfony\Component\Cache\Simple\PhpArrayCache;
-use Symfony\Component\Cache\Tests\Adapter\FilesystemAdapterTest;
-
-/**
- * @group time-sensitive
- */
-class PhpArrayCacheWithFallbackTest extends CacheTestCase
-{
-    protected $skippedTests = [
-        'testGetInvalidKeys' => 'PhpArrayCache does no validation',
-        'testGetMultipleInvalidKeys' => 'PhpArrayCache does no validation',
-        'testDeleteInvalidKeys' => 'PhpArrayCache does no validation',
-        'testDeleteMultipleInvalidKeys' => 'PhpArrayCache does no validation',
-        //'testSetValidData' => 'PhpArrayCache does no validation',
-        'testSetInvalidKeys' => 'PhpArrayCache does no validation',
-        'testSetInvalidTtl' => 'PhpArrayCache does no validation',
-        'testSetMultipleInvalidKeys' => 'PhpArrayCache does no validation',
-        'testSetMultipleInvalidTtl' => 'PhpArrayCache does no validation',
-        'testHasInvalidKeys' => 'PhpArrayCache does no validation',
-        'testPrune' => 'PhpArrayCache just proxies',
-    ];
-
-    protected static $file;
-
-    public static function setUpBeforeClass()
-    {
-        self::$file = sys_get_temp_dir().'/symfony-cache/php-array-adapter-test.php';
-    }
-
-    protected function tearDown()
-    {
-        $this->createSimpleCache()->clear();
-
-        if (file_exists(sys_get_temp_dir().'/symfony-cache')) {
-            FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
-        }
-    }
-
-    public function createSimpleCache($defaultLifetime = 0)
-    {
-        return new PhpArrayCache(self::$file, new FilesystemCache('php-array-fallback', $defaultLifetime));
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpFilesCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpFilesCacheTest.php
deleted file mode 100644
index 936f29a4..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpFilesCacheTest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Simple;
-
-use Psr\SimpleCache\CacheInterface;
-use Symfony\Component\Cache\Simple\PhpFilesCache;
-
-/**
- * @group time-sensitive
- */
-class PhpFilesCacheTest extends CacheTestCase
-{
-    protected $skippedTests = [
-        'testDefaultLifeTime' => 'PhpFilesCache does not allow configuring a default lifetime.',
-    ];
-
-    public function createSimpleCache()
-    {
-        if (!PhpFilesCache::isSupported()) {
-            $this->markTestSkipped('OPcache extension is not enabled.');
-        }
-
-        return new PhpFilesCache('sf-cache');
-    }
-
-    protected function isPruned(CacheInterface $cache, $name)
-    {
-        $getFileMethod = (new \ReflectionObject($cache))->getMethod('getFile');
-        $getFileMethod->setAccessible(true);
-
-        return !file_exists($getFileMethod->invoke($cache, $name));
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/Psr6CacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/Psr6CacheTest.php
deleted file mode 100644
index 1bc75c90..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/Psr6CacheTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Simple;
-
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
-use Symfony\Component\Cache\Simple\Psr6Cache;
-
-/**
- * @group time-sensitive
- */
-class Psr6CacheTest extends CacheTestCase
-{
-    protected $skippedTests = [
-        'testPrune' => 'Psr6Cache just proxies',
-    ];
-
-    public function createSimpleCache($defaultLifetime = 0)
-    {
-        return new Psr6Cache(new FilesystemAdapter('', $defaultLifetime));
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisArrayCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisArrayCacheTest.php
deleted file mode 100644
index ec5e4c06..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisArrayCacheTest.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Simple;
-
-class RedisArrayCacheTest extends AbstractRedisCacheTest
-{
-    public static function setUpBeforeClass()
-    {
-        parent::setupBeforeClass();
-        if (!class_exists('RedisArray')) {
-            self::markTestSkipped('The RedisArray class is required.');
-        }
-        self::$redis = new \RedisArray([getenv('REDIS_HOST')], ['lazy_connect' => true]);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisCacheTest.php
deleted file mode 100644
index 8e3f6088..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisCacheTest.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Simple;
-
-use Symfony\Component\Cache\Simple\RedisCache;
-
-class RedisCacheTest extends AbstractRedisCacheTest
-{
-    public static function setUpBeforeClass()
-    {
-        parent::setupBeforeClass();
-        self::$redis = RedisCache::createConnection('redis://'.getenv('REDIS_HOST'));
-    }
-
-    public function testCreateConnection()
-    {
-        $redisHost = getenv('REDIS_HOST');
-
-        $redis = RedisCache::createConnection('redis://'.$redisHost);
-        $this->assertInstanceOf(\Redis::class, $redis);
-        $this->assertTrue($redis->isConnected());
-        $this->assertSame(0, $redis->getDbNum());
-
-        $redis = RedisCache::createConnection('redis://'.$redisHost.'/2');
-        $this->assertSame(2, $redis->getDbNum());
-
-        $redis = RedisCache::createConnection('redis://'.$redisHost, ['timeout' => 3]);
-        $this->assertEquals(3, $redis->getTimeout());
-
-        $redis = RedisCache::createConnection('redis://'.$redisHost.'?timeout=4');
-        $this->assertEquals(4, $redis->getTimeout());
-
-        $redis = RedisCache::createConnection('redis://'.$redisHost, ['read_timeout' => 5]);
-        $this->assertEquals(5, $redis->getReadTimeout());
-    }
-
-    /**
-     * @dataProvider provideFailedCreateConnection
-     */
-    public function testFailedCreateConnection($dsn)
-    {
-        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Redis connection ');
-        RedisCache::createConnection($dsn);
-    }
-
-    public function provideFailedCreateConnection()
-    {
-        return [
-            ['redis://localhost:1234'],
-            ['redis://foo@localhost'],
-            ['redis://localhost/123'],
-        ];
-    }
-
-    /**
-     * @dataProvider provideInvalidCreateConnection
-     */
-    public function testInvalidCreateConnection($dsn)
-    {
-        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Invalid Redis DSN');
-        RedisCache::createConnection($dsn);
-    }
-
-    public function provideInvalidCreateConnection()
-    {
-        return [
-            ['foo://localhost'],
-            ['redis://'],
-        ];
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisClusterCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisClusterCacheTest.php
deleted file mode 100644
index 6b7f8039..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisClusterCacheTest.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Simple;
-
-class RedisClusterCacheTest extends AbstractRedisCacheTest
-{
-    public static function setUpBeforeClass()
-    {
-        if (!class_exists('RedisCluster')) {
-            self::markTestSkipped('The RedisCluster class is required.');
-        }
-        if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) {
-            self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
-        }
-
-        self::$redis = new \RedisCluster(null, explode(' ', $hosts));
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/TraceableCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/TraceableCacheTest.php
deleted file mode 100644
index e684caf3..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/TraceableCacheTest.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Simple;
-
-use Symfony\Component\Cache\Simple\FilesystemCache;
-use Symfony\Component\Cache\Simple\TraceableCache;
-
-/**
- * @group time-sensitive
- */
-class TraceableCacheTest extends CacheTestCase
-{
-    protected $skippedTests = [
-        'testPrune' => 'TraceableCache just proxies',
-    ];
-
-    public function createSimpleCache($defaultLifetime = 0)
-    {
-        return new TraceableCache(new FilesystemCache('', $defaultLifetime));
-    }
-
-    public function testGetMissTrace()
-    {
-        $pool = $this->createSimpleCache();
-        $pool->get('k');
-        $calls = $pool->getCalls();
-        $this->assertCount(1, $calls);
-
-        $call = $calls[0];
-        $this->assertSame('get', $call->name);
-        $this->assertSame(['k' => false], $call->result);
-        $this->assertSame(0, $call->hits);
-        $this->assertSame(1, $call->misses);
-        $this->assertNotEmpty($call->start);
-        $this->assertNotEmpty($call->end);
-    }
-
-    public function testGetHitTrace()
-    {
-        $pool = $this->createSimpleCache();
-        $pool->set('k', 'foo');
-        $pool->get('k');
-        $calls = $pool->getCalls();
-        $this->assertCount(2, $calls);
-
-        $call = $calls[1];
-        $this->assertSame(1, $call->hits);
-        $this->assertSame(0, $call->misses);
-    }
-
-    public function testGetMultipleMissTrace()
-    {
-        $pool = $this->createSimpleCache();
-        $pool->set('k1', 123);
-        $values = $pool->getMultiple(['k0', 'k1']);
-        foreach ($values as $value) {
-        }
-        $calls = $pool->getCalls();
-        $this->assertCount(2, $calls);
-
-        $call = $calls[1];
-        $this->assertSame('getMultiple', $call->name);
-        $this->assertSame(['k1' => true, 'k0' => false], $call->result);
-        $this->assertSame(1, $call->misses);
-        $this->assertNotEmpty($call->start);
-        $this->assertNotEmpty($call->end);
-    }
-
-    public function testHasMissTrace()
-    {
-        $pool = $this->createSimpleCache();
-        $pool->has('k');
-        $calls = $pool->getCalls();
-        $this->assertCount(1, $calls);
-
-        $call = $calls[0];
-        $this->assertSame('has', $call->name);
-        $this->assertSame(['k' => false], $call->result);
-        $this->assertNotEmpty($call->start);
-        $this->assertNotEmpty($call->end);
-    }
-
-    public function testHasHitTrace()
-    {
-        $pool = $this->createSimpleCache();
-        $pool->set('k', 'foo');
-        $pool->has('k');
-        $calls = $pool->getCalls();
-        $this->assertCount(2, $calls);
-
-        $call = $calls[1];
-        $this->assertSame('has', $call->name);
-        $this->assertSame(['k' => true], $call->result);
-        $this->assertNotEmpty($call->start);
-        $this->assertNotEmpty($call->end);
-    }
-
-    public function testDeleteTrace()
-    {
-        $pool = $this->createSimpleCache();
-        $pool->delete('k');
-        $calls = $pool->getCalls();
-        $this->assertCount(1, $calls);
-
-        $call = $calls[0];
-        $this->assertSame('delete', $call->name);
-        $this->assertSame(['k' => true], $call->result);
-        $this->assertSame(0, $call->hits);
-        $this->assertSame(0, $call->misses);
-        $this->assertNotEmpty($call->start);
-        $this->assertNotEmpty($call->end);
-    }
-
-    public function testDeleteMultipleTrace()
-    {
-        $pool = $this->createSimpleCache();
-        $arg = ['k0', 'k1'];
-        $pool->deleteMultiple($arg);
-        $calls = $pool->getCalls();
-        $this->assertCount(1, $calls);
-
-        $call = $calls[0];
-        $this->assertSame('deleteMultiple', $call->name);
-        $this->assertSame(['keys' => $arg, 'result' => true], $call->result);
-        $this->assertSame(0, $call->hits);
-        $this->assertSame(0, $call->misses);
-        $this->assertNotEmpty($call->start);
-        $this->assertNotEmpty($call->end);
-    }
-
-    public function testTraceSetTrace()
-    {
-        $pool = $this->createSimpleCache();
-        $pool->set('k', 'foo');
-        $calls = $pool->getCalls();
-        $this->assertCount(1, $calls);
-
-        $call = $calls[0];
-        $this->assertSame('set', $call->name);
-        $this->assertSame(['k' => true], $call->result);
-        $this->assertSame(0, $call->hits);
-        $this->assertSame(0, $call->misses);
-        $this->assertNotEmpty($call->start);
-        $this->assertNotEmpty($call->end);
-    }
-
-    public function testSetMultipleTrace()
-    {
-        $pool = $this->createSimpleCache();
-        $pool->setMultiple(['k' => 'foo']);
-        $calls = $pool->getCalls();
-        $this->assertCount(1, $calls);
-
-        $call = $calls[0];
-        $this->assertSame('setMultiple', $call->name);
-        $this->assertSame(['keys' => ['k'], 'result' => true], $call->result);
-        $this->assertSame(0, $call->hits);
-        $this->assertSame(0, $call->misses);
-        $this->assertNotEmpty($call->start);
-        $this->assertNotEmpty($call->end);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Traits/PdoPruneableTrait.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Traits/PdoPruneableTrait.php
deleted file mode 100644
index c405de70..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Traits/PdoPruneableTrait.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Traits;
-
-trait PdoPruneableTrait
-{
-    protected function isPruned($cache, $name)
-    {
-        $o = new \ReflectionObject($cache);
-
-        if (!$o->hasMethod('getConnection')) {
-            self::fail('Cache does not have "getConnection()" method.');
-        }
-
-        $getPdoConn = $o->getMethod('getConnection');
-        $getPdoConn->setAccessible(true);
-
-        /** @var \Doctrine\DBAL\Statement|\PDOStatement $select */
-        $select = $getPdoConn->invoke($cache)->prepare('SELECT 1 FROM cache_items WHERE item_id LIKE :id');
-        $select->bindValue(':id', sprintf('%%%s', $name));
-        $result = $select->execute();
-
-        return 1 !== (int) (\is_object($result) ? $result->fetchOne() : $select->fetch(\PDO::FETCH_COLUMN));
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/phpunit.xml.dist b/advancedcontentfilter/vendor/symfony/cache/phpunit.xml.dist
deleted file mode 100644
index c35458ca..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/phpunit.xml.dist
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.2/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
-         failOnRisky="true"
-         failOnWarning="true"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-        <env name="REDIS_HOST" value="localhost" />
-        <env name="MEMCACHED_HOST" value="localhost" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Symfony Cache Component Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener">
-            <arguments>
-                <array>
-                    <element key="time-sensitive">
-                        <array>
-                            <element key="0"><string>Cache\IntegrationTests</string></element>
-                            <element key="1"><string>Doctrine\Common\Cache</string></element>
-                            <element key="2"><string>Symfony\Component\Cache</string></element>
-                            <element key="3"><string>Symfony\Component\Cache\Tests\Fixtures</string></element>
-                            <element key="4"><string>Symfony\Component\Cache\Traits</string></element>
-                        </array>
-                    </element>
-                </array>
-            </arguments>
-        </listener>
-    </listeners>
-</phpunit>
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-apcu/Apcu.php b/advancedcontentfilter/vendor/symfony/polyfill-apcu/Apcu.php
deleted file mode 100644
index 4dc5bf9a..00000000
--- a/advancedcontentfilter/vendor/symfony/polyfill-apcu/Apcu.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Polyfill\Apcu;
-
-/**
- * Apcu for Zend Server Data Cache.
- *
- * @author Kate Gray <opensource@codebykate.com>
- * @author Nicolas Grekas <p@tchwork.com>
- *
- * @internal
- */
-final class Apcu
-{
-    public static function apcu_add($key, $var = null, $ttl = 0)
-    {
-        if (!\is_array($key)) {
-            return apc_add($key, $var, $ttl);
-        }
-
-        $errors = [];
-        foreach ($key as $k => $v) {
-            if (!apc_add($k, $v, $ttl)) {
-                $errors[$k] = -1;
-            }
-        }
-
-        return $errors;
-    }
-
-    public static function apcu_store($key, $var = null, $ttl = 0)
-    {
-        if (!\is_array($key)) {
-            return apc_store($key, $var, $ttl);
-        }
-
-        $errors = [];
-        foreach ($key as $k => $v) {
-            if (!apc_store($k, $v, $ttl)) {
-                $errors[$k] = -1;
-            }
-        }
-
-        return $errors;
-    }
-
-    public static function apcu_exists($keys)
-    {
-        if (!\is_array($keys)) {
-            return apc_exists($keys);
-        }
-
-        $existing = [];
-        foreach ($keys as $k) {
-            if (apc_exists($k)) {
-                $existing[$k] = true;
-            }
-        }
-
-        return $existing;
-    }
-
-    public static function apcu_fetch($key, &$success = null)
-    {
-        if (!\is_array($key)) {
-            return apc_fetch($key, $success);
-        }
-
-        $succeeded = true;
-        $values = [];
-        foreach ($key as $k) {
-            $v = apc_fetch($k, $success);
-            if ($success) {
-                $values[$k] = $v;
-            } else {
-                $succeeded = false;
-            }
-        }
-        $success = $succeeded;
-
-        return $values;
-    }
-
-    public static function apcu_delete($key)
-    {
-        if (!\is_array($key)) {
-            return apc_delete($key);
-        }
-
-        $success = true;
-        foreach ($key as $k) {
-            $success = apc_delete($k) && $success;
-        }
-
-        return $success;
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-apcu/LICENSE b/advancedcontentfilter/vendor/symfony/polyfill-apcu/LICENSE
deleted file mode 100644
index 6e3afce6..00000000
--- a/advancedcontentfilter/vendor/symfony/polyfill-apcu/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2015-present Fabien Potencier
-
-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/advancedcontentfilter/vendor/symfony/polyfill-apcu/README.md b/advancedcontentfilter/vendor/symfony/polyfill-apcu/README.md
deleted file mode 100644
index 57f4bf6b..00000000
--- a/advancedcontentfilter/vendor/symfony/polyfill-apcu/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Symfony Polyfill / APCu
-========================
-
-This component provides `apcu_*` functions and the `APCuIterator` class to users of the legacy APC extension.
-
-More information can be found in the
-[main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md).
-
-License
-=======
-
-This library is released under the [MIT license](LICENSE).
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-apcu/bootstrap.php b/advancedcontentfilter/vendor/symfony/polyfill-apcu/bootstrap.php
deleted file mode 100644
index 96b2706a..00000000
--- a/advancedcontentfilter/vendor/symfony/polyfill-apcu/bootstrap.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Symfony\Polyfill\Apcu as p;
-
-if (!extension_loaded('apc') && !extension_loaded('apcu')) {
-    return;
-}
-
-if (\PHP_VERSION_ID >= 80000) {
-    return require __DIR__.'/bootstrap80.php';
-}
-
-if (extension_loaded('Zend Data Cache')) {
-    if (!function_exists('apcu_add')) {
-        function apcu_add($key, $value = null, $ttl = 0) { return p\Apcu::apcu_add($key, $value, $ttl); }
-    }
-    if (!function_exists('apcu_delete')) {
-        function apcu_delete($key) { return p\Apcu::apcu_delete($key); }
-    }
-    if (!function_exists('apcu_exists')) {
-        function apcu_exists($key) { return p\Apcu::apcu_exists($key); }
-    }
-    if (!function_exists('apcu_fetch')) {
-        function apcu_fetch($key, &$success = null) { return p\Apcu::apcu_fetch($key, $success); }
-    }
-    if (!function_exists('apcu_store')) {
-        function apcu_store($key, $value = null, $ttl = 0) { return p\Apcu::apcu_store($key, $value, $ttl); }
-    }
-} else {
-    if (!function_exists('apcu_add')) {
-        function apcu_add($key, $value = null, $ttl = 0) { return apc_add($key, $value, $ttl); }
-    }
-    if (!function_exists('apcu_delete')) {
-        function apcu_delete($key) { return apc_delete($key); }
-    }
-    if (!function_exists('apcu_exists')) {
-        function apcu_exists($key) { return apc_exists($key); }
-    }
-    if (!function_exists('apcu_fetch')) {
-        function apcu_fetch($key, &$success = null) { return apc_fetch($key, $success); }
-    }
-    if (!function_exists('apcu_store')) {
-        function apcu_store($key, $value = null, $ttl = 0) { return apc_store($key, $value, $ttl); }
-    }
-}
-
-if (!function_exists('apcu_cache_info')) {
-    function apcu_cache_info($limited = false) { return apc_cache_info('user', $limited); }
-}
-if (!function_exists('apcu_cas')) {
-    function apcu_cas($key, $old, $new) { return apc_cas($key, $old, $new); }
-}
-if (!function_exists('apcu_clear_cache')) {
-    function apcu_clear_cache() { return apc_clear_cache('user'); }
-}
-if (!function_exists('apcu_dec')) {
-    function apcu_dec($key, $step = 1, &$success = false) { return apc_dec($key, $step, $success); }
-}
-if (!function_exists('apcu_inc')) {
-    function apcu_inc($key, $step = 1, &$success = false) { return apc_inc($key, $step, $success); }
-}
-if (!function_exists('apcu_sma_info')) {
-    function apcu_sma_info($limited = false) { return apc_sma_info($limited); }
-}
-
-if (!class_exists('APCuIterator', false) && class_exists('APCIterator', false)) {
-    class APCuIterator extends APCIterator
-    {
-        public function __construct($search = null, $format = \APC_ITER_ALL, $chunk_size = 100, $list = \APC_LIST_ACTIVE)
-        {
-            parent::__construct('user', $search, $format, $chunk_size, $list);
-        }
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-apcu/bootstrap80.php b/advancedcontentfilter/vendor/symfony/polyfill-apcu/bootstrap80.php
deleted file mode 100644
index 69e9f160..00000000
--- a/advancedcontentfilter/vendor/symfony/polyfill-apcu/bootstrap80.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Symfony\Polyfill\Apcu as p;
-
-if (extension_loaded('Zend Data Cache')) {
-    if (!function_exists('apcu_add')) {
-        function apcu_add($key, mixed $value, ?int $ttl = 0): array|bool { return p\Apcu::apcu_add($key, $value, (int) $ttl); }
-    }
-    if (!function_exists('apcu_delete')) {
-        function apcu_delete($key): array|bool { return p\Apcu::apcu_delete($key); }
-    }
-    if (!function_exists('apcu_exists')) {
-        function apcu_exists($key): array|bool { return p\Apcu::apcu_exists($key); }
-    }
-    if (!function_exists('apcu_fetch')) {
-        function apcu_fetch($key, &$success = null): mixed { return p\Apcu::apcu_fetch($key, $success); }
-    }
-    if (!function_exists('apcu_store')) {
-        function apcu_store($key, mixed $value, ?int $ttl = 0): array|bool { return p\Apcu::apcu_store($key, $value, (int) $ttl); }
-    }
-} else {
-    if (!function_exists('apcu_add')) {
-        function apcu_add($key, mixed $value, ?int $ttl = 0): array|bool { return apc_add($key, $value, (int) $ttl); }
-    }
-    if (!function_exists('apcu_delete')) {
-        function apcu_delete($key): array|bool { return apc_delete($key); }
-    }
-    if (!function_exists('apcu_exists')) {
-        function apcu_exists($key): array|bool { return apc_exists($key); }
-    }
-    if (!function_exists('apcu_fetch')) {
-        function apcu_fetch($key, &$success = null) { return apc_fetch($key, $success); }
-    }
-    if (!function_exists('apcu_store')) {
-        function apcu_store($key, mixed $value, ?int $ttl = 0): array|bool { return apc_store($key, $value, (int) $ttl); }
-    }
-}
-
-if (!function_exists('apcu_cache_info')) {
-    function apcu_cache_info($limited = false) { return apc_cache_info('user', $limited); }
-}
-if (!function_exists('apcu_cas')) {
-    function apcu_cas($key, $old, $new) { return apc_cas($key, $old, $new); }
-}
-if (!function_exists('apcu_clear_cache')) {
-    function apcu_clear_cache() { return apc_clear_cache('user'); }
-}
-if (!function_exists('apcu_dec')) {
-    function apcu_dec($key, $step = 1, &$success = false) { return apc_dec($key, $step, $success); }
-}
-if (!function_exists('apcu_inc')) {
-    function apcu_inc($key, $step = 1, &$success = false) { return apc_inc($key, $step, $success); }
-}
-if (!function_exists('apcu_sma_info')) {
-    function apcu_sma_info($limited = false) { return apc_sma_info($limited); }
-}
-
-if (!class_exists('APCuIterator', false) && class_exists('APCIterator', false)) {
-    class APCuIterator extends APCIterator
-    {
-        public function __construct($search = null, $format = APC_ITER_ALL, $chunk_size = 100, $list = APC_LIST_ACTIVE)
-        {
-            parent::__construct('user', $search, $format, $chunk_size, $list);
-        }
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-apcu/composer.json b/advancedcontentfilter/vendor/symfony/polyfill-apcu/composer.json
deleted file mode 100644
index e92524f3..00000000
--- a/advancedcontentfilter/vendor/symfony/polyfill-apcu/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "symfony/polyfill-apcu",
-    "type": "library",
-    "description": "Symfony polyfill backporting apcu_* functions to lower PHP versions",
-    "keywords": ["polyfill", "shim", "compatibility", "portable", "apcu"],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Nicolas Grekas",
-            "email": "p@tchwork.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=7.1"
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Polyfill\\Apcu\\": "" },
-        "files": [ "bootstrap.php" ]
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-main": "1.28-dev"
-        },
-        "thanks": {
-            "name": "symfony/polyfill",
-            "url": "https://github.com/symfony/polyfill"
-        }
-    }
-}

From 7fcbd76c6b9a0d2b8a704fc5739c4f2d31f15c9f Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 20 Nov 2024 07:03:42 +0000
Subject: [PATCH 126/294] Bluesky: Improved handling of starter packs

---
 bluesky/bluesky.php | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index d719eecb..a78480b6 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1481,11 +1481,7 @@ function bluesky_add_media(stdClass $embed, array $item, int $fetch_uid, int $le
 			if (!empty($embed->record->record->$type)) {
 				$embed_type = $embed->record->record->$type;
 				if ($embed_type == 'app.bsky.graph.starterpack') {
-					Logger::debug('Starterpacks are not fetched like posts', ['original-uri' => $original_uri]);
-					if (empty($item['body'])) {
-						// @todo process starterpack
-						$item['body'] = '[url=' . $embed->record->record->list . ']' . $embed->record->record->name . '[/url]';
-					}
+					bluesky_add_starterpack($item, $embed->record);
 					break;
 				}
 			}
@@ -1523,6 +1519,30 @@ function bluesky_add_media(stdClass $embed, array $item, int $fetch_uid, int $le
 	return $item;
 }
 
+function bluesky_add_starterpack(array $item, stdClass $record)
+{
+	Logger::debug('Received starterpack', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'uri' => $record->uri]);
+	if (!preg_match('#^at://(.+)/app.bsky.graph.starterpack/(.+)#', $record->uri, $matches)) {
+		return;
+	}
+
+	$media = [
+		'uri-id'      => $item['uri-id'],
+		'type'        => Post\Media::HTML,
+		'url'         => 'https://bsky.app/starter-pack/' . $matches[1] . '/' . $matches[2],
+		'name'        => $record->record->name,
+		'description' => $record->record->description,
+	];
+
+	Post\Media::insert($media);
+
+	$fields = [
+		'name'        => $record->record->name,
+		'description' => $record->record->description,
+	];
+	Post\Media::update($fields, ['uri-id' => $media['uri-id'], 'url' => $media['url']]);
+}
+
 function bluesky_get_uri(stdClass $post): string
 {
 	if (empty($post->cid)) {

From f52bb75c97125045e6e5b2f9d1d743639120eb99 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 20 Nov 2024 21:39:09 +0000
Subject: [PATCH 127/294] Blockbot: Drupal added

---
 blockbot/blockbot.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php
index adf0a7c2..022f188d 100644
--- a/blockbot/blockbot.php
+++ b/blockbot/blockbot.php
@@ -461,7 +461,7 @@ function blockbot_is_social_media(array $parts): bool
 
 	$agents = [
 		'facebookexternalhit', 'twitterbot', 'mastodon', 'facebookexternalua',
-		'friendica', 'diasporafederation', 'buzzrelay', 'activityrelay',
+		'friendica', 'diasporafederation', 'buzzrelay', 'activityrelay', 'drupal',
 		'aoderelay', 'ap-relay', 'peertube', 'misskey', 'pleroma', 'foundkey', 'akkoma',
 		'lemmy', 'calckey', 'mobilizon', 'zot', 'camo-rs', 'gotosocial', 'pixelfed',
 		'pixelfedbot', 'app.wafrn.net', 'go-camo', 'http://a.gup.pe', 'iceshrimp',

From 2ea40dc897c90d65c7be085fbd66fb5cc8d70c96 Mon Sep 17 00:00:00 2001
From: Artur Weigandt <Art4@users.noreply.github.com>
Date: Sat, 23 Nov 2024 22:28:59 +0100
Subject: [PATCH 128/294] Remove unused App paramter in securemail addon

---
 securemail/securemail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/securemail/securemail.php b/securemail/securemail.php
index 5390ebd1..61125587 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -82,7 +82,7 @@ function securemail_settings_post(array &$b)
 		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'securemail', 'enable', $enable);
 
 		if (!empty($_POST['securemail-test'])) {
-			$res = DI::emailer()->send(new SecureTestEmail(DI::app(), DI::config(), DI::pConfig(), DI::baseUrl()));
+			$res = DI::emailer()->send(new SecureTestEmail(DI::config(), DI::pConfig(), DI::baseUrl()));
 
 			// revert to saved value
 			DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'securemail', 'enable', $enable);

From ecf0edb520c50edca5512f0c450761c5d9d56121 Mon Sep 17 00:00:00 2001
From: Artur Weigandt <Art4@users.noreply.github.com>
Date: Sat, 23 Nov 2024 09:32:43 +0100
Subject: [PATCH 129/294] Remove unused parameter webdav_storage addon

---
 webdav_storage/webdav_storage.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/webdav_storage/webdav_storage.php b/webdav_storage/webdav_storage.php
index adcbea29..fd2eb0d9 100644
--- a/webdav_storage/webdav_storage.php
+++ b/webdav_storage/webdav_storage.php
@@ -8,11 +8,10 @@
 
 use Friendica\Addon\webdav_storage\src\WebDav;
 use Friendica\Addon\webdav_storage\src\WebDavConfig;
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
-function webdav_storage_install($a)
+function webdav_storage_install()
 {
 	Hook::register('storage_instance' , __FILE__, 'webdav_storage_instance');
 	Hook::register('storage_config' , __FILE__, 'webdav_storage_config');

From bf679262b0b238378a75ed0c7f7436cfe999ac7d Mon Sep 17 00:00:00 2001
From: Artur Weigandt <Art4@users.noreply.github.com>
Date: Sat, 23 Nov 2024 22:42:52 +0100
Subject: [PATCH 130/294] Remove unused parameter in saml addon

---
 saml/saml.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/saml/saml.php b/saml/saml.php
index 56dd0f5d..9f065355 100755
--- a/saml/saml.php
+++ b/saml/saml.php
@@ -161,7 +161,7 @@ function saml_sso_reply()
 	}
 
 	if (!empty($user['uid'])) {
-		DI::auth()->setForUser(DI::app(), $user);
+		DI::auth()->setForUser($user);
 	}
 
 	if (isset($_POST['RelayState']) && Utils::getSelfURL() != $_POST['RelayState']) {

From 348c44c972e54090f329511e992c7ea5618dd862 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sun, 24 Nov 2024 15:36:37 +0000
Subject: [PATCH 131/294] inline slim routes and middlewares into
 advancedcontentfilter addon

---
 .../advancedcontentfilter.php                 | 25 +++++++++++--
 advancedcontentfilter/src/middlewares.php     | 32 -----------------
 advancedcontentfilter/src/routes.php          | 36 -------------------
 3 files changed, 23 insertions(+), 70 deletions(-)
 delete mode 100644 advancedcontentfilter/src/middlewares.php
 delete mode 100644 advancedcontentfilter/src/routes.php

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index 418b253e..84eb468c 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -192,9 +192,30 @@ function advancedcontentfilter_init()
 	if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'api') {
 		$slim = \Slim\Factory\AppFactory::create();
 
-		require __DIR__ . '/src/middlewares.php';
+		/**
+		 * The routing middleware should be added before the ErrorMiddleware
+		 * Otherwise exceptions thrown from it will not be handled
+		 */
+		$slim->addRoutingMiddleware();
+
+		$slim->addErrorMiddleware(true, true, true, DI::logger());
+
+		// register routes
+		$slim->group('/advancedcontentfilter/api', function (\Slim\Routing\RouteCollectorProxy $app) {
+			$app->group('/rules', function (\Slim\Routing\RouteCollectorProxy $app) {
+				$app->get('', 'advancedcontentfilter_get_rules');
+				$app->post('', 'advancedcontentfilter_post_rules');
+
+				$app->get('/{id}', 'advancedcontentfilter_get_rules_id');
+				$app->put('/{id}', 'advancedcontentfilter_put_rules_id');
+				$app->delete('/{id}', 'advancedcontentfilter_delete_rules_id');
+			});
+
+			$app->group('/variables', function (\Slim\Routing\RouteCollectorProxy $app) {
+				$app->get('/{guid}', 'advancedcontentfilter_get_variables_guid');
+			});
+		});
 
-		require __DIR__ . '/src/routes.php';
 		$slim->run();
 
 		exit;
diff --git a/advancedcontentfilter/src/middlewares.php b/advancedcontentfilter/src/middlewares.php
deleted file mode 100644
index 2b831473..00000000
--- a/advancedcontentfilter/src/middlewares.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2020, Friendica
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-use Friendica\DI;
-
-/** @var $slim \Slim\App */
-
-/**
- * The routing middleware should be added before the ErrorMiddleware
- * Otherwise exceptions thrown from it will not be handled
- */
-$slim->addRoutingMiddleware();
-
-$errorMiddleware = $slim->addErrorMiddleware(true, true, true, DI::logger());
diff --git a/advancedcontentfilter/src/routes.php b/advancedcontentfilter/src/routes.php
deleted file mode 100644
index a46f1b4b..00000000
--- a/advancedcontentfilter/src/routes.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2020, Friendica
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-/* @var $slim Slim\App */
-$slim->group('/advancedcontentfilter/api', function (\Slim\Routing\RouteCollectorProxy $app) {
-	$app->group('/rules', function (\Slim\Routing\RouteCollectorProxy $app) {
-		$app->get('', 'advancedcontentfilter_get_rules');
-		$app->post('', 'advancedcontentfilter_post_rules');
-
-		$app->get('/{id}', 'advancedcontentfilter_get_rules_id');
-		$app->put('/{id}', 'advancedcontentfilter_put_rules_id');
-		$app->delete('/{id}', 'advancedcontentfilter_delete_rules_id');
-	});
-
-	$app->group('/variables', function (\Slim\Routing\RouteCollectorProxy $app) {
-		$app->get('/{guid}', 'advancedcontentfilter_get_variables_guid');
-	});
-});

From e9d3afb483eff053d0e53d2f55d9d59cd6d7f29e Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sun, 24 Nov 2024 19:51:37 +0000
Subject: [PATCH 132/294] Fix errors in tictac addon

---
 tictac/tictac.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tictac/tictac.php b/tictac/tictac.php
index 0f9f4fb6..dc9f0348 100644
--- a/tictac/tictac.php
+++ b/tictac/tictac.php
@@ -70,6 +70,7 @@ class tictac {
   private $dimen;
   private $first_move = true;
   private $handicap = 0;
+  private $mefirst;
   private $yours;
   private $mine;
   private $winning_play;
@@ -161,10 +162,10 @@ class tictac {
 
   ];
 
-  function __construct($dimen,$handicap,$mefirst,$yours,$mine) {
+  function __construct($dimen, $handicap, $mefirst, $yours, $mine) {
     $this->dimen = 3;
-    $this->handicap = (($handicap) ? 1 : 0);
-    $this->mefirst = (($mefirst) ? 1 : 0);
+    $this->handicap = $handicap ? 1 : 0;
+    $this->mefirst = $mefirst ? 1 : 0;
     $this->yours = str_replace('XXX','',$yours);
     $this->mine  = $mine;
     $this->you = $this->parse_moves('you');
@@ -175,6 +176,7 @@ class tictac {
   }
 
   function play() {
+     $o = '';
 
      if($this->first_move) {
        if(rand(0,1) == 1) {

From 6df91dd37bd96bac74a2e347640b0a81684c3028 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sun, 24 Nov 2024 19:55:54 +0000
Subject: [PATCH 133/294] Fix errors in statusnet addon

---
 statusnet/library/codebirdsn.php | 7 +++----
 tictac/tictac.php                | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/statusnet/library/codebirdsn.php b/statusnet/library/codebirdsn.php
index 020c69c4..325bcb07 100644
--- a/statusnet/library/codebirdsn.php
+++ b/statusnet/library/codebirdsn.php
@@ -762,13 +762,13 @@ class CodebirdSN
      * @param string $method  The API method to call
      * @param array  $params  The parameters to send along
      *
-     * @return void
+     * @return string
      */
     protected function _buildMultipart($method, $params)
     {
         // well, files will only work in multipart methods
         if (! $this->_detectMultipart($method)) {
-            return;
+            return '';
         }
 
         // only check specific parameters
@@ -783,7 +783,7 @@ class CodebirdSN
         );
         // method might have files?
         if (! in_array($method, array_keys($possible_files))) {
-            return;
+            return '';
         }
 
         $possible_files = explode(' ', $possible_files[$method]);
@@ -794,7 +794,6 @@ class CodebirdSN
             // is it an array?
             if (is_array($value)) {
                 throw new \Exception('Using URL-encoded parameters is not supported for uploading media.');
-                continue;
             }
 
             // check for filenames
diff --git a/tictac/tictac.php b/tictac/tictac.php
index dc9f0348..10103835 100644
--- a/tictac/tictac.php
+++ b/tictac/tictac.php
@@ -631,7 +631,7 @@ function winning_move() {
   function draw_board() {
     if(! strlen($this->yours))
       $this->yours = 'XXX';
-    $o .=  "<form action=\"tictac/{$this->handicap}/{$this->mefirst}/{$this->dimen}/{$this->yours}/{$this->mine}\" method=\"post\" />";
+    $o =  "<form action=\"tictac/{$this->handicap}/{$this->mefirst}/{$this->dimen}/{$this->yours}/{$this->mine}\" method=\"post\" />";
     for($x = 0; $x < $this->dimen; $x ++) {
       $o .=  '<table>';
       for($y = 0; $y < $this->dimen; $y ++) {

From 422e4fd48f80487bf751acc3b19ebe6b5b1d8fc2 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 24 Nov 2024 09:11:25 +0000
Subject: [PATCH 134/294] Bluesky: Fetch quoted post for "uid=0"

---
 bluesky/bluesky.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index a78480b6..74d4fee8 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1036,7 +1036,7 @@ function bluesky_complete_post(stdClass $post, int $uid, int $post_reason, int $
 	}
 
 	if ($complete) {
-		$uri = bluesky_fetch_missing_post($post->uri, $uid, $uid, $post_reason, $causer, 0, $last_poll, '', true);
+		$uri = bluesky_fetch_missing_post(bluesky_get_uri($post), $uid, $uid, $post_reason, $causer, 0, $last_poll, '', true);
 		$uri_id = bluesky_fetch_uri_id($uri, $uid);
 	} else {
 		$uri_id = bluesky_process_post($post, $uid, $uid, $post_reason, $causer, 0, $last_poll);
@@ -1060,7 +1060,6 @@ function bluesky_process_reason(stdClass $reason, string $uri, int $uid)
 		'wall'          => false,
 		'uri'           => $reason->by->did . '/app.bsky.feed.repost/' . $reason->indexedAt,
 		'private'       => Item::UNLISTED,
-		'verb'          => Activity::POST,
 		'contact-id'    => $contact['id'],
 		'author-name'   => $contact['name'],
 		'author-link'   => $contact['url'],
@@ -1485,7 +1484,12 @@ function bluesky_add_media(stdClass $embed, array $item, int $fetch_uid, int $le
 					break;
 				}
 			}
-			$uri = bluesky_fetch_missing_post($uri, $item['uid'], $fetch_uid, Item::PR_FETCHED, $item['contact-id'], $level, $last_poll);
+			$fetched_uri = bluesky_fetch_post($uri, $item['uid']);
+			if (!$fetched_uri) {
+				$uri = bluesky_fetch_missing_post($uri, 0, $fetch_uid, Item::PR_FETCHED, $item['contact-id'], $level, $last_poll);
+			} else {
+				$uri = $fetched_uri;
+			}
 			if ($uri) {
 				$shared = Post::selectFirst(['uri-id'], ['uri' => $uri, 'uid' => [$item['uid'], 0]]);
 				$uri_id = $shared['uri-id'] ?? 0;

From d7d6a43655734a1ebeb0d70481452447baf5a80e Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Tue, 26 Nov 2024 07:55:01 +0000
Subject: [PATCH 135/294] Add checks for CLD2Detector ans CLD2Encoding classes

---
 cld/cld.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/cld/cld.php b/cld/cld.php
index 5ca4c932..83361e2b 100644
--- a/cld/cld.php
+++ b/cld/cld.php
@@ -22,6 +22,16 @@ function cld_detect_languages(array &$data)
 		return;
 	}
 
+	if (!class_exists('CLD2Detector')) {
+		Logger::warning('CLD2Detector class does not exist.');
+		return;
+	}
+
+	if (!class_exists('CLD2Encoding')) {
+		Logger::warning('CLD2Encoding class does not exist.');
+		return;
+	}
+
 	$cld2 = new \CLD2Detector();
 
 	$cld2->setEncodingHint(CLD2Encoding::UTF8); // optional, hints about text encoding

From fc0dda0cd9b607dc8d87f73644108f922f6bb1e1 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Tue, 26 Nov 2024 08:23:27 +0000
Subject: [PATCH 136/294] refactor convert addon, replace each() calls with
 foreach loop

---
 convert/convert.php | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/convert/convert.php b/convert/convert.php
index 57ce6ea8..2c97e2aa 100644
--- a/convert/convert.php
+++ b/convert/convert.php
@@ -6,7 +6,6 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 
 function convert_install() {
@@ -26,7 +25,7 @@ function convert_content() {
 	// @TODO Let's one day rewrite this to a modern composer package
 	include 'UnitConvertor.php';
 
-	class TP_Converter extends UnitConvertor
+	$conv = new class('en') extends UnitConvertor
 	{
 		public function __construct(string $lang = 'en')
 		{
@@ -43,7 +42,7 @@ function convert_content() {
 
 		private function findBaseUnit($from, $to)
 		{
-			while (list($skey, $sval) = each($this->bases)) {
+			foreach ($this->bases as $skey => $sval) {
 				if ($skey == $from || $to == $skey || in_array($to, $sval) || in_array($from, $sval)) {
 					return $skey;
 				}
@@ -63,7 +62,7 @@ function convert_content() {
 				$cells[] = $cell;
 
 				// We now have the base unit and value now lets produce the table;
-				while (list($key, $val) = each($this->bases[$base_unit])) {
+				foreach ($this->bases[$base_unit] as $val) {
 					$cell ['value'] = $this->convert($value, $from_unit, $val, $precision) . ' ' . $val;
 					$cell ['class']	= ($val == $from_unit || $val == $to_unit) ? 'framedred' : '';
 					$cells[] = $cell;
@@ -86,9 +85,7 @@ function convert_content() {
 
 			return $string;
 		}
-	}
-
-	$conv = new TP_Converter('en');
+	};
 
 	$conversions = [
 		'Temperature' => ['base'  => 'Celsius',
@@ -176,10 +173,10 @@ function convert_content() {
 		]
 	];
 
-	while (list($key, $val) = each($conversions)) {
+	foreach ($conversions as $key => $val) {
 		$conv->addConversion($val['base'], $val['conv']);
 		$list[$key][] = $val['base'];
-		while (list($ukey, $uval) = each($val['conv'])) {
+		foreach ($val['conv'] as $ukey => $uval) {
 			$list[$key][] = $ukey;
 		}
 	}
@@ -202,10 +199,9 @@ function convert_content() {
 	$o .= '<input name="value" type="text" id="value" value="' . $value . '" size="10" maxlength="10" />';
 	$o .= '<select name="from_unit" size="12">';
 
-	reset($list);
-	while(list($key, $val) = each($list)) {
+	foreach ($list as $key => $val) {
 		$o .=  "\n\t<optgroup label=\"$key\">";
-		while(list($ukey, $uval) = each($val)) {
+		foreach ($val as $ukey => $uval) {
 			$selected = (($uval == $_POST['from_unit']) ? ' selected="selected" ' : '');
 			$o .=  "\n\t\t<option value=\"$uval\" $selected >$uval</option>";
 		}

From 90ffd40d58814cb815aef4cf4d0e3077301cdbd4 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 11:38:55 +0000
Subject: [PATCH 137/294] remove wrong return tag

---
 convert/UnitConvertor.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/convert/UnitConvertor.php b/convert/UnitConvertor.php
index d7933a8f..a3650e9b 100644
--- a/convert/UnitConvertor.php
+++ b/convert/UnitConvertor.php
@@ -169,7 +169,6 @@ class UnitConvertor
 	* @param    string    name of the source unit from which to convert
     * @param    string    name of the target unit to which we are converting
     * @param    integer   double precision of the end result
-    * @return   void
     * @access   public
     */
 	function convert($value, $from_unit, $to_unit, $precision)
@@ -280,4 +279,4 @@ class UnitConvertor
 	} // end func getConvSpecs
 	
 } // end class UnitConvertor
-?>
\ No newline at end of file
+?>

From 9117626c6a5f1c16ca7e17efa26c8f4aa164ae10 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 11:40:45 +0000
Subject: [PATCH 138/294] Fix errors in diaspora addon

---
 diaspora/diasphp.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/diaspora/diasphp.php b/diaspora/diasphp.php
index 1588b582..266b9899 100644
--- a/diaspora/diasphp.php
+++ b/diaspora/diasphp.php
@@ -9,6 +9,8 @@ use Friendica\Core\System;
 
 class Diasphp {
 	private $cookiejar;
+	private $token_regex;
+	private $pod;
 
 	function __construct($pod) {
 		$this->token_regex = '/content="(.*?)" name="csrf-token/';

From 1346a92505d234a1a695c871c3a17913bff927d3 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 11:43:21 +0000
Subject: [PATCH 139/294] Fix errors in libravatar addon

---
 libravatar/Services/Libravatar.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libravatar/Services/Libravatar.php b/libravatar/Services/Libravatar.php
index 18aa5c90..70fcfe39 100644
--- a/libravatar/Services/Libravatar.php
+++ b/libravatar/Services/Libravatar.php
@@ -217,7 +217,7 @@ class Services_Libravatar
      *
      * @param array $options Array of options for getUrl()
      *
-     * @return void
+     * @return array
      * @throws Exception When an invalid option is used
      */
     protected function checkOptionsArray($options)
@@ -462,6 +462,8 @@ class Services_Libravatar
                 return $v['target'];
             }
         }
+
+        return '';
     }
 
     /**

From e488f597bec009385f3232e3e1d7ab92a62b34cb Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 11:52:59 +0000
Subject: [PATCH 140/294] Fix errors in mailstream addon

---
 mailstream/mailstream.php                | 2 +-
 mailstream/phpmailer/class.phpmailer.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index ae57c4dd..9910a63d 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -378,7 +378,7 @@ function mailstream_send(string $message_id, array $item, array $user): bool
 	if (!$address) {
 		$address = $user['email'];
 	}
-	$mail = new PHPmailer();
+	$mail = new PHPMailer();
 	try {
 		$mail->XMailer = 'Friendica Mailstream Addon';
 		$mail->SetFrom($frommail, mailstream_sender($item));
diff --git a/mailstream/phpmailer/class.phpmailer.php b/mailstream/phpmailer/class.phpmailer.php
index ab7fe030..a47b13f7 100644
--- a/mailstream/phpmailer/class.phpmailer.php
+++ b/mailstream/phpmailer/class.phpmailer.php
@@ -1519,6 +1519,7 @@ class PHPMailer
     public function getSMTPInstance()
     {
         if (!is_object($this->smtp)) {
+            /** @phpstan-ignore-next-line file class.smtp.php does not exist */
             $this->smtp = new SMTP;
         }
         return $this->smtp;
@@ -2705,7 +2706,7 @@ class PHPMailer
             $file_buffer = $this->encodeString($file_buffer, $encoding);
             if ($magic_quotes) {
                 if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-                    set_magic_quotes_runtime($magic_quotes);
+                    //set_magic_quotes_runtime($magic_quotes);
                 } else {
                     ini_set('magic_quotes_runtime', $magic_quotes);
                 }

From 7453c6f41ab4a2fbc3cec72f38dcfcbdde359080 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 22:33:12 +0000
Subject: [PATCH 141/294] fix error in PHPMailer

---
 mailstream/phpmailer/class.phpmailer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mailstream/phpmailer/class.phpmailer.php b/mailstream/phpmailer/class.phpmailer.php
index a47b13f7..ff3d81e3 100644
--- a/mailstream/phpmailer/class.phpmailer.php
+++ b/mailstream/phpmailer/class.phpmailer.php
@@ -2691,10 +2691,10 @@ class PHPMailer
             if (!is_readable($path)) {
                 throw new phpmailerException($this->lang('file_open') . $path, self::STOP_CONTINUE);
             }
-            $magic_quotes = get_magic_quotes_runtime();
+            $magic_quotes = false;
             if ($magic_quotes) {
                 if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-                    set_magic_quotes_runtime(false);
+                    //set_magic_quotes_runtime(false);
                 } else {
                     //Doesn't exist in PHP 5.4, but we don't need to check because
                     //get_magic_quotes_runtime always returns false in 5.4+

From a5aaea5211ff4cc5ee17dcd9e80fb09c39ce334c Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 22:55:15 +0000
Subject: [PATCH 142/294] fix errors in pnut addon, add support for PHP 7.4

---
 pnut/lib/phpnut.php | 173 +++++++++++++++++++++++---------------------
 1 file changed, 92 insertions(+), 81 deletions(-)

diff --git a/pnut/lib/phpnut.php b/pnut/lib/phpnut.php
index 303a860b..5794d795 100644
--- a/pnut/lib/phpnut.php
+++ b/pnut/lib/phpnut.php
@@ -2,6 +2,8 @@
 
 namespace phpnut;
 
+use CURLFile;
+
 /**
  * phpnut.php
  * pnut.io PHP library
@@ -99,6 +101,10 @@ class phpnut
     // if processing stream_markers or any fast stream, decrease $sleepFor
     public $streamingSleepFor = 20000;
 
+    private $_clientId;
+
+    private $_clientSecret;
+
     /**
      * Constructs an phpnut PHP object with the specified client ID and
      * client secret.
@@ -162,7 +168,7 @@ class phpnut
      * from the user. If you don't specify anything, you'll only receive
      * access to the user's basic profile (the default).
      */
-    public function getAuthUrl(?string $callback_uri=null, array|string|null $scope=null): string
+    public function getAuthUrl(?string $callback_uri=null, array $scope=null): string
     {
         if (empty($this->_clientId)) {
             throw new phpnutException('You must specify your pnut client ID');
@@ -256,8 +262,10 @@ class phpnut
     /**
      * Check the scope of current token to see if it has required scopes
      * has to be done after a check
+     *
+     * @return int|array
      */
-    public function checkScopes(array $app_scopes): int|array
+    public function checkScopes(array $app_scopes)
     {
         if (count($this->_scopes) === 0) {
             return -1; // _scope is empty
@@ -303,7 +311,7 @@ class phpnut
     {
         return $this->httpReq('delete', "{$this->_baseUrl}token");
     }
-    
+
     /**
      * Retrieve an app access token from the app.net API. This allows you
      * to access the API without going through the user access flow if you
@@ -314,7 +322,7 @@ class phpnut
      * @return string The app access token
      */
     public function getAppAccessToken()
-    {    
+    {
         if (empty($this->_clientId) || empty($this->_clientSecret)) {
             throw new phpnutException('You must specify your Pnut client ID and client secret');
         }
@@ -450,8 +458,10 @@ class phpnut
     /**
      * Internal function to handle all
      * HTTP requests (POST,PUT,GET,DELETE)
+     *
+     * @param string|array $params
      */
-    protected function httpReq(string $act, string $req, string|array $params=[], string $contentType='application/x-www-form-urlencoded')
+    protected function httpReq(string $act, string $req, $params = [], string $contentType='application/x-www-form-urlencoded')
     {
         $ch = curl_init($req);
         $headers = [];
@@ -520,7 +530,7 @@ class phpnut
                     } else {
                         throw new phpnutException($response['error']);
                     }
-                } 
+                }
 
                 // look for response migration errors
                 elseif (isset($response['meta'], $response['meta']['error_message'])) {
@@ -588,7 +598,7 @@ class phpnut
     {
         return $this->_last_request;
     }
-    
+
     public function getLastResponse()
     {
         return $this->_last_response;
@@ -752,7 +762,7 @@ class phpnut
      * Retrieve the Posts that are 'in reply to' a specific Post.
      * @param integer $post_id The ID of the post you want to retrieve replies for.
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getPostThread(int $post_id, array $params=[])
     {
@@ -767,7 +777,7 @@ class phpnut
      * Retrieve revisions of a post. Currently only one can be created.
      * @param integer $post_id The ID of the post you want to retrieve previous revisions of.
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getPostRevisions(int $post_id, array $params=[])
     {
@@ -781,13 +791,13 @@ class phpnut
     /**
      * Get the most recent Posts created by a specific User in reverse
      * chronological order (most recent first).
-     * @param mixed $user_id Either the ID of the user you wish to retrieve posts by,
+     * @param string|int $user_id $user_id Either the ID of the user you wish to retrieve posts by,
      * or the string "me", which will retrieve posts for the user you're authenticated
      * as.
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
-    public function getUserPosts(string|int $user_id='me', array $params=[])
+    public function getUserPosts($user_id = 'me', array $params=[])
     {
         return $this->httpReq(
             'get',
@@ -799,13 +809,13 @@ class phpnut
     /**
      * Get the most recent Posts mentioning by a specific User in reverse
      * chronological order (newest first).
-     * @param mixed $user_id Either the ID of the user who is being mentioned, or
+     * @param string|int $user_id Either the ID of the user who is being mentioned, or
      * the string "me", which will retrieve posts for the user you're authenticated
      * as.
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
-    public function getUserMentions(string|int $user_id='me', array $params=[])
+    public function getUserMentions($user_id='me', array $params=[])
     {
         return $this->httpReq(
             'get',
@@ -817,7 +827,7 @@ class phpnut
     /**
      * Get the currently authenticated user's recent messages
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getUserMessages(array $params=[])
     {
@@ -832,7 +842,7 @@ class phpnut
      * Return the 20 most recent posts from the current User and
      * the Users they follow.
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getUserStream(array $params=[])
     {
@@ -847,7 +857,7 @@ class phpnut
      * Retrieve a list of all public Posts on pnut.io, often referred to as the
      * global stream.
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getPublicPosts(array $params=[])
     {
@@ -860,7 +870,7 @@ class phpnut
 
     /**
      * Retrieve a list of "explore" streams
-     * @return An array of associative arrays, each representing a single explore stream.
+     * @return array An array of associative arrays, each representing a single explore stream.
      */
     public function getPostExploreStreams()
     {
@@ -874,7 +884,7 @@ class phpnut
      * Retrieve a list of posts from an "explore" stream on pnut.io.
      * @param  string $slug [<description>]
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getPostExploreStream(string $slug, array $params=[])
     {
@@ -916,10 +926,11 @@ class phpnut
     * are:    count, before_id, since_id, include_muted, include_deleted,
     * and include_post_raw.
     * See https://github.com/phpnut/api-spec/blob/master/resources/posts.md#general-parameters
+    * @param string|int $user_id
     * @return array An array of associative arrays, each representing a single
     * user who has bookmarked a post
     */
-    public function getBookmarked(string|int $user_id='me', array $params=[])
+    public function getBookmarked($user_id='me', array $params=[])
     {
         return $this->httpReq(
             'get',
@@ -967,7 +978,7 @@ class phpnut
     /**
      * Repost an existing Post object.
      * @param integer $post_id The id of the post
-     * @return the reposted post
+     * @return mixed the reposted post
      */
     public function repost(int $post_id)
     {
@@ -980,7 +991,7 @@ class phpnut
     /**
      * Delete a post that the user has reposted.
      * @param integer $post_id The id of the post
-     * @return the un-reposted post
+     * @return mixed the un-reposted post
      */
     public function deleteRepost(int $post_id)
     {
@@ -997,7 +1008,7 @@ class phpnut
      * This will likely change as the API evolves, as of this writing allowed keys
      * are: count, before_id, since_id, include_muted, include_deleted,
      * include_directed_posts, and include_raw.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function searchHashtags(string $hashtag, array $params=[])
     {
@@ -1044,7 +1055,7 @@ class phpnut
      * This will likely change as the API evolves, as of this writing allowed keys
      * are: count, before_id, since_id, include_muted, include_deleted,
      * and include_post_raw.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getUserPersonalStream(array $params=[])
     {
@@ -1063,7 +1074,7 @@ class phpnut
             );
         }
     }
-    
+
     /**
     * Return the 20 most recent Posts from the current User's personalized stream
     * and mentions stream merged into one stream.
@@ -1071,7 +1082,7 @@ class phpnut
     * This will likely change as the API evolves, as of this writing allowed keys
     * are: count, before_id, since_id, include_muted, include_deleted,
     * include_directed_posts, and include_raw.
-    * @return An array of associative arrays, each representing a single post.
+    * @return array An array of associative arrays, each representing a single post.
     */
     public function getUserUnifiedStream(array $params=[])
     {
@@ -1096,14 +1107,14 @@ class phpnut
 
     /**
      * Returns a specific user object.
-     * @param mixed $user_id The ID of the user you want to retrieve, or the string "@-username", or the string
+     * @param string|int $user_id The ID of the user you want to retrieve, or the string "@-username", or the string
      * "me" to retrieve data for the users you're currently authenticated as.
      * @param array $params An associative array of optional general parameters.
      * This will likely change as the API evolves, as of this writing allowed keys
      * are: include_raw|include_user_raw.
      * @return array An associative array representing the user data.
      */
-    public function getUser(string|int $user_id='me', array $params=[])
+    public function getUser($user_id='me', array $params=[])
     {
         return $this->httpReq(
             'get',
@@ -1131,10 +1142,10 @@ class phpnut
     /**
      * Add the specified user ID to the list of users followed.
      * Returns the User object of the user being followed.
-     * @param integer $user_id The user ID of the user to follow.
+     * @param string|int $user_id The user ID of the user to follow.
      * @return array An associative array representing the user you just followed.
      */
-    public function followUser(string|int $user_id)
+    public function followUser($user_id)
     {
         return $this->httpReq(
             'put',
@@ -1145,10 +1156,10 @@ class phpnut
     /**
      * Removes the specified user ID to the list of users followed.
      * Returns the User object of the user being unfollowed.
-     * @param integer $user_id The user ID of the user to unfollow.
+     * @param string|int $user_id The user ID of the user to unfollow.
      * @return array An associative array representing the user you just unfollowed.
      */
-    public function unfollowUser(string|int $user_id)
+    public function unfollowUser($user_id)
     {
         return $this->httpReq(
             'delete',
@@ -1158,13 +1169,13 @@ class phpnut
 
     /**
      * Returns an array of User objects the specified user is following.
-     * @param mixed $user_id Either the ID of the user being followed, or
+     * @param string|int $user_id Either the ID of the user being followed, or
      * the string "me", which will retrieve posts for the user you're authenticated
      * as.
      * @return array An array of associative arrays, each representing a single
      * user following $user_id
      */
-    public function getFollowing(string|int $user_id='me', array $params=[])
+    public function getFollowing($user_id='me', array $params=[])
     {
         return $this->httpReq(
             'get',
@@ -1172,31 +1183,31 @@ class phpnut
                 . $this->buildQueryString($params)
         );
     }
-    
+
     /**
      * Returns an array of User ids the specified user is following.
-     * @param mixed $user_id Either the ID of the user being followed, or
+     * @param string|int $user_id Either the ID of the user being followed, or
      * the string "me", which will retrieve posts for the user you're authenticated
      * as.
      * @return array user ids the specified user is following.
      */
-    public function getFollowingIDs(string|int $user_id='me')
+    public function getFollowingIDs($user_id='me')
     {
         return $this->httpReq(
             'get',
             "{$this->_baseUrl}users/{$user_id}/following?include_user=0"
         );
     }
-    
+
     /**
      * Returns an array of User objects for users following the specified user.
-     * @param mixed $user_id Either the ID of the user being followed, or
+     * @param string|int $user_id Either the ID of the user being followed, or
      * the string "me", which will retrieve posts for the user you're authenticated
      * as.
      * @return array An array of associative arrays, each representing a single
      * user following $user_id
      */
-    public function getFollowers(string|int $user_id='me', array $params=[])
+    public function getFollowers($user_id='me', array $params=[])
     {
         return $this->httpReq(
             'get',
@@ -1204,15 +1215,15 @@ class phpnut
                 . $this->buildQueryString($params)
         );
     }
-    
+
     /**
      * Returns an array of User ids for users following the specified user.
-     * @param mixed $user_id Either the ID of the user being followed, or
+     * @param string|int $user_id Either the ID of the user being followed, or
      * the string "me", which will retrieve posts for the user you're authenticated
      * as.
      * @return array user ids for users following the specified user
      */
-    public function getFollowersIDs(string|int $user_id='me')
+    public function getFollowersIDs($user_id='me')
     {
         return $this->httpReq(
             'get',
@@ -1236,9 +1247,9 @@ class phpnut
 
     /**
      * Mute a user
-     * @param integer $user_id The user ID to mute
+     * @param string|int $user_id The user ID to mute
      */
-    public function muteUser(string|int $user_id)
+    public function muteUser($user_id)
     {
          return $this->httpReq(
             'put',
@@ -1248,9 +1259,9 @@ class phpnut
 
     /**
      * Unmute a user
-     * @param integer $user_id The user ID to unmute
+     * @param string|int $user_id The user ID to unmute
      */
-    public function unmuteUser(string|int $user_id)
+    public function unmuteUser($user_id)
     {
         return $this->httpReq(
             'delete',
@@ -1288,7 +1299,7 @@ class phpnut
      * @param string $search The search query. Supports @username or #tag searches as
      * well as normal search terms. Searches username, display name, bio information.
      * Does not search posts.
-     * @return array An array of associative arrays, each representing one user.
+     * @return array|false An array of associative arrays, each representing one user.
      */
     public function searchUsers(array $params=[], string $query='')
     {
@@ -1333,7 +1344,7 @@ class phpnut
             $mimeType = $test['mime'];
         }
         $data = [
-            $which => new CurlFile($image, $mimeType)
+            $which => new CURLFile($image, $mimeType)
         ];
         return $this->httpReq(
             'post-raw',
@@ -1445,10 +1456,10 @@ class phpnut
 
     /**
      * get an existing private message channel between multiple users
-     * @param mixed $users Can be a comma- or space-separated string, or an array.
+     * @param string|array $users Can be a comma- or space-separated string, or an array.
      * Usernames with @-symbol, or user ids.
      */
-    public function getExistingPM(string|array $users, array $params=[])
+    public function getExistingPM($users, array $params=[])
     {
         if (is_string($users)) {
             $users = explode(',', str_replace(' ', ',', $users));
@@ -1561,7 +1572,7 @@ class phpnut
 
     /**
      * Retrieve a list of "explore" streams
-     * @return An array of associative arrays, each representing a single explore stream.
+     * @return array An array of associative arrays, each representing a single explore stream.
      */
     public function getChannelExploreStreams()
     {
@@ -1575,7 +1586,7 @@ class phpnut
      * Retrieve a list of channels from an "explore" stream on pnut.io.
      * @param  string $slug [<description>]
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single channel.
+     * @return array An array of associative arrays, each representing a single channel.
      */
     public function getChannelExploreStream(string $slug, array $params=[])
     {
@@ -1585,7 +1596,7 @@ class phpnut
                 . $this->buildQueryString($params)
         );
     }
-    
+
     /**
      * mark channel inactive
      */
@@ -1685,11 +1696,11 @@ class phpnut
 
     /**
      * create message
-     * @param $channelid numeric or "pm" for auto-channel (type=io.pnut.core.pm)
+     * @param string|int $channelid numeric or "pm" for auto-channel (type=io.pnut.core.pm)
      * @param array $data array('text'=>'YOUR_MESSAGE') If a type=io.pnut.core.pm, then "destinations" key can be set to address as an array of people to send this PM too
      * @param array $params query parameters
      */
-    public function createMessage(string|int $channelid, array $data, array $params=[])
+    public function createMessage($channelid, array $data, array $params=[])
     {
         if (isset($data['destinations'])) {
             if (is_string($data['destinations'])) {
@@ -1802,16 +1813,16 @@ class phpnut
     public function createFile($file, array $data, array $params=[])
     {
         if (!$file) {
-            throw new PhpnutException('You must specify a path to a file');
+            throw new phpnutException('You must specify a path to a file');
         }
         if (!file_exists($file)) {
-            throw new PhpnutException('File path specified does not exist');
+            throw new phpnutException('File path specified does not exist');
         }
         if (!is_readable($file)) {
-            throw new PhpnutException('File path specified is not readable');
+            throw new phpnutException('File path specified is not readable');
         }
         if (!array_key_exists('type', $data) || !$data['type']) {
-            throw new PhpnutException('Type is required when creating a file');
+            throw new phpnutException('Type is required when creating a file');
         }
         if (!array_key_exists('name', $data)) {
             $data['name'] = basename($file);
@@ -1823,7 +1834,7 @@ class phpnut
             $mimeType = null;
         }
         if (!array_key_exists('kind', $data)) {
-            $test = @getimagesize($path);
+            $test = @getimagesize($file);
             if ($test && array_key_exists('mime', $test)) {
                 $data['kind'] = 'image';
                 if (!$mimeType) {
@@ -1840,7 +1851,7 @@ class phpnut
             finfo_close($finfo);
         }
         if (!$mimeType) {
-            throw new PhpnutException('Unable to determine mime type of file, try specifying it explicitly');
+            throw new phpnutException('Unable to determine mime type of file, try specifying it explicitly');
         }
         $data['content'] = new \CurlFile($file, $mimeType);
         return $this->httpReq(
@@ -2001,7 +2012,7 @@ class phpnut
         $json = json_encode($data);
         return $this->httpReq(
             'post',
-            $this->_baseUrl.'polls?'.$this->buildQueryString($params), 
+            $this->_baseUrl.'polls?'.$this->buildQueryString($params),
             $json,
             'application/json'
         );
@@ -2019,7 +2030,7 @@ class phpnut
         return $this->httpReq(
             'put',
             $this->_baseUrl.'polls/'.urlencode($poll_id).'/response?'.$this->buildQueryString($params),
-            $json, 
+            $json,
             'application/json'
         );
     }
@@ -2118,7 +2129,7 @@ class phpnut
             $params
         );
     }
-    
+
     /**
      * Get User Information
      */
@@ -2129,7 +2140,7 @@ class phpnut
             "{$this->_baseUrl}token"
         );
     }
-    
+
     /**
      * Get Application Authorized User IDs
      */
@@ -2147,7 +2158,7 @@ class phpnut
             $params
         );
     }
-    
+
     /**
      * Get Application Authorized User Tokens
      */
@@ -2181,7 +2192,7 @@ class phpnut
     {
         $this->_streamCallback = $function;
     }
-    
+
     /**
      * Opens a stream that's been created for this user/app and starts sending
      * events/objects to your defined callback functions. You must define at
@@ -2231,7 +2242,7 @@ class phpnut
         );
         return true;
     }
-    
+
     /**
      * Close the currently open stream.
      * @return true;
@@ -2251,7 +2262,7 @@ class phpnut
         $this->_currentStream = null;
         $this->_multiStream = null;
     }
-    
+
     /**
      * Retrieve all streams for the current access token.
      * @return array An array of stream definitions.
@@ -2263,7 +2274,7 @@ class phpnut
             "{$this->_baseUrl}streams"
         );
     }
-    
+
     /**
      * Returns a single stream specified by a stream ID. The stream must have been
      * created with the current access token.
@@ -2276,7 +2287,7 @@ class phpnut
             $this->_baseUrl.'streams/'.urlencode($streamId)
         );
     }
-    
+
     /**
      * Creates a stream for the current app access token.
      *
@@ -2307,7 +2318,7 @@ class phpnut
         );
         return $response;
     }
-    
+
     /**
      * Update stream for the current app access token
      *
@@ -2338,7 +2349,7 @@ class phpnut
         );
         return $response;
     }
-     
+
     /**
      * Deletes a stream if you no longer need it.
      *
@@ -2352,7 +2363,7 @@ class phpnut
             $this->_baseUrl.'streams/'.urlencode($streamId)
         );
     }
-    
+
     /**
      * Deletes all streams created by the current access token.
      */
@@ -2363,7 +2374,7 @@ class phpnut
             "{$this->_baseUrl}streams"
         );
     }
-    
+
     /**
      * Internal function used to process incoming chunks from the stream. This is only
      * public because it needs to be accessed by CURL. Do not call or use this function
@@ -2394,7 +2405,7 @@ class phpnut
         }
         return strlen($data);
     }
-    
+
     /**
      * Opens a long lived HTTP connection to the pnut.io servers, and sends data
      * received to the httpStreamReceive function. As a general rule you should not
@@ -2426,7 +2437,7 @@ class phpnut
         $this->_lastStreamActivity = time();
         curl_multi_add_handle($this->_multiStream, $this->_currentStream);
     }
-    
+
     public function reconnectStream(): void
     {
         $this->closeStream();
@@ -2442,7 +2453,7 @@ class phpnut
         }
         $this->httpStream('get', $this->_streamUrl);
     }
-    
+
     /**
      * Process an open stream for x microseconds, then return. This is useful if you want
      * to be doing other things while processing the stream. If you just want to
@@ -2487,7 +2498,7 @@ class phpnut
             }
         } while ($timeSoFar+$sleepFor < $microseconds);
     }
-    
+
     /**
      * Process an open stream forever. This function will never return, if you
      * want to perform other actions while consuming the stream, you should use

From 787240046751b39f635af33c6e5a6c4162d02e68 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 23:14:01 +0000
Subject: [PATCH 143/294] Fix errors in pumpio addon

---
 pumpio/oauth/http.php | 86 ++++++++++++++++++++++---------------------
 1 file changed, 44 insertions(+), 42 deletions(-)

diff --git a/pumpio/oauth/http.php b/pumpio/oauth/http.php
index 5d5e23f0..3045e509 100644
--- a/pumpio/oauth/http.php
+++ b/pumpio/oauth/http.php
@@ -109,9 +109,11 @@ class http_class
 	var $connected_port = -1;
 	var $connected_ssl = 0;
 
+	private $content_length_set;
+
 	/* Private methods - DO NOT CALL */
 
-	Function Tokenize($string,$separator="")
+	private function Tokenize($string,$separator="")
 	{
 		if(!strcmp($separator,""))
 		{
@@ -135,18 +137,18 @@ class http_class
 		}
 	}
 
-	Function CookieEncode($value, $name)
+	private function CookieEncode($value, $name)
 	{
 		return($name ? str_replace("=", "%25", $value) : str_replace(";", "%3B", $value));
 	}
 
-	Function SetError($error, $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR)
+	private function SetError($error, $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR)
 	{
 		$this->error_code = $error_code;
 		return($this->error=$error);
 	}
 
-	Function SetPHPError($error, &$php_error_message, $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR)
+	private function SetPHPError($error, &$php_error_message, $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR)
 	{
 		if(IsSet($php_error_message)
 		&& strlen($php_error_message))
@@ -154,7 +156,7 @@ class http_class
 		return($this->SetError($error, $error_code));
 	}
 
-	Function SetDataAccessError($error,$check_connection=0)
+	private function SetDataAccessError($error,$check_connection=0)
 	{
 		$this->error=$error;
 		$this->error_code = HTTP_CLIENT_ERROR_COMMUNICATION_FAILURE;
@@ -174,7 +176,7 @@ class http_class
 		}
 	}
 
-	Function OutputDebug($message)
+	private function OutputDebug($message)
 	{
 		if($this->log_debug)
 			error_log($message);
@@ -188,7 +190,7 @@ class http_class
 		}
 	}
 
-	Function GetLine()
+	private function GetLine()
 	{
 		for($line="";;)
 		{
@@ -227,7 +229,7 @@ class http_class
 		}
 	}
 
-	Function PutLine($line)
+	private function PutLine($line)
 	{
 		if($this->debug)
 			$this->OutputDebug("C $line");
@@ -239,7 +241,7 @@ class http_class
 		return(1);
 	}
 
-	Function PutData($data)
+	private function PutData($data)
 	{
 		if(strlen($data))
 		{
@@ -254,7 +256,7 @@ class http_class
 		return(1);
 	}
 
-	Function FlushData()
+	private function FlushData()
 	{
 		if(!fflush($this->connection))
 		{
@@ -264,7 +266,7 @@ class http_class
 		return(1);
 	}
 
-	Function ReadChunkSize()
+	private function ReadChunkSize()
 	{
 		if($this->remaining_chunk==0)
 		{
@@ -289,7 +291,7 @@ class http_class
 		return("");
 	}
 
-	Function ReadBytes($length)
+	private function ReadBytes($length)
 	{
 		if($this->use_curl)
 		{
@@ -356,7 +358,7 @@ class http_class
 		return($bytes);
 	}
 
-	Function EndOfInput()
+	private function EndOfInput()
 	{
 		if($this->use_curl)
 			return($this->read_response>=strlen($this->response));
@@ -367,7 +369,7 @@ class http_class
 		return(feof($this->connection));
 	}
 
-	Function Resolve($domain, &$ip, $server_type)
+	private function Resolve($domain, &$ip, $server_type)
 	{
 		if(preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/',$domain))
 			$ip=$domain;
@@ -385,7 +387,7 @@ class http_class
 		return('');
 	}
 
-	Function Connect($host_name, $host_port, $ssl, $server_type = 'HTTP')
+	private function Connect($host_name, $host_port, $ssl, $server_type = 'HTTP')
 	{
 		$domain=$host_name;
 		$port = $host_port;
@@ -552,7 +554,7 @@ class http_class
 		}
 	}
 
-	Function Disconnect()
+	private function Disconnect()
 	{
 		if($this->debug)
 			$this->OutputDebug("Disconnected from ".$this->connected_host);
@@ -569,7 +571,7 @@ class http_class
 
 	/* Public methods */
 
-	Function GetRequestArguments($url, &$arguments)
+	public function GetRequestArguments($url, &$arguments)
 	{
 		$this->error = '';
 		$this->error_code = HTTP_CLIENT_ERROR_NO_ERROR;
@@ -621,7 +623,7 @@ class http_class
 		return("");
 	}
 
-	Function Open($arguments)
+	public function Open($arguments)
 	{
 		if(strlen($this->error))
 			return($this->error);
@@ -750,7 +752,7 @@ class http_class
 		return("");
 	}
 
-	Function Close($force = 0)
+	public function Close($force = 0)
 	{
 		if($this->state=="Disconnected")
 			return("1 already disconnected");
@@ -767,7 +769,7 @@ class http_class
 		return($this->Disconnect());
 	}
 
-	Function PickCookies(&$cookies,$secure)
+	private function PickCookies(&$cookies,$secure)
 	{
 		if(IsSet($this->cookies[$secure]))
 		{
@@ -803,7 +805,7 @@ class http_class
 		}
 	}
 
-	Function GetFileDefinition($file, &$definition)
+	private function GetFileDefinition($file, &$definition)
 	{
 		$name="";
 		if(IsSet($file["FileName"]))
@@ -990,9 +992,6 @@ class http_class
 			if(GetType($length=@filesize($file["FileName"]))!="integer")
 			{
 				$error="it was not possible to determine the length of the file ".$file["FileName"];
-				if(IsSet($php_errormsg)
-				&& strlen($php_errormsg))
-					$error.=": ".$php_errormsg;
 				if(!file_exists($file["FileName"]))
 					$error="it was not possible to access the file ".$file["FileName"];
 				return($error);
@@ -1007,7 +1006,7 @@ class http_class
 		return("");
 	}
 
-	Function ConnectFromProxy($arguments, &$headers)
+	private function ConnectFromProxy($arguments, &$headers)
 	{
 		if(!$this->PutLine('CONNECT '.$this->host_name.':'.($this->host_port ? $this->host_port : 443).' HTTP/1.0')
 		|| (strlen($this->user_agent)
@@ -1052,7 +1051,7 @@ class http_class
 		return("");
 	}
 
-	Function SendRequest($arguments)
+	public function SendRequest($arguments)
 	{
 		if(strlen($this->error))
 			return($this->error);
@@ -1440,7 +1439,7 @@ class http_class
 		return("");
 	}
 
-	Function SetCookie($name, $value, $expires="" , $path="/" , $domain="" , $secure=0, $verbatim=0)
+	private function SetCookie($name, $value, $expires="" , $path="/" , $domain="" , $secure=0, $verbatim=0)
 	{
 		if(strlen($this->error))
 			return($this->error);
@@ -1472,7 +1471,7 @@ class http_class
 		return("");
 	}
 
-	Function SendRequestBody($data, $end_of_data)
+	private function SendRequestBody($data, $end_of_data)
 	{
 		if(strlen($this->error))
 			return($this->error);
@@ -1508,7 +1507,7 @@ class http_class
 		return("");
 	}
 
-	Function ReadReplyHeadersResponse(&$headers)
+	private function ReadReplyHeadersResponse(&$headers)
 	{
 		$headers=array();
 		if(strlen($this->error))
@@ -1635,7 +1634,7 @@ class http_class
 		return("");
 	}
 
-	Function Redirect(&$headers)
+	private function Redirect(&$headers)
 	{
 		if($this->follow_redirect)
 		{
@@ -1678,7 +1677,7 @@ class http_class
 		return("");
 	}
 
-	Function Authenticate(&$headers, $proxy, &$proxy_authorization, &$user, &$password, &$realm, &$workstation)
+	private function Authenticate(&$headers, $proxy, &$proxy_authorization, &$user, &$password, &$realm, &$workstation)
 	{
 		if($proxy)
 		{
@@ -1697,9 +1696,10 @@ class http_class
 		if(IsSet($headers[$authenticate_header])
 		&& $this->sasl_authenticate)
 		{
-			if(function_exists("class_exists")
-			&& !class_exists("sasl_client_class"))
+			if(!class_exists('sasl_client_class'))
+			{
 				return($this->SetError("the SASL client class needs to be loaded to be able to authenticate".($proxy ? " with the proxy server" : "")." and access this site", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
+			}
 			if(GetType($headers[$authenticate_header])=="array")
 				$authenticate=$headers[$authenticate_header];
 			else
@@ -1719,7 +1719,7 @@ class http_class
 				else
 					$mechanisms[]=$mechanism;
 			}
-			$sasl=new sasl_client_class;
+			$sasl=new \sasl_client_class();
 			if(IsSet($user))
 				$sasl->SetCredential("user",$user);
 			if(IsSet($password))
@@ -1731,6 +1731,8 @@ class http_class
 			$sasl->SetCredential("uri",$this->request_uri);
 			$sasl->SetCredential("method",$this->request_method);
 			$sasl->SetCredential("session",$this->session);
+			$message = '';
+			$interactions = [];
 			do
 			{
 				$status=$sasl->Start($mechanisms,$message,$interactions);
@@ -1906,8 +1908,8 @@ class http_class
 		}
 		return("");
 	}
-	
-	Function ReadReplyHeaders(&$headers)
+
+	public function ReadReplyHeaders(&$headers)
 	{
 		if(strlen($error=$this->ReadReplyHeadersResponse($headers)))
 			return($error);
@@ -1938,7 +1940,7 @@ class http_class
 		return("");
 	}
 
-	Function ReadReplyBody(&$body,$length)
+	private function ReadReplyBody(&$body,$length)
 	{
 		$body="";
 		if(strlen($this->error))
@@ -1980,7 +1982,7 @@ class http_class
 		return("");
 	}
 
-	Function ReadWholeReplyBody(&$body)
+	public function ReadWholeReplyBody(&$body)
 	{
 		$body = '';
 		for(;;)
@@ -1993,7 +1995,7 @@ class http_class
 		}
 	}
 
-	Function SaveCookies(&$cookies, $domain='', $secure_only=0, $persistent_only=0)
+	private function SaveCookies(&$cookies, $domain='', $secure_only=0, $persistent_only=0)
 	{
 		$now=gmdate("Y-m-d H-i-s");
 		$cookies=array();
@@ -2034,17 +2036,17 @@ class http_class
 		}
 	}
 
-	Function SavePersistentCookies(&$cookies, $domain='', $secure_only=0)
+	private function SavePersistentCookies(&$cookies, $domain='', $secure_only=0)
 	{
 		$this->SaveCookies($cookies, $domain, $secure_only, 1);
 	}
 
-	Function GetPersistentCookies(&$cookies, $domain='', $secure_only=0)
+	private function GetPersistentCookies(&$cookies, $domain='', $secure_only=0)
 	{
 		$this->SavePersistentCookies($cookies, $domain, $secure_only);
 	}
 
-	Function RestoreCookies($cookies, $clear=1)
+	private function RestoreCookies($cookies, $clear=1)
 	{
 		$new_cookies=($clear ? array() : $this->cookies);
 		for($secure_cookies=0, Reset($cookies); $secure_cookies<count($cookies); Next($cookies), $secure_cookies++)

From 23227e5b0f6c53c2608004753dbb71e2cc488ae9 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 23:18:20 +0000
Subject: [PATCH 144/294] Fix classes in s3_storage addon

---
 s3_storage/src/S3Client.php | 8 ++++----
 s3_storage/src/S3Config.php | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/s3_storage/src/S3Client.php b/s3_storage/src/S3Client.php
index 643df2b0..613eda97 100644
--- a/s3_storage/src/S3Client.php
+++ b/s3_storage/src/S3Client.php
@@ -4,10 +4,10 @@ namespace Friendica\Addon\s3_storage\src;
 
 defined('AKEEBAENGINE') or define('AKEEBAENGINE', 1);
 
-use Akeeba\Engine\Postproc\Connector\S3v4\Configuration;
-use Akeeba\Engine\Postproc\Connector\S3v4\Connector;
-use Akeeba\Engine\Postproc\Connector\S3v4\Exception\CannotDeleteFile;
-use Akeeba\Engine\Postproc\Connector\S3v4\Input;
+use Akeeba\S3\Configuration;
+use Akeeba\S3\Connector;
+use Akeeba\S3\Exception\CannotDeleteFile;
+use Akeeba\S3\Input;
 use Friendica\Core\Storage\Capability\ICanWriteToStorage;
 use Friendica\Core\Storage\Exception\StorageException;
 use Friendica\Util\Strings;
diff --git a/s3_storage/src/S3Config.php b/s3_storage/src/S3Config.php
index 809cdd28..1831c666 100644
--- a/s3_storage/src/S3Config.php
+++ b/s3_storage/src/S3Config.php
@@ -4,8 +4,8 @@ namespace Friendica\Addon\s3_storage\src;
 
 defined('AKEEBAENGINE') or define('AKEEBAENGINE', 1);
 
-use Akeeba\Engine\Postproc\Connector\S3v4\Configuration;
-use Akeeba\Engine\Postproc\Connector\S3v4\Connector;
+use Akeeba\S3\Configuration;
+use Akeeba\S3\Connector;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Core\Storage\Capability\ICanConfigureStorage;

From 176cbcaf3aa47a6d840316b7c59d3b95eaa68b1d Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 27 Nov 2024 07:37:39 +0000
Subject: [PATCH 145/294] Bluesky: New option to set the protocol for a fetched
 post

---
 bluesky/bluesky.php | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 74d4fee8..38934feb 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1011,20 +1011,20 @@ function bluesky_fetch_timeline(int $uid)
 		$causer = bluesky_get_contact($entry->post->author, 0, $uid);
 		if (!empty($entry->reply)) {
 			if (!empty($entry->reply->root)) {
-				bluesky_complete_post($entry->reply->root, $uid, Item::PR_COMMENT, $causer['id'], $last_poll);
+				bluesky_complete_post($entry->reply->root, $uid, Item::PR_COMMENT, $causer['id'], $last_poll, Conversation::PARCEL_CONNECTOR);
 			}
 			if (!empty($entry->reply->parent)) {
-				bluesky_complete_post($entry->reply->parent, $uid, Item::PR_COMMENT, $causer['id'], $last_poll);
+				bluesky_complete_post($entry->reply->parent, $uid, Item::PR_COMMENT, $causer['id'], $last_poll, Conversation::PARCEL_CONNECTOR);
 			}
 		}
-		bluesky_process_post($entry->post, $uid, $uid, Item::PR_NONE, 0, 0, $last_poll);
+		bluesky_process_post($entry->post, $uid, $uid, Item::PR_NONE, 0, 0, $last_poll, Conversation::PARCEL_CONNECTOR);
 		if (!empty($entry->reason)) {
 			bluesky_process_reason($entry->reason, bluesky_get_uri($entry->post), $uid);
 		}
 	}
 }
 
-function bluesky_complete_post(stdClass $post, int $uid, int $post_reason, int $causer, int $last_poll): int
+function bluesky_complete_post(stdClass $post, int $uid, int $post_reason, int $causer, int $last_poll, int $protocol): int
 {
 	$complete     = DI::pConfig()->get($uid, 'bluesky', 'complete_threads');
 	$existing_uri = bluesky_fetch_post(bluesky_get_uri($post), $uid);
@@ -1039,7 +1039,7 @@ function bluesky_complete_post(stdClass $post, int $uid, int $post_reason, int $
 		$uri = bluesky_fetch_missing_post(bluesky_get_uri($post), $uid, $uid, $post_reason, $causer, 0, $last_poll, '', true);
 		$uri_id = bluesky_fetch_uri_id($uri, $uid);
 	} else {
-		$uri_id = bluesky_process_post($post, $uid, $uid, $post_reason, $causer, 0, $last_poll);
+		$uri_id = bluesky_process_post($post, $uid, $uid, $post_reason, $causer, 0, $last_poll, $protocol);
 	}
 	return $uri_id;
 }
@@ -1104,7 +1104,7 @@ function bluesky_fetch_notifications(int $uid)
 		Logger::debug('Process notification', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
 		switch ($notification->reason) {
 			case 'like':
-				$item = bluesky_get_header($notification, $uri, $uid, $uid, $last_poll);
+				$item = bluesky_get_header($notification, $uri, $uid, $uid, $last_poll, Conversation::PARCEL_CONNECTOR);
 				$item['gravity'] = Item::GRAVITY_ACTIVITY;
 				$item['body'] = $item['verb'] = Activity::LIKE;
 				$item['thr-parent'] = bluesky_get_uri($notification->record->subject);
@@ -1118,7 +1118,7 @@ function bluesky_fetch_notifications(int $uid)
 				break;
 
 			case 'repost':
-				$item = bluesky_get_header($notification, $uri, $uid, $uid, $last_poll);
+				$item = bluesky_get_header($notification, $uri, $uid, $uid, $last_poll, Conversation::PARCEL_CONNECTOR);
 				$item['gravity'] = Item::GRAVITY_ACTIVITY;
 				$item['body'] = $item['verb'] = Activity::ANNOUNCE;
 				$item['thr-parent'] = bluesky_get_uri($notification->record->subject);
@@ -1193,7 +1193,7 @@ function bluesky_fetch_feed(int $uid, string $feed)
 			continue;
 		}
 		$causer = bluesky_get_contact($entry->post->author, 0, $uid);
-		$uri_id = bluesky_complete_post($entry->post, $uid, Item::PR_TAG, $causer['id'], $last_poll);
+		$uri_id = bluesky_complete_post($entry->post, $uid, Item::PR_TAG, $causer['id'], $last_poll, Conversation::PARCEL_CONNECTOR);
 		if (!empty($uri_id)) {
 			$stored = Post\Category::storeFileByURIId($uri_id, $uid, Post\Category::SUBCRIPTION, $feedname, $feedurl);
 			Logger::debug('Stored tag subscription for user', ['uri-id' => $uri_id, 'uid' => $uid, 'name' => $feedname, 'url' => $feedurl, 'stored' => $stored]);
@@ -1206,7 +1206,7 @@ function bluesky_fetch_feed(int $uid, string $feed)
 	}
 }
 
-function bluesky_process_post(stdClass $post, int $uid, int $fetch_uid, int $post_reason, int $causer, int $level, int $last_poll): int
+function bluesky_process_post(stdClass $post, int $uid, int $fetch_uid, int $post_reason, int $causer, int $level, int $last_poll, int $protocol): int
 {
 	$uri = bluesky_get_uri($post);
 
@@ -1221,7 +1221,7 @@ function bluesky_process_post(stdClass $post, int $uid, int $fetch_uid, int $pos
 
 	Logger::debug('Importing post', ['uid' => $uid, 'indexedAt' => $post->indexedAt, 'uri' => $post->uri, 'cid' => $post->cid, 'root' => $post->record->reply->root ?? '']);
 
-	$item = bluesky_get_header($post, $uri, $uid, $fetch_uid, $last_poll);
+	$item = bluesky_get_header($post, $uri, $uid, $fetch_uid, $last_poll, $protocol);
 	$item = bluesky_get_content($item, $post->record, $uri, $uid, $fetch_uid, $level, $last_poll);
 	if (empty($item)) {
 		return 0;
@@ -1245,7 +1245,7 @@ function bluesky_process_post(stdClass $post, int $uid, int $fetch_uid, int $pos
 	return bluesky_fetch_uri_id($uri, $uid);
 }
 
-function bluesky_get_header(stdClass $post, string $uri, int $uid, int $fetch_uid, int $last_poll = 0): array
+function bluesky_get_header(stdClass $post, string $uri, int $uid, int $fetch_uid, int $last_poll, int $protocol): array
 {
 	$parts = bluesky_get_uri_parts($uri);
 	if (empty($post->author) || empty($post->cid) || empty($parts->rkey)) {
@@ -1254,7 +1254,7 @@ function bluesky_get_header(stdClass $post, string $uri, int $uid, int $fetch_ui
 	$contact = bluesky_get_contact($post->author, $uid, $fetch_uid);
 	$item = [
 		'network'       => Protocol::BLUESKY,
-		'protocol'      => Conversation::PARCEL_CONNECTOR,
+		'protocol'      => $protocol,
 		'uid'           => $uid,
 		'wall'          => false,
 		'uri'           => $uri,
@@ -1599,7 +1599,7 @@ function bluesky_get_uri_parts(string $uri): ?stdClass
 	return $class;
 }
 
-function bluesky_fetch_missing_post(string $uri, int $uid, int $fetch_uid, int $post_reason, int $causer, int $level, int $last_poll, string $fallback = '', bool $always_fetch = false): string
+function bluesky_fetch_missing_post(string $uri, int $uid, int $fetch_uid, int $post_reason, int $causer, int $level, int $last_poll, string $fallback = '', bool $always_fetch = false, int $Protocol = Conversation::PARCEL_CONNECTOR): string
 {
 	$fetched_uri = bluesky_fetch_post($uri, $uid);
 	if (!$always_fetch && !empty($fetched_uri)) {
@@ -1637,12 +1637,12 @@ function bluesky_fetch_missing_post(string $uri, int $uid, int $fetch_uid, int $
 		$parents = bluesky_fetch_parents($data->thread->parent, $uid);
 
 		foreach ($parents as $parent) {
-			$uri_id = bluesky_process_post($parent, $uid, $fetch_uid, Item::PR_FETCHED, $causer, $level, $last_poll);
+			$uri_id = bluesky_process_post($parent, $uid, $fetch_uid, Item::PR_FETCHED, $causer, $level, $last_poll, $Protocol);
 			Logger::debug('Parent created', ['uri-id' => $uri_id]);
 		}
 	}
 
-	return bluesky_process_thread($data->thread, $uid, $fetch_uid, $post_reason, $causer, $level, $last_poll);
+	return bluesky_process_thread($data->thread, $uid, $fetch_uid, $post_reason, $causer, $level, $last_poll, $Protocol);
 }
 
 function bluesky_fetch_parents(stdClass $parent, int $uid, array $parents = []): array
@@ -1688,7 +1688,7 @@ function bluesky_fetch_uri_id(string $uri, int $uid): string
 	return 0;
 }
 
-function bluesky_process_thread(stdClass $thread, int $uid, int $fetch_uid, int $post_reason, int $causer, int $level, int $last_poll): string
+function bluesky_process_thread(stdClass $thread, int $uid, int $fetch_uid, int $post_reason, int $causer, int $level, int $last_poll, int $protocol): string
 {
 	if (empty($thread->post)) {
 		Logger::info('Invalid post', ['post' => $thread]);
@@ -1698,7 +1698,7 @@ function bluesky_process_thread(stdClass $thread, int $uid, int $fetch_uid, int
 
 	$fetched_uri = bluesky_fetch_post($uri, $uid);
 	if (empty($fetched_uri)) {
-		$uri_id = bluesky_process_post($thread->post, $uid, $fetch_uid, $post_reason, $causer, $level, $last_poll);
+		$uri_id = bluesky_process_post($thread->post, $uid, $fetch_uid, $post_reason, $causer, $level, $last_poll, $protocol);
 		if ($uri_id) {
 			Logger::debug('Post has been processed and stored', ['uri-id' => $uri_id, 'uri' => $uri]);
 			return $uri;
@@ -1712,7 +1712,7 @@ function bluesky_process_thread(stdClass $thread, int $uid, int $fetch_uid, int
 	}
 
 	foreach ($thread->replies ?? [] as $reply) {
-		$reply_uri = bluesky_process_thread($reply, $uid, $fetch_uid, Item::PR_FETCHED, $causer, $level, $last_poll);
+		$reply_uri = bluesky_process_thread($reply, $uid, $fetch_uid, Item::PR_FETCHED, $causer, $level, $last_poll, $protocol);
 		Logger::debug('Reply has been processed', ['uri' => $uri, 'reply' => $reply_uri]);
 	}
 
@@ -1735,6 +1735,7 @@ function bluesky_get_contact(stdClass $author, int $uid, int $fetch_uid): array
 		$cid = Contact::insert($public_fields);
 	} else {
 		$cid = $contact['id'];
+		Logger::debug('Update contact', ['fields' => $public_fields, 'id' => $cid]);
 		Contact::update($public_fields, ['id' => $cid], true);
 	}
 
@@ -1754,6 +1755,7 @@ function bluesky_get_contact(stdClass $author, int $uid, int $fetch_uid): array
 			$cid = Contact::insert($fields);
 		} else {
 			$cid = $contact['id'];
+			Logger::debug('Update contact', ['fields' => $fields, 'id' => $cid]);
 			Contact::update($fields, ['id' => $cid], true);
 		}
 		Logger::debug('Get user contact', ['id' => $cid, 'uid' => $uid, 'update' => $update]);
@@ -1788,7 +1790,7 @@ function bluesky_get_contact_fields(stdClass $author, int $uid, int $fetch_uid,
 	];
 
 	if (!$update) {
-		Logger::debug('Got contact fields', ['uid' => $uid, 'url' => $fields['url']]);
+		Logger::debug('Got contact fields', ['uid' => $uid, 'url' => $fields['url'], 'fields' => $fields]);
 		return $fields;
 	}
 

From 5f2a9e9891e4524708116d598170e9172b30ffa3 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 29 Nov 2024 22:36:05 +0000
Subject: [PATCH 146/294] Fix error in bluesky addon

---
 bluesky/bluesky.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 74d4fee8..c91823e3 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1563,7 +1563,7 @@ function bluesky_get_uri_class(string $uri): ?stdClass
 	}
 
 	$elements = explode(':', $uri);
-	if (empty($elements) || ($elements[0] != 'at')) {
+	if ($elements[0] !== 'at') {
 		$post = Post::selectFirstPost(['extid'], ['uri' => $uri]);
 		return bluesky_get_uri_class($post['extid'] ?? '');
 	}

From 5664bc84fba5c8cd206b43f87685a1cbcb3b7a92 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:27:45 +0000
Subject: [PATCH 147/294] Fix errors in bluesky addon

---
 bluesky/bluesky.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 8e2c1ca0..91e524fe 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -683,6 +683,8 @@ function bluesky_create_activity(array $item, stdClass $parent = null)
 		return;
 	}
 
+	$post = [];
+
 	if ($item['verb'] == Activity::LIKE) {
 		$record = [
 			'subject'   => $parent,

From bee780552ddf974e6cb3a8788a81a7e88a782697 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:28:38 +0000
Subject: [PATCH 148/294] Fix errors in convert addon

---
 convert/convert.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/convert/convert.php b/convert/convert.php
index 2c97e2aa..2545974c 100644
--- a/convert/convert.php
+++ b/convert/convert.php
@@ -181,7 +181,7 @@ function convert_content() {
 		}
 	}
 
-	$o .= '<h3>Unit Conversions</h3>';
+	$o = '<h3>Unit Conversions</h3>';
 
 	if (isset($_POST['from_unit']) && isset($_POST['value'])) {
 		$o .= ($conv->getTable(intval($_POST['value']), $_POST['from_unit'], $_POST['to_unit'], 5)) . '</p>';

From 07993f70985713ac692d73fa0ad78fecffbb2432 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:30:39 +0000
Subject: [PATCH 149/294] Fix errors in js_upload addon

---
 .../file-uploader/tests/action-acceptance.php    | 16 ++++++++--------
 .../tests/action-handler-queue-test.php          |  8 ++++----
 .../file-uploader/tests/action-handler-test.php  |  8 ++++----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/js_upload/file-uploader/tests/action-acceptance.php b/js_upload/file-uploader/tests/action-acceptance.php
index fc9583f2..172b8857 100644
--- a/js_upload/file-uploader/tests/action-acceptance.php
+++ b/js_upload/file-uploader/tests/action-acceptance.php
@@ -2,12 +2,12 @@
 
 usleep(100000);
 
-$fileName;
-$fileSize;
+$fileName = '';
+$fileSize = 0;;
 
 if (isset($_GET['qqfile'])){
     $fileName = $_GET['qqfile'];
-    
+
 	// xhr request
 	$headers = apache_request_headers();
 	$fileSize = (int)$headers['Content-Length'];
@@ -34,13 +34,13 @@ if ($fileSize > 9 * 1024){
     die ('{error: "server-error file size is bigger than 9kB"}');
 }
 
-if (count($_GET)){	
+if (count($_GET)){
     array_merge($_GET, array('fileName'=>$fileName));
-    
+
     $response = array_merge($_GET, array('success'=>true, 'fileName'=>$fileName));
-    
-    // to pass data through iframe you will need to encode all html tags		
-	echo htmlspecialchars(json_encode($response), ENT_NOQUOTES);	
+
+    // to pass data through iframe you will need to encode all html tags
+	echo htmlspecialchars(json_encode($response), ENT_NOQUOTES);
 } else {
 	die ('{error: "server-error  query params not passed"}');
 }
diff --git a/js_upload/file-uploader/tests/action-handler-queue-test.php b/js_upload/file-uploader/tests/action-handler-queue-test.php
index ff13576d..78760d64 100644
--- a/js_upload/file-uploader/tests/action-handler-queue-test.php
+++ b/js_upload/file-uploader/tests/action-handler-queue-test.php
@@ -2,11 +2,11 @@
 
 sleep(4);
 
-$fileName;
+$fileName = '';
 
 if (isset($_GET['qqfile'])){
     $fileName = $_GET['qqfile'];
-    
+
 	// xhr request
 	$headers = apache_request_headers();
 	if ((int)$headers['Content-Length'] == 0){
@@ -14,7 +14,7 @@ if (isset($_GET['qqfile'])){
 	}
 } elseif (isset($_FILES['qqfile'])){
     $fileName = basename($_FILES['qqfile']['name']);
-    
+
 	// form request
 	if ($_FILES['qqfile']['size'] == 0){
 		die ('{error: "file size is zero"}');
@@ -25,7 +25,7 @@ if (isset($_GET['qqfile'])){
 
 if (count($_GET)){
     $_GET['success'] = true;
-	echo json_encode(array_merge($_GET));	
+	echo json_encode(array_merge($_GET));
 } else {
 	die ('{error: "query params not passed"}');
 }
diff --git a/js_upload/file-uploader/tests/action-handler-test.php b/js_upload/file-uploader/tests/action-handler-test.php
index 24466b12..9fa72023 100644
--- a/js_upload/file-uploader/tests/action-handler-test.php
+++ b/js_upload/file-uploader/tests/action-handler-test.php
@@ -2,11 +2,11 @@
 
 usleep(300);
 
-$fileName;
+$fileName = '';
 
 if (isset($_GET['qqfile'])){
     $fileName = $_GET['qqfile'];
-    
+
 	// xhr request
 	$headers = apache_request_headers();
 	if ((int)$headers['Content-Length'] == 0){
@@ -14,7 +14,7 @@ if (isset($_GET['qqfile'])){
 	}
 } elseif (isset($_FILES['qqfile'])){
     $fileName = basename($_FILES['qqfile']['name']);
-    
+
 	// form request
 	if ($_FILES['qqfile']['size'] == 0){
 		die ('{error: "file size is zero"}');
@@ -25,7 +25,7 @@ if (isset($_GET['qqfile'])){
 
 if (count($_GET)){
 	//return query params
-	echo json_encode(array_merge($_GET, array('fileName'=>$fileName)));	
+	echo json_encode(array_merge($_GET, array('fileName'=>$fileName)));
 } else {
 	die ('{error: "query params not passed"}');
 }

From 04afbe36e3e62625debec212ec1f6782edbb8bd4 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:32:07 +0000
Subject: [PATCH 150/294] Fix errors in keycloakpassword addon

---
 keycloakpassword/keycloakpassword.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/keycloakpassword/keycloakpassword.php b/keycloakpassword/keycloakpassword.php
index bfff4ea4..e9809f86 100644
--- a/keycloakpassword/keycloakpassword.php
+++ b/keycloakpassword/keycloakpassword.php
@@ -6,7 +6,6 @@
  * Author: Ryan <https://verya.pe/profile/ryan>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -92,7 +91,7 @@ function keycloakpassword_authenticate(array &$b)
 			$client_id,
 			$secret,
 			$endpoint . '/logout',
-			[ 'refresh_token' => res['refresh_token'] ]
+			[ 'refresh_token' => $res['refresh_token'] ]
 		);
 	}
 }

From fcec1a3d836b2134e318003bbd49e7a9a85cee30 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:35:19 +0000
Subject: [PATCH 151/294] Fix errors in langfilter addon

---
 langfilter/langfilter.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php
index e5efa8fb..2bf986f0 100644
--- a/langfilter/langfilter.php
+++ b/langfilter/langfilter.php
@@ -7,7 +7,6 @@
  * License: MIT
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
@@ -148,6 +147,8 @@ function langfilter_prepare_body_content_filter(&$hook_data)
 
 	$iso639 = new Matriphe\ISO639\ISO639;
 
+	$confidence = null;
+
 	// Extract the language of the post
 	if (!empty($hook_data['item']['language'])) {
 		$languages = json_decode($hook_data['item']['language'], true);

From ace19814d7a934e46ef5303be3ff05cc6279ddc2 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:37:58 +0000
Subject: [PATCH 152/294] Fix errors in leistungsschutzrecht addon

---
 leistungsschutzrecht/leistungsschutzrecht.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/leistungsschutzrecht/leistungsschutzrecht.php b/leistungsschutzrecht/leistungsschutzrecht.php
index f6c65399..ec8091ac 100644
--- a/leistungsschutzrecht/leistungsschutzrecht.php
+++ b/leistungsschutzrecht/leistungsschutzrecht.php
@@ -6,7 +6,6 @@
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\DI;
@@ -149,7 +148,7 @@ function leistungsschutzrecht_is_member_site(string $url): bool
 	$cleanedurlpart = explode('%', $urldata['host']);
 
 	$hostname = explode('.', $cleanedurlpart[0]);
-	if (empty($hostname)) {
+	if ($hostname === false || $hostname === '') {
 		return false;
 	}
 

From e86d15993b6794ea581624b34c0631685e8d14aa Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:41:11 +0000
Subject: [PATCH 153/294] Fix errors in libravatar addon

---
 libravatar/Services/Libravatar.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libravatar/Services/Libravatar.php b/libravatar/Services/Libravatar.php
index 70fcfe39..e51ef070 100644
--- a/libravatar/Services/Libravatar.php
+++ b/libravatar/Services/Libravatar.php
@@ -401,9 +401,8 @@ class Services_Libravatar
      */
     protected function srvGet($domain, $https = false)
     {
-
         // Are we going secure? Set up a fallback too.
-        if (isset($https) && $https === true) {
+        if ($https === true) {
             $subdomain = '_avatars-sec._tcp.';
             $fallback  = 'seccdn.';
         } else {
@@ -426,6 +425,7 @@ class Services_Libravatar
 
         $top = $srv[0];
         $sum = 0;
+        $pri = [];
 
         // Try to adhere to RFC2782's weighting algorithm, page 3
         // "arrange all SRV RRs (that have not been ordered yet) in any order,

From 5f6f374f09f8c186422d245d523644020694395b Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:42:40 +0000
Subject: [PATCH 154/294] Fix errors in ljpost addon

---
 ljpost/ljpost.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index 7acc6589..b416c605 100644
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -8,7 +8,6 @@
  * Author: Cat Gray <https://free-haven.org/profile/catness>
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
@@ -203,10 +202,12 @@ EOT;
 
 		Logger::debug('ljpost: data: ' . $xml);
 
+		$x = '';
+
 		if ($lj_blog !== 'test') {
 			$x = DI::httpClient()->post($lj_blog, $xml, ['Content-Type' => 'text/xml'])->getBodyString();
 		}
 
-		Logger::info('posted to livejournal: ' . ($x) ? $x : '');
+		Logger::info('posted to livejournal: ' . $x);
 	}
 }

From c04016b7d3b4e24adfa8f43e9420c004e9b7d36f Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:48:49 +0000
Subject: [PATCH 155/294] fix errors in mailstream addon

---
 mailstream/phpmailer/class.phpmailer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mailstream/phpmailer/class.phpmailer.php b/mailstream/phpmailer/class.phpmailer.php
index ff3d81e3..dcf02361 100644
--- a/mailstream/phpmailer/class.phpmailer.php
+++ b/mailstream/phpmailer/class.phpmailer.php
@@ -3287,7 +3287,7 @@ class PHPMailer
         $result = 'localhost.localdomain';
         if (!empty($this->Hostname)) {
             $result = $this->Hostname;
-        } elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
+        } elseif (array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
             $result = $_SERVER['SERVER_NAME'];
         } elseif (function_exists('gethostname') && gethostname() !== false) {
             $result = gethostname();

From 50912fdc173dbb5f82f6dc8414d0d5d40f7b0879 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:50:06 +0000
Subject: [PATCH 156/294] Fix errors in nsfw addon

---
 nsfw/nsfw.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index 4a54d899..674fc201 100644
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -8,7 +8,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
@@ -119,7 +118,9 @@ function nsfw_prepare_body_content_filter(&$hook_data)
 		$word_list = ['nsfw'];
 	}
 
-	$found = false;
+	$found      = false;
+	$tag_search = false;
+
 	if (count($word_list)) {
 		$body = $hook_data['item']['title'] . "\n" . nsfw_extract_photos($hook_data['item']['body']);
 
@@ -129,7 +130,6 @@ function nsfw_prepare_body_content_filter(&$hook_data)
 				continue;
 			}
 
-			$tag_search = false;
 			switch ($word[0]) {
 				case '/'; // Regular expression
 					$found = @preg_match($word, $body);

From 3f89aa180610b0ce0ead35c082ad43e3c702bcde Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:51:18 +0000
Subject: [PATCH 157/294] Fix errors in pnut addon

---
 pnut/lib/phpnut.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pnut/lib/phpnut.php b/pnut/lib/phpnut.php
index 5794d795..89d5e5f8 100644
--- a/pnut/lib/phpnut.php
+++ b/pnut/lib/phpnut.php
@@ -1339,6 +1339,8 @@ class phpnut
      */
     protected function updateUserImage(string $image, string $which='avatar')
     {
+        $mimeType = '';
+
         $test = @getimagesize($image);
         if ($test && array_key_exists('mime', $test)) {
             $mimeType = $test['mime'];

From 43ee267d38c1084cdac54f0872a902d788897631 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 20:12:23 +0000
Subject: [PATCH 158/294] fix errors in pumpio addon

---
 pumpio/pumpio.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 5e053d7c..d7c2ac32 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -6,7 +6,6 @@
  * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
@@ -582,6 +581,8 @@ function pumpio_action(int $uid, string $uri, string $action, string $content =
 		$uri = $orig_post['uri'];
 	}
 
+	$objectType = '';
+
 	if (($orig_post['object-type'] != '') && (strstr($orig_post['object-type'], ActivityNamespace::ACTIVITY_SCHEMA))) {
 		$objectType = str_replace(ActivityNamespace::ACTIVITY_SCHEMA, '', $orig_post['object-type']);
 	} elseif (strstr($uri, '/api/comment/')) {
@@ -827,6 +828,7 @@ function pumpio_dounlike(int $uid, array $self, $post, string $own_id)
 	}
 
 	$contactid = 0;
+	$contact   = [];
 
 	if (Strings::compareLink($post->actor->url, $own_id)) {
 		$contactid = $self['id'];
@@ -1430,6 +1432,8 @@ function pumpio_fetchallcomments($uid, $id)
 
 	Logger::notice('pumpio_fetchallcomments: fetching comment for user ' . $uid . ', URL ' . $url);
 
+	$item = new \stdClass();
+
 	if (pumpio_reachable($url)) {
 		$success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError' => true], $item);
 	} else {

From fccf361ef121492aaf486ffca72eafbf4e558536 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 20:13:41 +0000
Subject: [PATCH 159/294] fix errors in ratioed addon

---
 ratioed/RatioedPanel.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ratioed/RatioedPanel.php b/ratioed/RatioedPanel.php
index e25c7f34..bd9b44dc 100644
--- a/ratioed/RatioedPanel.php
+++ b/ratioed/RatioedPanel.php
@@ -26,6 +26,7 @@ class RatioedPanel extends Active
 
 		$action = $this->parameters['action'] ?? '';
 		$uid	= $this->parameters['uid']	?? 0;
+		$user   = [];
 
 		if ($uid) {
 			$user = User::getById($uid, ['username', 'blocked']);

From a41f8c13fea5cb52687fc35c1756c04c0620b510 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 20:27:57 +0000
Subject: [PATCH 160/294] fix errors in statusnet addon

---
 statusnet/library/codebirdsn.php | 13 +++++++------
 statusnet/statusnet.php          |  2 ++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/statusnet/library/codebirdsn.php b/statusnet/library/codebirdsn.php
index 325bcb07..91e256be 100644
--- a/statusnet/library/codebirdsn.php
+++ b/statusnet/library/codebirdsn.php
@@ -31,11 +31,10 @@ use Friendica\Core\System;
 /**
  * Define constants
  */
-$constants = explode(' ', 'OBJECT ARRAY JSON');
-foreach ($constants as $i => $id) {
-    $id = 'CODEBIRD_RETURNFORMAT_' . $id;
-    defined($id) or define($id, $i);
-}
+defined('CODEBIRD_RETURNFORMAT_ARRAY') or define('CODEBIRD_RETURNFORMAT_ARRAY', 0);
+defined('CODEBIRD_RETURNFORMAT_JSON') or define('CODEBIRD_RETURNFORMAT_JSON', 1);
+defined('CODEBIRD_RETURNFORMAT_OBJECT') or define('CODEBIRD_RETURNFORMAT_OBJECT', 2);
+
 $constants = array(
     'CURLE_SSL_CERTPROBLEM' => 58,
     'CURLE_SSL_CACERT' => 60,
@@ -788,6 +787,8 @@ class CodebirdSN
 
         $possible_files = explode(' ', $possible_files[$method]);
 
+        $data = '';
+
         $multipart_border = '--------------------' . $this->_nonce();
         $multipart_request = '';
         foreach ($params as $key => $value) {
@@ -917,7 +918,7 @@ class CodebirdSN
             $authorization = 'Authorization: Bearer ' . self::$_oauth_bearer_token;
         }
         $request_headers = array();
-        if (isset($authorization)) {
+        if ($authorization !== '') {
             $request_headers[] = $authorization;
             $request_headers[] = 'Expect:';
         }
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 4bc32050..48f9c254 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -366,6 +366,8 @@ function statusnet_post_hook(array &$b)
 	$otoken  = DI::pConfig()->get($b['uid'], 'statusnet', 'oauthtoken');
 	$osecret = DI::pConfig()->get($b['uid'], 'statusnet', 'oauthsecret');
 
+	$iscomment = null;
+
 	if ($ckey && $csecret && $otoken && $osecret) {
 		$dent = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
 		$max_char = $dent->get_maxlength(); // max. length for a dent

From b6a47699bfc68e3c57af797053cf79efe4d96e78 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 20:36:07 +0000
Subject: [PATCH 161/294] fix errors in tictac addon

---
 tictac/tictac.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tictac/tictac.php b/tictac/tictac.php
index 10103835..082b58c1 100644
--- a/tictac/tictac.php
+++ b/tictac/tictac.php
@@ -7,7 +7,6 @@
  * Status: unsupported
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
@@ -30,7 +29,12 @@ function tictac_module() {}
 
 function tictac_content() {
 
-	$o = '';
+  $o        = '';
+  $dimen    = 3;
+  $handicap = 0;
+  $mefirst  = 0;
+  $yours    = '';
+  $mine     = '';
 
   if($_POST['move']) {
     $handicap = DI::args()->get(1);
@@ -45,9 +49,6 @@ function tictac_content() {
     $handicap = DI::args()->get(1);
     $dimen = 3;
   }
-  else {
-   $dimen = 3;
-  }
 
   $o .=  '<h3>' . DI::l10n()->t('3D Tic-Tac-Toe') . '</h3><br />';
 
@@ -163,7 +164,7 @@ class tictac {
   ];
 
   function __construct($dimen, $handicap, $mefirst, $yours, $mine) {
-    $this->dimen = 3;
+    $this->dimen = $dimen;
     $this->handicap = $handicap ? 1 : 0;
     $this->mefirst = $mefirst ? 1 : 0;
     $this->yours = str_replace('XXX','',$yours);
@@ -228,6 +229,8 @@ class tictac {
   }
 
   function parse_moves($player) {
+    $str = '';
+
     if($player == 'me')
       $str = $this->mine;
     if($player == 'you')

From 15c21cebb1bccd48a598c61d06b25d6fd8a43eb9 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 20:36:58 +0000
Subject: [PATCH 162/294] Fix errors in wppost addon

---
 wppost/wppost.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/wppost/wppost.php b/wppost/wppost.php
index dba738de..f2ee5d21 100644
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -259,9 +259,11 @@ EOT;
 
 		Logger::debug('wppost: data: ' . $xml);
 
+		$x = '';
+
 		if ($wp_blog !== 'test') {
 			$x = DI::httpClient()->post($wp_blog, $xml)->getBodyString();
 		}
-		Logger::info('posted to wordpress: ' . (($x) ? $x : ''));
+		Logger::info('posted to wordpress: ' . $x);
 	}
 }

From 4527df602fcc7efdf400ab1fecbcad78fa54a870 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Tue, 26 Nov 2024 07:55:01 +0000
Subject: [PATCH 163/294] Add checks for CLD2Detector ans CLD2Encoding classes

---
 cld/cld.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/cld/cld.php b/cld/cld.php
index 5ca4c932..83361e2b 100644
--- a/cld/cld.php
+++ b/cld/cld.php
@@ -22,6 +22,16 @@ function cld_detect_languages(array &$data)
 		return;
 	}
 
+	if (!class_exists('CLD2Detector')) {
+		Logger::warning('CLD2Detector class does not exist.');
+		return;
+	}
+
+	if (!class_exists('CLD2Encoding')) {
+		Logger::warning('CLD2Encoding class does not exist.');
+		return;
+	}
+
 	$cld2 = new \CLD2Detector();
 
 	$cld2->setEncodingHint(CLD2Encoding::UTF8); // optional, hints about text encoding

From 9d172b70822ef58fcea267b05691c4a2afbad143 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Tue, 26 Nov 2024 08:23:27 +0000
Subject: [PATCH 164/294] refactor convert addon, replace each() calls with
 foreach loop

---
 convert/convert.php | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/convert/convert.php b/convert/convert.php
index 57ce6ea8..2c97e2aa 100644
--- a/convert/convert.php
+++ b/convert/convert.php
@@ -6,7 +6,6 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 
 function convert_install() {
@@ -26,7 +25,7 @@ function convert_content() {
 	// @TODO Let's one day rewrite this to a modern composer package
 	include 'UnitConvertor.php';
 
-	class TP_Converter extends UnitConvertor
+	$conv = new class('en') extends UnitConvertor
 	{
 		public function __construct(string $lang = 'en')
 		{
@@ -43,7 +42,7 @@ function convert_content() {
 
 		private function findBaseUnit($from, $to)
 		{
-			while (list($skey, $sval) = each($this->bases)) {
+			foreach ($this->bases as $skey => $sval) {
 				if ($skey == $from || $to == $skey || in_array($to, $sval) || in_array($from, $sval)) {
 					return $skey;
 				}
@@ -63,7 +62,7 @@ function convert_content() {
 				$cells[] = $cell;
 
 				// We now have the base unit and value now lets produce the table;
-				while (list($key, $val) = each($this->bases[$base_unit])) {
+				foreach ($this->bases[$base_unit] as $val) {
 					$cell ['value'] = $this->convert($value, $from_unit, $val, $precision) . ' ' . $val;
 					$cell ['class']	= ($val == $from_unit || $val == $to_unit) ? 'framedred' : '';
 					$cells[] = $cell;
@@ -86,9 +85,7 @@ function convert_content() {
 
 			return $string;
 		}
-	}
-
-	$conv = new TP_Converter('en');
+	};
 
 	$conversions = [
 		'Temperature' => ['base'  => 'Celsius',
@@ -176,10 +173,10 @@ function convert_content() {
 		]
 	];
 
-	while (list($key, $val) = each($conversions)) {
+	foreach ($conversions as $key => $val) {
 		$conv->addConversion($val['base'], $val['conv']);
 		$list[$key][] = $val['base'];
-		while (list($ukey, $uval) = each($val['conv'])) {
+		foreach ($val['conv'] as $ukey => $uval) {
 			$list[$key][] = $ukey;
 		}
 	}
@@ -202,10 +199,9 @@ function convert_content() {
 	$o .= '<input name="value" type="text" id="value" value="' . $value . '" size="10" maxlength="10" />';
 	$o .= '<select name="from_unit" size="12">';
 
-	reset($list);
-	while(list($key, $val) = each($list)) {
+	foreach ($list as $key => $val) {
 		$o .=  "\n\t<optgroup label=\"$key\">";
-		while(list($ukey, $uval) = each($val)) {
+		foreach ($val as $ukey => $uval) {
 			$selected = (($uval == $_POST['from_unit']) ? ' selected="selected" ' : '');
 			$o .=  "\n\t\t<option value=\"$uval\" $selected >$uval</option>";
 		}

From 4a2fc7884c4315ca356efbfdf57f23a643b697a6 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 11:38:55 +0000
Subject: [PATCH 165/294] remove wrong return tag

---
 convert/UnitConvertor.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/convert/UnitConvertor.php b/convert/UnitConvertor.php
index d7933a8f..a3650e9b 100644
--- a/convert/UnitConvertor.php
+++ b/convert/UnitConvertor.php
@@ -169,7 +169,6 @@ class UnitConvertor
 	* @param    string    name of the source unit from which to convert
     * @param    string    name of the target unit to which we are converting
     * @param    integer   double precision of the end result
-    * @return   void
     * @access   public
     */
 	function convert($value, $from_unit, $to_unit, $precision)
@@ -280,4 +279,4 @@ class UnitConvertor
 	} // end func getConvSpecs
 	
 } // end class UnitConvertor
-?>
\ No newline at end of file
+?>

From 922bace555039e9fb6a79f482b672b639284cb3c Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 11:40:45 +0000
Subject: [PATCH 166/294] Fix errors in diaspora addon

---
 diaspora/diasphp.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/diaspora/diasphp.php b/diaspora/diasphp.php
index 1588b582..266b9899 100644
--- a/diaspora/diasphp.php
+++ b/diaspora/diasphp.php
@@ -9,6 +9,8 @@ use Friendica\Core\System;
 
 class Diasphp {
 	private $cookiejar;
+	private $token_regex;
+	private $pod;
 
 	function __construct($pod) {
 		$this->token_regex = '/content="(.*?)" name="csrf-token/';

From b6614483447a6ea2b4147b1ca9d719d691fa34e5 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 11:43:21 +0000
Subject: [PATCH 167/294] Fix errors in libravatar addon

---
 libravatar/Services/Libravatar.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libravatar/Services/Libravatar.php b/libravatar/Services/Libravatar.php
index 18aa5c90..70fcfe39 100644
--- a/libravatar/Services/Libravatar.php
+++ b/libravatar/Services/Libravatar.php
@@ -217,7 +217,7 @@ class Services_Libravatar
      *
      * @param array $options Array of options for getUrl()
      *
-     * @return void
+     * @return array
      * @throws Exception When an invalid option is used
      */
     protected function checkOptionsArray($options)
@@ -462,6 +462,8 @@ class Services_Libravatar
                 return $v['target'];
             }
         }
+
+        return '';
     }
 
     /**

From def43f3167cd6746495e04389259d8adfbaaf2e0 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 11:52:59 +0000
Subject: [PATCH 168/294] Fix errors in mailstream addon

---
 mailstream/mailstream.php                | 2 +-
 mailstream/phpmailer/class.phpmailer.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index ae57c4dd..9910a63d 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -378,7 +378,7 @@ function mailstream_send(string $message_id, array $item, array $user): bool
 	if (!$address) {
 		$address = $user['email'];
 	}
-	$mail = new PHPmailer();
+	$mail = new PHPMailer();
 	try {
 		$mail->XMailer = 'Friendica Mailstream Addon';
 		$mail->SetFrom($frommail, mailstream_sender($item));
diff --git a/mailstream/phpmailer/class.phpmailer.php b/mailstream/phpmailer/class.phpmailer.php
index ab7fe030..a47b13f7 100644
--- a/mailstream/phpmailer/class.phpmailer.php
+++ b/mailstream/phpmailer/class.phpmailer.php
@@ -1519,6 +1519,7 @@ class PHPMailer
     public function getSMTPInstance()
     {
         if (!is_object($this->smtp)) {
+            /** @phpstan-ignore-next-line file class.smtp.php does not exist */
             $this->smtp = new SMTP;
         }
         return $this->smtp;
@@ -2705,7 +2706,7 @@ class PHPMailer
             $file_buffer = $this->encodeString($file_buffer, $encoding);
             if ($magic_quotes) {
                 if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-                    set_magic_quotes_runtime($magic_quotes);
+                    //set_magic_quotes_runtime($magic_quotes);
                 } else {
                     ini_set('magic_quotes_runtime', $magic_quotes);
                 }

From 1bd7cd6e71a99e891b570778ab90311f1a09b131 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 22:33:12 +0000
Subject: [PATCH 169/294] fix error in PHPMailer

---
 mailstream/phpmailer/class.phpmailer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mailstream/phpmailer/class.phpmailer.php b/mailstream/phpmailer/class.phpmailer.php
index a47b13f7..ff3d81e3 100644
--- a/mailstream/phpmailer/class.phpmailer.php
+++ b/mailstream/phpmailer/class.phpmailer.php
@@ -2691,10 +2691,10 @@ class PHPMailer
             if (!is_readable($path)) {
                 throw new phpmailerException($this->lang('file_open') . $path, self::STOP_CONTINUE);
             }
-            $magic_quotes = get_magic_quotes_runtime();
+            $magic_quotes = false;
             if ($magic_quotes) {
                 if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-                    set_magic_quotes_runtime(false);
+                    //set_magic_quotes_runtime(false);
                 } else {
                     //Doesn't exist in PHP 5.4, but we don't need to check because
                     //get_magic_quotes_runtime always returns false in 5.4+

From b5c647bd5ddea43f98b49ac773bc222ec208e1a8 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 22:55:15 +0000
Subject: [PATCH 170/294] fix errors in pnut addon, add support for PHP 7.4

---
 pnut/lib/phpnut.php | 173 +++++++++++++++++++++++---------------------
 1 file changed, 92 insertions(+), 81 deletions(-)

diff --git a/pnut/lib/phpnut.php b/pnut/lib/phpnut.php
index 303a860b..5794d795 100644
--- a/pnut/lib/phpnut.php
+++ b/pnut/lib/phpnut.php
@@ -2,6 +2,8 @@
 
 namespace phpnut;
 
+use CURLFile;
+
 /**
  * phpnut.php
  * pnut.io PHP library
@@ -99,6 +101,10 @@ class phpnut
     // if processing stream_markers or any fast stream, decrease $sleepFor
     public $streamingSleepFor = 20000;
 
+    private $_clientId;
+
+    private $_clientSecret;
+
     /**
      * Constructs an phpnut PHP object with the specified client ID and
      * client secret.
@@ -162,7 +168,7 @@ class phpnut
      * from the user. If you don't specify anything, you'll only receive
      * access to the user's basic profile (the default).
      */
-    public function getAuthUrl(?string $callback_uri=null, array|string|null $scope=null): string
+    public function getAuthUrl(?string $callback_uri=null, array $scope=null): string
     {
         if (empty($this->_clientId)) {
             throw new phpnutException('You must specify your pnut client ID');
@@ -256,8 +262,10 @@ class phpnut
     /**
      * Check the scope of current token to see if it has required scopes
      * has to be done after a check
+     *
+     * @return int|array
      */
-    public function checkScopes(array $app_scopes): int|array
+    public function checkScopes(array $app_scopes)
     {
         if (count($this->_scopes) === 0) {
             return -1; // _scope is empty
@@ -303,7 +311,7 @@ class phpnut
     {
         return $this->httpReq('delete', "{$this->_baseUrl}token");
     }
-    
+
     /**
      * Retrieve an app access token from the app.net API. This allows you
      * to access the API without going through the user access flow if you
@@ -314,7 +322,7 @@ class phpnut
      * @return string The app access token
      */
     public function getAppAccessToken()
-    {    
+    {
         if (empty($this->_clientId) || empty($this->_clientSecret)) {
             throw new phpnutException('You must specify your Pnut client ID and client secret');
         }
@@ -450,8 +458,10 @@ class phpnut
     /**
      * Internal function to handle all
      * HTTP requests (POST,PUT,GET,DELETE)
+     *
+     * @param string|array $params
      */
-    protected function httpReq(string $act, string $req, string|array $params=[], string $contentType='application/x-www-form-urlencoded')
+    protected function httpReq(string $act, string $req, $params = [], string $contentType='application/x-www-form-urlencoded')
     {
         $ch = curl_init($req);
         $headers = [];
@@ -520,7 +530,7 @@ class phpnut
                     } else {
                         throw new phpnutException($response['error']);
                     }
-                } 
+                }
 
                 // look for response migration errors
                 elseif (isset($response['meta'], $response['meta']['error_message'])) {
@@ -588,7 +598,7 @@ class phpnut
     {
         return $this->_last_request;
     }
-    
+
     public function getLastResponse()
     {
         return $this->_last_response;
@@ -752,7 +762,7 @@ class phpnut
      * Retrieve the Posts that are 'in reply to' a specific Post.
      * @param integer $post_id The ID of the post you want to retrieve replies for.
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getPostThread(int $post_id, array $params=[])
     {
@@ -767,7 +777,7 @@ class phpnut
      * Retrieve revisions of a post. Currently only one can be created.
      * @param integer $post_id The ID of the post you want to retrieve previous revisions of.
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getPostRevisions(int $post_id, array $params=[])
     {
@@ -781,13 +791,13 @@ class phpnut
     /**
      * Get the most recent Posts created by a specific User in reverse
      * chronological order (most recent first).
-     * @param mixed $user_id Either the ID of the user you wish to retrieve posts by,
+     * @param string|int $user_id $user_id Either the ID of the user you wish to retrieve posts by,
      * or the string "me", which will retrieve posts for the user you're authenticated
      * as.
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
-    public function getUserPosts(string|int $user_id='me', array $params=[])
+    public function getUserPosts($user_id = 'me', array $params=[])
     {
         return $this->httpReq(
             'get',
@@ -799,13 +809,13 @@ class phpnut
     /**
      * Get the most recent Posts mentioning by a specific User in reverse
      * chronological order (newest first).
-     * @param mixed $user_id Either the ID of the user who is being mentioned, or
+     * @param string|int $user_id Either the ID of the user who is being mentioned, or
      * the string "me", which will retrieve posts for the user you're authenticated
      * as.
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
-    public function getUserMentions(string|int $user_id='me', array $params=[])
+    public function getUserMentions($user_id='me', array $params=[])
     {
         return $this->httpReq(
             'get',
@@ -817,7 +827,7 @@ class phpnut
     /**
      * Get the currently authenticated user's recent messages
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getUserMessages(array $params=[])
     {
@@ -832,7 +842,7 @@ class phpnut
      * Return the 20 most recent posts from the current User and
      * the Users they follow.
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getUserStream(array $params=[])
     {
@@ -847,7 +857,7 @@ class phpnut
      * Retrieve a list of all public Posts on pnut.io, often referred to as the
      * global stream.
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getPublicPosts(array $params=[])
     {
@@ -860,7 +870,7 @@ class phpnut
 
     /**
      * Retrieve a list of "explore" streams
-     * @return An array of associative arrays, each representing a single explore stream.
+     * @return array An array of associative arrays, each representing a single explore stream.
      */
     public function getPostExploreStreams()
     {
@@ -874,7 +884,7 @@ class phpnut
      * Retrieve a list of posts from an "explore" stream on pnut.io.
      * @param  string $slug [<description>]
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getPostExploreStream(string $slug, array $params=[])
     {
@@ -916,10 +926,11 @@ class phpnut
     * are:    count, before_id, since_id, include_muted, include_deleted,
     * and include_post_raw.
     * See https://github.com/phpnut/api-spec/blob/master/resources/posts.md#general-parameters
+    * @param string|int $user_id
     * @return array An array of associative arrays, each representing a single
     * user who has bookmarked a post
     */
-    public function getBookmarked(string|int $user_id='me', array $params=[])
+    public function getBookmarked($user_id='me', array $params=[])
     {
         return $this->httpReq(
             'get',
@@ -967,7 +978,7 @@ class phpnut
     /**
      * Repost an existing Post object.
      * @param integer $post_id The id of the post
-     * @return the reposted post
+     * @return mixed the reposted post
      */
     public function repost(int $post_id)
     {
@@ -980,7 +991,7 @@ class phpnut
     /**
      * Delete a post that the user has reposted.
      * @param integer $post_id The id of the post
-     * @return the un-reposted post
+     * @return mixed the un-reposted post
      */
     public function deleteRepost(int $post_id)
     {
@@ -997,7 +1008,7 @@ class phpnut
      * This will likely change as the API evolves, as of this writing allowed keys
      * are: count, before_id, since_id, include_muted, include_deleted,
      * include_directed_posts, and include_raw.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function searchHashtags(string $hashtag, array $params=[])
     {
@@ -1044,7 +1055,7 @@ class phpnut
      * This will likely change as the API evolves, as of this writing allowed keys
      * are: count, before_id, since_id, include_muted, include_deleted,
      * and include_post_raw.
-     * @return An array of associative arrays, each representing a single post.
+     * @return array An array of associative arrays, each representing a single post.
      */
     public function getUserPersonalStream(array $params=[])
     {
@@ -1063,7 +1074,7 @@ class phpnut
             );
         }
     }
-    
+
     /**
     * Return the 20 most recent Posts from the current User's personalized stream
     * and mentions stream merged into one stream.
@@ -1071,7 +1082,7 @@ class phpnut
     * This will likely change as the API evolves, as of this writing allowed keys
     * are: count, before_id, since_id, include_muted, include_deleted,
     * include_directed_posts, and include_raw.
-    * @return An array of associative arrays, each representing a single post.
+    * @return array An array of associative arrays, each representing a single post.
     */
     public function getUserUnifiedStream(array $params=[])
     {
@@ -1096,14 +1107,14 @@ class phpnut
 
     /**
      * Returns a specific user object.
-     * @param mixed $user_id The ID of the user you want to retrieve, or the string "@-username", or the string
+     * @param string|int $user_id The ID of the user you want to retrieve, or the string "@-username", or the string
      * "me" to retrieve data for the users you're currently authenticated as.
      * @param array $params An associative array of optional general parameters.
      * This will likely change as the API evolves, as of this writing allowed keys
      * are: include_raw|include_user_raw.
      * @return array An associative array representing the user data.
      */
-    public function getUser(string|int $user_id='me', array $params=[])
+    public function getUser($user_id='me', array $params=[])
     {
         return $this->httpReq(
             'get',
@@ -1131,10 +1142,10 @@ class phpnut
     /**
      * Add the specified user ID to the list of users followed.
      * Returns the User object of the user being followed.
-     * @param integer $user_id The user ID of the user to follow.
+     * @param string|int $user_id The user ID of the user to follow.
      * @return array An associative array representing the user you just followed.
      */
-    public function followUser(string|int $user_id)
+    public function followUser($user_id)
     {
         return $this->httpReq(
             'put',
@@ -1145,10 +1156,10 @@ class phpnut
     /**
      * Removes the specified user ID to the list of users followed.
      * Returns the User object of the user being unfollowed.
-     * @param integer $user_id The user ID of the user to unfollow.
+     * @param string|int $user_id The user ID of the user to unfollow.
      * @return array An associative array representing the user you just unfollowed.
      */
-    public function unfollowUser(string|int $user_id)
+    public function unfollowUser($user_id)
     {
         return $this->httpReq(
             'delete',
@@ -1158,13 +1169,13 @@ class phpnut
 
     /**
      * Returns an array of User objects the specified user is following.
-     * @param mixed $user_id Either the ID of the user being followed, or
+     * @param string|int $user_id Either the ID of the user being followed, or
      * the string "me", which will retrieve posts for the user you're authenticated
      * as.
      * @return array An array of associative arrays, each representing a single
      * user following $user_id
      */
-    public function getFollowing(string|int $user_id='me', array $params=[])
+    public function getFollowing($user_id='me', array $params=[])
     {
         return $this->httpReq(
             'get',
@@ -1172,31 +1183,31 @@ class phpnut
                 . $this->buildQueryString($params)
         );
     }
-    
+
     /**
      * Returns an array of User ids the specified user is following.
-     * @param mixed $user_id Either the ID of the user being followed, or
+     * @param string|int $user_id Either the ID of the user being followed, or
      * the string "me", which will retrieve posts for the user you're authenticated
      * as.
      * @return array user ids the specified user is following.
      */
-    public function getFollowingIDs(string|int $user_id='me')
+    public function getFollowingIDs($user_id='me')
     {
         return $this->httpReq(
             'get',
             "{$this->_baseUrl}users/{$user_id}/following?include_user=0"
         );
     }
-    
+
     /**
      * Returns an array of User objects for users following the specified user.
-     * @param mixed $user_id Either the ID of the user being followed, or
+     * @param string|int $user_id Either the ID of the user being followed, or
      * the string "me", which will retrieve posts for the user you're authenticated
      * as.
      * @return array An array of associative arrays, each representing a single
      * user following $user_id
      */
-    public function getFollowers(string|int $user_id='me', array $params=[])
+    public function getFollowers($user_id='me', array $params=[])
     {
         return $this->httpReq(
             'get',
@@ -1204,15 +1215,15 @@ class phpnut
                 . $this->buildQueryString($params)
         );
     }
-    
+
     /**
      * Returns an array of User ids for users following the specified user.
-     * @param mixed $user_id Either the ID of the user being followed, or
+     * @param string|int $user_id Either the ID of the user being followed, or
      * the string "me", which will retrieve posts for the user you're authenticated
      * as.
      * @return array user ids for users following the specified user
      */
-    public function getFollowersIDs(string|int $user_id='me')
+    public function getFollowersIDs($user_id='me')
     {
         return $this->httpReq(
             'get',
@@ -1236,9 +1247,9 @@ class phpnut
 
     /**
      * Mute a user
-     * @param integer $user_id The user ID to mute
+     * @param string|int $user_id The user ID to mute
      */
-    public function muteUser(string|int $user_id)
+    public function muteUser($user_id)
     {
          return $this->httpReq(
             'put',
@@ -1248,9 +1259,9 @@ class phpnut
 
     /**
      * Unmute a user
-     * @param integer $user_id The user ID to unmute
+     * @param string|int $user_id The user ID to unmute
      */
-    public function unmuteUser(string|int $user_id)
+    public function unmuteUser($user_id)
     {
         return $this->httpReq(
             'delete',
@@ -1288,7 +1299,7 @@ class phpnut
      * @param string $search The search query. Supports @username or #tag searches as
      * well as normal search terms. Searches username, display name, bio information.
      * Does not search posts.
-     * @return array An array of associative arrays, each representing one user.
+     * @return array|false An array of associative arrays, each representing one user.
      */
     public function searchUsers(array $params=[], string $query='')
     {
@@ -1333,7 +1344,7 @@ class phpnut
             $mimeType = $test['mime'];
         }
         $data = [
-            $which => new CurlFile($image, $mimeType)
+            $which => new CURLFile($image, $mimeType)
         ];
         return $this->httpReq(
             'post-raw',
@@ -1445,10 +1456,10 @@ class phpnut
 
     /**
      * get an existing private message channel between multiple users
-     * @param mixed $users Can be a comma- or space-separated string, or an array.
+     * @param string|array $users Can be a comma- or space-separated string, or an array.
      * Usernames with @-symbol, or user ids.
      */
-    public function getExistingPM(string|array $users, array $params=[])
+    public function getExistingPM($users, array $params=[])
     {
         if (is_string($users)) {
             $users = explode(',', str_replace(' ', ',', $users));
@@ -1561,7 +1572,7 @@ class phpnut
 
     /**
      * Retrieve a list of "explore" streams
-     * @return An array of associative arrays, each representing a single explore stream.
+     * @return array An array of associative arrays, each representing a single explore stream.
      */
     public function getChannelExploreStreams()
     {
@@ -1575,7 +1586,7 @@ class phpnut
      * Retrieve a list of channels from an "explore" stream on pnut.io.
      * @param  string $slug [<description>]
      * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single channel.
+     * @return array An array of associative arrays, each representing a single channel.
      */
     public function getChannelExploreStream(string $slug, array $params=[])
     {
@@ -1585,7 +1596,7 @@ class phpnut
                 . $this->buildQueryString($params)
         );
     }
-    
+
     /**
      * mark channel inactive
      */
@@ -1685,11 +1696,11 @@ class phpnut
 
     /**
      * create message
-     * @param $channelid numeric or "pm" for auto-channel (type=io.pnut.core.pm)
+     * @param string|int $channelid numeric or "pm" for auto-channel (type=io.pnut.core.pm)
      * @param array $data array('text'=>'YOUR_MESSAGE') If a type=io.pnut.core.pm, then "destinations" key can be set to address as an array of people to send this PM too
      * @param array $params query parameters
      */
-    public function createMessage(string|int $channelid, array $data, array $params=[])
+    public function createMessage($channelid, array $data, array $params=[])
     {
         if (isset($data['destinations'])) {
             if (is_string($data['destinations'])) {
@@ -1802,16 +1813,16 @@ class phpnut
     public function createFile($file, array $data, array $params=[])
     {
         if (!$file) {
-            throw new PhpnutException('You must specify a path to a file');
+            throw new phpnutException('You must specify a path to a file');
         }
         if (!file_exists($file)) {
-            throw new PhpnutException('File path specified does not exist');
+            throw new phpnutException('File path specified does not exist');
         }
         if (!is_readable($file)) {
-            throw new PhpnutException('File path specified is not readable');
+            throw new phpnutException('File path specified is not readable');
         }
         if (!array_key_exists('type', $data) || !$data['type']) {
-            throw new PhpnutException('Type is required when creating a file');
+            throw new phpnutException('Type is required when creating a file');
         }
         if (!array_key_exists('name', $data)) {
             $data['name'] = basename($file);
@@ -1823,7 +1834,7 @@ class phpnut
             $mimeType = null;
         }
         if (!array_key_exists('kind', $data)) {
-            $test = @getimagesize($path);
+            $test = @getimagesize($file);
             if ($test && array_key_exists('mime', $test)) {
                 $data['kind'] = 'image';
                 if (!$mimeType) {
@@ -1840,7 +1851,7 @@ class phpnut
             finfo_close($finfo);
         }
         if (!$mimeType) {
-            throw new PhpnutException('Unable to determine mime type of file, try specifying it explicitly');
+            throw new phpnutException('Unable to determine mime type of file, try specifying it explicitly');
         }
         $data['content'] = new \CurlFile($file, $mimeType);
         return $this->httpReq(
@@ -2001,7 +2012,7 @@ class phpnut
         $json = json_encode($data);
         return $this->httpReq(
             'post',
-            $this->_baseUrl.'polls?'.$this->buildQueryString($params), 
+            $this->_baseUrl.'polls?'.$this->buildQueryString($params),
             $json,
             'application/json'
         );
@@ -2019,7 +2030,7 @@ class phpnut
         return $this->httpReq(
             'put',
             $this->_baseUrl.'polls/'.urlencode($poll_id).'/response?'.$this->buildQueryString($params),
-            $json, 
+            $json,
             'application/json'
         );
     }
@@ -2118,7 +2129,7 @@ class phpnut
             $params
         );
     }
-    
+
     /**
      * Get User Information
      */
@@ -2129,7 +2140,7 @@ class phpnut
             "{$this->_baseUrl}token"
         );
     }
-    
+
     /**
      * Get Application Authorized User IDs
      */
@@ -2147,7 +2158,7 @@ class phpnut
             $params
         );
     }
-    
+
     /**
      * Get Application Authorized User Tokens
      */
@@ -2181,7 +2192,7 @@ class phpnut
     {
         $this->_streamCallback = $function;
     }
-    
+
     /**
      * Opens a stream that's been created for this user/app and starts sending
      * events/objects to your defined callback functions. You must define at
@@ -2231,7 +2242,7 @@ class phpnut
         );
         return true;
     }
-    
+
     /**
      * Close the currently open stream.
      * @return true;
@@ -2251,7 +2262,7 @@ class phpnut
         $this->_currentStream = null;
         $this->_multiStream = null;
     }
-    
+
     /**
      * Retrieve all streams for the current access token.
      * @return array An array of stream definitions.
@@ -2263,7 +2274,7 @@ class phpnut
             "{$this->_baseUrl}streams"
         );
     }
-    
+
     /**
      * Returns a single stream specified by a stream ID. The stream must have been
      * created with the current access token.
@@ -2276,7 +2287,7 @@ class phpnut
             $this->_baseUrl.'streams/'.urlencode($streamId)
         );
     }
-    
+
     /**
      * Creates a stream for the current app access token.
      *
@@ -2307,7 +2318,7 @@ class phpnut
         );
         return $response;
     }
-    
+
     /**
      * Update stream for the current app access token
      *
@@ -2338,7 +2349,7 @@ class phpnut
         );
         return $response;
     }
-     
+
     /**
      * Deletes a stream if you no longer need it.
      *
@@ -2352,7 +2363,7 @@ class phpnut
             $this->_baseUrl.'streams/'.urlencode($streamId)
         );
     }
-    
+
     /**
      * Deletes all streams created by the current access token.
      */
@@ -2363,7 +2374,7 @@ class phpnut
             "{$this->_baseUrl}streams"
         );
     }
-    
+
     /**
      * Internal function used to process incoming chunks from the stream. This is only
      * public because it needs to be accessed by CURL. Do not call or use this function
@@ -2394,7 +2405,7 @@ class phpnut
         }
         return strlen($data);
     }
-    
+
     /**
      * Opens a long lived HTTP connection to the pnut.io servers, and sends data
      * received to the httpStreamReceive function. As a general rule you should not
@@ -2426,7 +2437,7 @@ class phpnut
         $this->_lastStreamActivity = time();
         curl_multi_add_handle($this->_multiStream, $this->_currentStream);
     }
-    
+
     public function reconnectStream(): void
     {
         $this->closeStream();
@@ -2442,7 +2453,7 @@ class phpnut
         }
         $this->httpStream('get', $this->_streamUrl);
     }
-    
+
     /**
      * Process an open stream for x microseconds, then return. This is useful if you want
      * to be doing other things while processing the stream. If you just want to
@@ -2487,7 +2498,7 @@ class phpnut
             }
         } while ($timeSoFar+$sleepFor < $microseconds);
     }
-    
+
     /**
      * Process an open stream forever. This function will never return, if you
      * want to perform other actions while consuming the stream, you should use

From 7d02c9b53ce095a8736f5f8dc190fefddad4e13a Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 23:14:01 +0000
Subject: [PATCH 171/294] Fix errors in pumpio addon

---
 pumpio/oauth/http.php | 86 ++++++++++++++++++++++---------------------
 1 file changed, 44 insertions(+), 42 deletions(-)

diff --git a/pumpio/oauth/http.php b/pumpio/oauth/http.php
index 5d5e23f0..3045e509 100644
--- a/pumpio/oauth/http.php
+++ b/pumpio/oauth/http.php
@@ -109,9 +109,11 @@ class http_class
 	var $connected_port = -1;
 	var $connected_ssl = 0;
 
+	private $content_length_set;
+
 	/* Private methods - DO NOT CALL */
 
-	Function Tokenize($string,$separator="")
+	private function Tokenize($string,$separator="")
 	{
 		if(!strcmp($separator,""))
 		{
@@ -135,18 +137,18 @@ class http_class
 		}
 	}
 
-	Function CookieEncode($value, $name)
+	private function CookieEncode($value, $name)
 	{
 		return($name ? str_replace("=", "%25", $value) : str_replace(";", "%3B", $value));
 	}
 
-	Function SetError($error, $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR)
+	private function SetError($error, $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR)
 	{
 		$this->error_code = $error_code;
 		return($this->error=$error);
 	}
 
-	Function SetPHPError($error, &$php_error_message, $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR)
+	private function SetPHPError($error, &$php_error_message, $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR)
 	{
 		if(IsSet($php_error_message)
 		&& strlen($php_error_message))
@@ -154,7 +156,7 @@ class http_class
 		return($this->SetError($error, $error_code));
 	}
 
-	Function SetDataAccessError($error,$check_connection=0)
+	private function SetDataAccessError($error,$check_connection=0)
 	{
 		$this->error=$error;
 		$this->error_code = HTTP_CLIENT_ERROR_COMMUNICATION_FAILURE;
@@ -174,7 +176,7 @@ class http_class
 		}
 	}
 
-	Function OutputDebug($message)
+	private function OutputDebug($message)
 	{
 		if($this->log_debug)
 			error_log($message);
@@ -188,7 +190,7 @@ class http_class
 		}
 	}
 
-	Function GetLine()
+	private function GetLine()
 	{
 		for($line="";;)
 		{
@@ -227,7 +229,7 @@ class http_class
 		}
 	}
 
-	Function PutLine($line)
+	private function PutLine($line)
 	{
 		if($this->debug)
 			$this->OutputDebug("C $line");
@@ -239,7 +241,7 @@ class http_class
 		return(1);
 	}
 
-	Function PutData($data)
+	private function PutData($data)
 	{
 		if(strlen($data))
 		{
@@ -254,7 +256,7 @@ class http_class
 		return(1);
 	}
 
-	Function FlushData()
+	private function FlushData()
 	{
 		if(!fflush($this->connection))
 		{
@@ -264,7 +266,7 @@ class http_class
 		return(1);
 	}
 
-	Function ReadChunkSize()
+	private function ReadChunkSize()
 	{
 		if($this->remaining_chunk==0)
 		{
@@ -289,7 +291,7 @@ class http_class
 		return("");
 	}
 
-	Function ReadBytes($length)
+	private function ReadBytes($length)
 	{
 		if($this->use_curl)
 		{
@@ -356,7 +358,7 @@ class http_class
 		return($bytes);
 	}
 
-	Function EndOfInput()
+	private function EndOfInput()
 	{
 		if($this->use_curl)
 			return($this->read_response>=strlen($this->response));
@@ -367,7 +369,7 @@ class http_class
 		return(feof($this->connection));
 	}
 
-	Function Resolve($domain, &$ip, $server_type)
+	private function Resolve($domain, &$ip, $server_type)
 	{
 		if(preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/',$domain))
 			$ip=$domain;
@@ -385,7 +387,7 @@ class http_class
 		return('');
 	}
 
-	Function Connect($host_name, $host_port, $ssl, $server_type = 'HTTP')
+	private function Connect($host_name, $host_port, $ssl, $server_type = 'HTTP')
 	{
 		$domain=$host_name;
 		$port = $host_port;
@@ -552,7 +554,7 @@ class http_class
 		}
 	}
 
-	Function Disconnect()
+	private function Disconnect()
 	{
 		if($this->debug)
 			$this->OutputDebug("Disconnected from ".$this->connected_host);
@@ -569,7 +571,7 @@ class http_class
 
 	/* Public methods */
 
-	Function GetRequestArguments($url, &$arguments)
+	public function GetRequestArguments($url, &$arguments)
 	{
 		$this->error = '';
 		$this->error_code = HTTP_CLIENT_ERROR_NO_ERROR;
@@ -621,7 +623,7 @@ class http_class
 		return("");
 	}
 
-	Function Open($arguments)
+	public function Open($arguments)
 	{
 		if(strlen($this->error))
 			return($this->error);
@@ -750,7 +752,7 @@ class http_class
 		return("");
 	}
 
-	Function Close($force = 0)
+	public function Close($force = 0)
 	{
 		if($this->state=="Disconnected")
 			return("1 already disconnected");
@@ -767,7 +769,7 @@ class http_class
 		return($this->Disconnect());
 	}
 
-	Function PickCookies(&$cookies,$secure)
+	private function PickCookies(&$cookies,$secure)
 	{
 		if(IsSet($this->cookies[$secure]))
 		{
@@ -803,7 +805,7 @@ class http_class
 		}
 	}
 
-	Function GetFileDefinition($file, &$definition)
+	private function GetFileDefinition($file, &$definition)
 	{
 		$name="";
 		if(IsSet($file["FileName"]))
@@ -990,9 +992,6 @@ class http_class
 			if(GetType($length=@filesize($file["FileName"]))!="integer")
 			{
 				$error="it was not possible to determine the length of the file ".$file["FileName"];
-				if(IsSet($php_errormsg)
-				&& strlen($php_errormsg))
-					$error.=": ".$php_errormsg;
 				if(!file_exists($file["FileName"]))
 					$error="it was not possible to access the file ".$file["FileName"];
 				return($error);
@@ -1007,7 +1006,7 @@ class http_class
 		return("");
 	}
 
-	Function ConnectFromProxy($arguments, &$headers)
+	private function ConnectFromProxy($arguments, &$headers)
 	{
 		if(!$this->PutLine('CONNECT '.$this->host_name.':'.($this->host_port ? $this->host_port : 443).' HTTP/1.0')
 		|| (strlen($this->user_agent)
@@ -1052,7 +1051,7 @@ class http_class
 		return("");
 	}
 
-	Function SendRequest($arguments)
+	public function SendRequest($arguments)
 	{
 		if(strlen($this->error))
 			return($this->error);
@@ -1440,7 +1439,7 @@ class http_class
 		return("");
 	}
 
-	Function SetCookie($name, $value, $expires="" , $path="/" , $domain="" , $secure=0, $verbatim=0)
+	private function SetCookie($name, $value, $expires="" , $path="/" , $domain="" , $secure=0, $verbatim=0)
 	{
 		if(strlen($this->error))
 			return($this->error);
@@ -1472,7 +1471,7 @@ class http_class
 		return("");
 	}
 
-	Function SendRequestBody($data, $end_of_data)
+	private function SendRequestBody($data, $end_of_data)
 	{
 		if(strlen($this->error))
 			return($this->error);
@@ -1508,7 +1507,7 @@ class http_class
 		return("");
 	}
 
-	Function ReadReplyHeadersResponse(&$headers)
+	private function ReadReplyHeadersResponse(&$headers)
 	{
 		$headers=array();
 		if(strlen($this->error))
@@ -1635,7 +1634,7 @@ class http_class
 		return("");
 	}
 
-	Function Redirect(&$headers)
+	private function Redirect(&$headers)
 	{
 		if($this->follow_redirect)
 		{
@@ -1678,7 +1677,7 @@ class http_class
 		return("");
 	}
 
-	Function Authenticate(&$headers, $proxy, &$proxy_authorization, &$user, &$password, &$realm, &$workstation)
+	private function Authenticate(&$headers, $proxy, &$proxy_authorization, &$user, &$password, &$realm, &$workstation)
 	{
 		if($proxy)
 		{
@@ -1697,9 +1696,10 @@ class http_class
 		if(IsSet($headers[$authenticate_header])
 		&& $this->sasl_authenticate)
 		{
-			if(function_exists("class_exists")
-			&& !class_exists("sasl_client_class"))
+			if(!class_exists('sasl_client_class'))
+			{
 				return($this->SetError("the SASL client class needs to be loaded to be able to authenticate".($proxy ? " with the proxy server" : "")." and access this site", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
+			}
 			if(GetType($headers[$authenticate_header])=="array")
 				$authenticate=$headers[$authenticate_header];
 			else
@@ -1719,7 +1719,7 @@ class http_class
 				else
 					$mechanisms[]=$mechanism;
 			}
-			$sasl=new sasl_client_class;
+			$sasl=new \sasl_client_class();
 			if(IsSet($user))
 				$sasl->SetCredential("user",$user);
 			if(IsSet($password))
@@ -1731,6 +1731,8 @@ class http_class
 			$sasl->SetCredential("uri",$this->request_uri);
 			$sasl->SetCredential("method",$this->request_method);
 			$sasl->SetCredential("session",$this->session);
+			$message = '';
+			$interactions = [];
 			do
 			{
 				$status=$sasl->Start($mechanisms,$message,$interactions);
@@ -1906,8 +1908,8 @@ class http_class
 		}
 		return("");
 	}
-	
-	Function ReadReplyHeaders(&$headers)
+
+	public function ReadReplyHeaders(&$headers)
 	{
 		if(strlen($error=$this->ReadReplyHeadersResponse($headers)))
 			return($error);
@@ -1938,7 +1940,7 @@ class http_class
 		return("");
 	}
 
-	Function ReadReplyBody(&$body,$length)
+	private function ReadReplyBody(&$body,$length)
 	{
 		$body="";
 		if(strlen($this->error))
@@ -1980,7 +1982,7 @@ class http_class
 		return("");
 	}
 
-	Function ReadWholeReplyBody(&$body)
+	public function ReadWholeReplyBody(&$body)
 	{
 		$body = '';
 		for(;;)
@@ -1993,7 +1995,7 @@ class http_class
 		}
 	}
 
-	Function SaveCookies(&$cookies, $domain='', $secure_only=0, $persistent_only=0)
+	private function SaveCookies(&$cookies, $domain='', $secure_only=0, $persistent_only=0)
 	{
 		$now=gmdate("Y-m-d H-i-s");
 		$cookies=array();
@@ -2034,17 +2036,17 @@ class http_class
 		}
 	}
 
-	Function SavePersistentCookies(&$cookies, $domain='', $secure_only=0)
+	private function SavePersistentCookies(&$cookies, $domain='', $secure_only=0)
 	{
 		$this->SaveCookies($cookies, $domain, $secure_only, 1);
 	}
 
-	Function GetPersistentCookies(&$cookies, $domain='', $secure_only=0)
+	private function GetPersistentCookies(&$cookies, $domain='', $secure_only=0)
 	{
 		$this->SavePersistentCookies($cookies, $domain, $secure_only);
 	}
 
-	Function RestoreCookies($cookies, $clear=1)
+	private function RestoreCookies($cookies, $clear=1)
 	{
 		$new_cookies=($clear ? array() : $this->cookies);
 		for($secure_cookies=0, Reset($cookies); $secure_cookies<count($cookies); Next($cookies), $secure_cookies++)

From 1e684172788b13cbdd723a2a56b0529f69dfe0d5 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 27 Nov 2024 23:18:20 +0000
Subject: [PATCH 172/294] Fix classes in s3_storage addon

---
 s3_storage/src/S3Client.php | 8 ++++----
 s3_storage/src/S3Config.php | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/s3_storage/src/S3Client.php b/s3_storage/src/S3Client.php
index 643df2b0..613eda97 100644
--- a/s3_storage/src/S3Client.php
+++ b/s3_storage/src/S3Client.php
@@ -4,10 +4,10 @@ namespace Friendica\Addon\s3_storage\src;
 
 defined('AKEEBAENGINE') or define('AKEEBAENGINE', 1);
 
-use Akeeba\Engine\Postproc\Connector\S3v4\Configuration;
-use Akeeba\Engine\Postproc\Connector\S3v4\Connector;
-use Akeeba\Engine\Postproc\Connector\S3v4\Exception\CannotDeleteFile;
-use Akeeba\Engine\Postproc\Connector\S3v4\Input;
+use Akeeba\S3\Configuration;
+use Akeeba\S3\Connector;
+use Akeeba\S3\Exception\CannotDeleteFile;
+use Akeeba\S3\Input;
 use Friendica\Core\Storage\Capability\ICanWriteToStorage;
 use Friendica\Core\Storage\Exception\StorageException;
 use Friendica\Util\Strings;
diff --git a/s3_storage/src/S3Config.php b/s3_storage/src/S3Config.php
index 809cdd28..1831c666 100644
--- a/s3_storage/src/S3Config.php
+++ b/s3_storage/src/S3Config.php
@@ -4,8 +4,8 @@ namespace Friendica\Addon\s3_storage\src;
 
 defined('AKEEBAENGINE') or define('AKEEBAENGINE', 1);
 
-use Akeeba\Engine\Postproc\Connector\S3v4\Configuration;
-use Akeeba\Engine\Postproc\Connector\S3v4\Connector;
+use Akeeba\S3\Configuration;
+use Akeeba\S3\Connector;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Core\Storage\Capability\ICanConfigureStorage;

From b3c286ab85dce8fcf3fb0bf4ac5ed08e51d9da50 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 1 Dec 2024 12:04:47 +0000
Subject: [PATCH 173/294] Bluesky: Set a status when the token refresh failed

---
 bluesky/bluesky.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 38934feb..dfd7fe06 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -70,10 +70,10 @@ const BLUEKSY_STATUS_TOKEN_FAIL = 13;
 /*
  * (Currently) hard wired paths for Bluesky services
  */
-const BLUESKY_DIRECTORY = 'https://plc.directory'; // Path to the directory server service to fetch the PDS of a given DID
-const BLUESKY_PDS       = 'https://bsky.social';   // Path to the personal data server service (PDS) to fetch the DID for a given handle
-const BLUESKY_WEB       = 'https://bsky.app';      // Path to the web interface with the user profile and posts
-const BLUESKY_HOSTNAME  = 'bsky.social';           // Host name to be added to the handle if incomplete
+const BLUESKY_APPVIEW_API = 'https://public.api.bsky.app'; // Path to the public Bluesky AppView API.
+const BLUESKY_DIRECTORY   = 'https://plc.directory';       // Path to the directory server service to fetch the PDS of a given DID
+const BLUESKY_WEB         = 'https://bsky.app';            // Path to the web interface with the user profile and posts
+const BLUESKY_HOSTNAME    = 'bsky.social';                 // Host name to be added to the handle if incomplete
 
 function bluesky_install()
 {
@@ -1984,8 +1984,8 @@ function bluesky_get_did(string $handle, int $uid): string
 		return $did;
 	}
 
-	// And finally we use the default PDS from Bluesky.
-	$data = bluesky_get(BLUESKY_PDS . '/xrpc/com.atproto.identity.resolveHandle?handle=' . urlencode($handle));
+	// And finally we use the AppView API.
+	$data = bluesky_get(BLUESKY_APPVIEW_API . '/xrpc/com.atproto.identity.resolveHandle?handle=' . urlencode($handle));
 	if (!empty($data) && !empty($data->did)) {
 		Logger::debug('Got DID by system PDS call', ['handle' => $handle, 'did' => $data->did]);
 		return $data->did;
@@ -2021,6 +2021,10 @@ function bluesky_get_user_did(int $uid, bool $refresh = false): ?string
 
 function bluesky_get_user_pds(int $uid): ?string
 {
+	if ($uid == 0) {
+		return BLUESKY_APPVIEW_API;
+	}
+
 	$pds = DI::pConfig()->get($uid, 'bluesky', 'pds');
 	if (!empty($pds)) {
 		return $pds;
@@ -2104,6 +2108,7 @@ function bluesky_refresh_token(int $uid): string
 
 	$data = bluesky_post($uid, '/xrpc/com.atproto.server.refreshSession', '', ['Authorization' => ['Bearer ' . $token]]);
 	if (empty($data) || empty($data->accessJwt)) {
+		DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_TOKEN_FAIL);
 		return '';
 	}
 

From 82ed43f5076f8d14f7562ab68daf97b8ce8a0afa Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 7 Dec 2024 22:08:59 +0000
Subject: [PATCH 174/294] Fix errors

---
 curweather/curweather.php              | 4 ++--
 js_upload/file-uploader/server/php.php | 8 ++++----
 membersince/membersince.php            | 7 +++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/curweather/curweather.php b/curweather/curweather.php
index 9aa8584a..e5e2710d 100644
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -29,10 +29,10 @@ function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cacheti
 	$now = new DateTime();
 
 	if (!is_null($cached)) {
-		$cdate = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'curweather', 'last');
+		$cdate = (int) DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'curweather', 'last');
 		$cached = unserialize($cached);
 
-		if ($cdate + $cachetime > $now->getTimestamp()) {
+		if ($cdate + (int) $cachetime > $now->getTimestamp()) {
 			return $cached;
 		}
 	}
diff --git a/js_upload/file-uploader/server/php.php b/js_upload/file-uploader/server/php.php
index 2248c8f0..ff485dec 100644
--- a/js_upload/file-uploader/server/php.php
+++ b/js_upload/file-uploader/server/php.php
@@ -77,10 +77,10 @@ class qqFileUploader {
 	public function __construct(array $allowedExtensions = [], $sizeLimit = 10485760)
 	{
 		$allowedExtensions = array_map('strtolower', $allowedExtensions);
-			
+
 		$this->allowedExtensions = $allowedExtensions;
 		$this->sizeLimit = $sizeLimit;
-		
+
 		$this->checkServerSettings();
 
 		if (isset($_GET['qqfile'])) {
@@ -88,7 +88,7 @@ class qqFileUploader {
 		} elseif (isset($_FILES['qqfile'])) {
 			$this->file = new qqUploadedFileForm();
 		} else {
-			$this->file = false; 
+			$this->file = false;
 		}
 	}
 
@@ -105,7 +105,7 @@ class qqFileUploader {
 
 	private function toBytes(string $str): int
 	{
-		$val = trim($str);
+		$val = (int) trim($str);
 		$last = strtolower($str[strlen($str) - 1]);
 
 		switch($last) {
diff --git a/membersince/membersince.php b/membersince/membersince.php
index f8128eb7..20e41ac9 100644
--- a/membersince/membersince.php
+++ b/membersince/membersince.php
@@ -7,7 +7,6 @@
  * Status: Unsupported
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 use Friendica\Util\DateTimeFormat;
@@ -19,7 +18,7 @@ function membersince_install()
 
 function membersince_display(array &$b)
 {
-	if (DI::app()->getCurrentTheme() == 'frio') {
+	if (DI::appHelper()->getCurrentTheme() == 'frio') {
 		// Works in Frio.
 		$doc = new DOMDocument();
 		$doc->loadHTML(mb_convert_encoding($b, 'HTML-ENTITIES', 'UTF-8'));
@@ -39,7 +38,7 @@ function membersince_display(array &$b)
 		$label->setAttribute('class', 'col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted');
 
 		// The div for the register date of the profile owner.
-		$entry = $doc->createElement('div', DateTimeFormat::local(DI::app()->profile['register_date']));
+		$entry = $doc->createElement('div', DateTimeFormat::local(DI::appHelper()->profile['register_date']));
 		$entry->setAttribute('class', 'col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry');
 
 		$div->appendChild($hr);
@@ -50,6 +49,6 @@ function membersince_display(array &$b)
 		$b = $doc->saveHTML();
 	} else {
 		// Works in Vier.
-		$b = preg_replace('/<\/dl>/', "</dl>\n\n\n<dl id=\"aprofile-membersince\" class=\"aprofile\">\n<dt>" . DI::l10n()->t('Member since:') . "</dt>\n<dd>" . DateTimeFormat::local(DI::app()->profile['register_date']) . "</dd>\n</dl>", $b, 1);
+		$b = preg_replace('/<\/dl>/', "</dl>\n\n\n<dl id=\"aprofile-membersince\" class=\"aprofile\">\n<dt>" . DI::l10n()->t('Member since:') . "</dt>\n<dd>" . DateTimeFormat::local(DI::appHelper()->profile['register_date']) . "</dd>\n</dl>", $b, 1);
 	}
 }

From 5b13274bed5c7f944a35b5b63739aba140e4bb1c Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sun, 8 Dec 2024 21:02:07 +0000
Subject: [PATCH 175/294] Fix class name collision

---
 js_upload/js_upload.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index 0d045dee..f1d85aa3 100644
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -60,7 +60,7 @@ function js_upload_post_init(array &$b)
 	// max file size in bytes
 	$sizeLimit = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
 
-	$uploader = new qqFileUploader($allowedExtensions, $sizeLimit);
+	$uploader = new js_upload_qqFileUploader($allowedExtensions, $sizeLimit);
 
 	$result = $uploader->handleUpload();
 
@@ -101,7 +101,7 @@ function js_upload_post_end(int &$b)
 /**
  * Handle file uploads via XMLHttpRequest
  */
-class qqUploadedFileXhr
+class js_upload_qqUploadedFileXhr
 {
 	private $pathnm = '';
 
@@ -155,7 +155,7 @@ class qqUploadedFileXhr
 /**
  * Handle file uploads via regular form post (uses the $_FILES array)
  */
-class qqUploadedFileForm
+class js_upload_qqUploadedFileForm
 {
 	/**
 	 * Save the file to the specified path
@@ -183,7 +183,7 @@ class qqUploadedFileForm
 	}
 }
 
-class qqFileUploader
+class js_upload_qqFileUploader
 {
 	private $allowedExtensions;
 	private $sizeLimit;
@@ -197,9 +197,9 @@ class qqFileUploader
 		$this->sizeLimit = $sizeLimit;
 
 		if (isset($_GET['qqfile'])) {
-			$this->file = new qqUploadedFileXhr();
+			$this->file = new js_upload_qqUploadedFileXhr();
 		} elseif (isset($_FILES['qqfile'])) {
-			$this->file = new qqUploadedFileForm();
+			$this->file = new js_upload_qqUploadedFileForm();
 		} else {
 			$this->file = false;
 		}

From 2fe37c6d4a26a795b5c06cf15a90b6b4a2d363fb Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sun, 8 Dec 2024 21:24:03 +0000
Subject: [PATCH 176/294] Fix errors in pnut addon

---
 mailstream/phpmailer/class.phpmailer.php |  1 -
 pnut/lib/phpnut.php                      | 17 +++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/mailstream/phpmailer/class.phpmailer.php b/mailstream/phpmailer/class.phpmailer.php
index dcf02361..3aec2255 100644
--- a/mailstream/phpmailer/class.phpmailer.php
+++ b/mailstream/phpmailer/class.phpmailer.php
@@ -1519,7 +1519,6 @@ class PHPMailer
     public function getSMTPInstance()
     {
         if (!is_object($this->smtp)) {
-            /** @phpstan-ignore-next-line file class.smtp.php does not exist */
             $this->smtp = new SMTP;
         }
         return $this->smtp;
diff --git a/pnut/lib/phpnut.php b/pnut/lib/phpnut.php
index 89d5e5f8..a8e97db4 100644
--- a/pnut/lib/phpnut.php
+++ b/pnut/lib/phpnut.php
@@ -108,7 +108,7 @@ class phpnut
     /**
      * Constructs an phpnut PHP object with the specified client ID and
      * client secret.
-     * @param string $client_id The client ID you received from pnut.io when
+     * @param string $client_id_or_token The client ID you received from pnut.io when
      * creating your app.
      * @param string $client_secret The client secret you received from
      * pnut.io when creating your app.
@@ -161,7 +161,7 @@ class phpnut
      * or not access to your app. Usually you would place this as a link for
      * the user to client, or a redirect to send them to the auth URL.
      * Also can be called after authentication for additional scopes
-     * @param string $callbackUri Where you want the user to be directed
+     * @param string $callback_uri Where you want the user to be directed
      * after authenticating with pnut.io. This must be one of the URIs
      * allowed by your pnut.io application settings.
      * @param array $scope An array of scopes (permissions) you wish to obtain
@@ -748,7 +748,7 @@ class phpnut
      * Delete a Post. The current user must be the same user who created the Post.
      * It returns the deleted Post on success.
      * @param integer $post_id The ID of the post to delete
-     * @param array An associative array representing the post that was deleted
+     * @return array An associative array representing the post that was deleted
      */
     public function deletePost(int $post_id)
     {
@@ -1296,7 +1296,7 @@ class phpnut
 
     /**
      * List the users who match a specific search term
-     * @param string $search The search query. Supports @username or #tag searches as
+     * @param string $query The search query. Supports @username or #tag searches as
      * well as normal search terms. Searches username, display name, bio information.
      * Does not search posts.
      * @return array|false An array of associative arrays, each representing one user.
@@ -2023,7 +2023,7 @@ class phpnut
     /**
      * Responds to a poll.
      * @param integer $poll_id The ID of the poll to respond to
-     * @param array list of positions for the poll response
+     * @param array $positions list of positions for the poll response
      * @param array $params An associative array of optional general parameters.
      */
     public function respondToPoll(int $poll_id, array $positions, array $params=[])
@@ -2098,8 +2098,6 @@ class phpnut
      * List the polls that match a specific search term
      * @param array $params a list of filter, search query, and general Poll parameters
      * see: https://docs.pnut.io/resources/channels/search
-     * @param string $query The search query. Supports
-     * normal search terms.
      * @return array An array of associative arrays, each representing one poll.
      * or false on error
      */
@@ -2186,7 +2184,7 @@ class phpnut
      * whenever an event is received via an open pnut.io stream. Your function
      * will receive a single parameter, which is the object wrapper containing
      * the meta and data.
-     * @param mixed A PHP callback (either a string containing the function name,
+     * @param mixed $fuction A PHP callback (either a string containing the function name,
      * or an array where the first element is the class/object and the second
      * is the method).
      */
@@ -2247,7 +2245,6 @@ class phpnut
 
     /**
      * Close the currently open stream.
-     * @return true;
      */
     public function closeStream(): void
     {
@@ -2460,7 +2457,7 @@ class phpnut
      * Process an open stream for x microseconds, then return. This is useful if you want
      * to be doing other things while processing the stream. If you just want to
      * consume the stream without other actions, you can call processForever() instead.
-     * @param float @microseconds The number of microseconds to process for before
+     * @param null|float $microseconds The number of microseconds to process for before
      * returning. There are 1,000,000 microseconds in a second.
      *
      * @return void

From 89a673cc11f840a856d2e4f703f12d0f383fd252 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sun, 8 Dec 2024 22:19:58 +0000
Subject: [PATCH 177/294] Fix typo

---
 pnut/lib/phpnut.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pnut/lib/phpnut.php b/pnut/lib/phpnut.php
index a8e97db4..ff765243 100644
--- a/pnut/lib/phpnut.php
+++ b/pnut/lib/phpnut.php
@@ -2177,14 +2177,12 @@ class phpnut
         );
     }
 
-
-
     /**
      * Registers your function (or an array of object and method) to be called
      * whenever an event is received via an open pnut.io stream. Your function
      * will receive a single parameter, which is the object wrapper containing
      * the meta and data.
-     * @param mixed $fuction A PHP callback (either a string containing the function name,
+     * @param mixed $function A PHP callback (either a string containing the function name,
      * or an array where the first element is the class/object and the second
      * is the method).
      */

From b99ac65c0bbca1b5c8c94922fe1114b3501c953e Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sun, 8 Dec 2024 22:49:23 +0000
Subject: [PATCH 178/294] Fix errors in membersince addon

---
 membersince/membersince.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/membersince/membersince.php b/membersince/membersince.php
index 20e41ac9..448b8cf2 100644
--- a/membersince/membersince.php
+++ b/membersince/membersince.php
@@ -9,6 +9,7 @@
 
 use Friendica\Core\Hook;
 use Friendica\DI;
+use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
 
 function membersince_install()
@@ -18,6 +19,18 @@ function membersince_install()
 
 function membersince_display(array &$b)
 {
+	$uid = DI::userSession()->getLocalUserId();
+
+	if ($uid === false) {
+		return;
+	}
+
+	$user = User::getById($uid, ['register_date']);
+
+	if ($user === false || !array_key_exists('register_date', $user)) {
+		return;
+	}
+
 	if (DI::appHelper()->getCurrentTheme() == 'frio') {
 		// Works in Frio.
 		$doc = new DOMDocument();
@@ -38,7 +51,7 @@ function membersince_display(array &$b)
 		$label->setAttribute('class', 'col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted');
 
 		// The div for the register date of the profile owner.
-		$entry = $doc->createElement('div', DateTimeFormat::local(DI::appHelper()->profile['register_date']));
+		$entry = $doc->createElement('div', DateTimeFormat::local($user['register_date']));
 		$entry->setAttribute('class', 'col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry');
 
 		$div->appendChild($hr);
@@ -49,6 +62,6 @@ function membersince_display(array &$b)
 		$b = $doc->saveHTML();
 	} else {
 		// Works in Vier.
-		$b = preg_replace('/<\/dl>/', "</dl>\n\n\n<dl id=\"aprofile-membersince\" class=\"aprofile\">\n<dt>" . DI::l10n()->t('Member since:') . "</dt>\n<dd>" . DateTimeFormat::local(DI::appHelper()->profile['register_date']) . "</dd>\n</dl>", $b, 1);
+		$b = preg_replace('/<\/dl>/', "</dl>\n\n\n<dl id=\"aprofile-membersince\" class=\"aprofile\">\n<dt>" . DI::l10n()->t('Member since:') . "</dt>\n<dd>" . DateTimeFormat::local($user['register_date']) . "</dd>\n</dl>", $b, 1);
 	}
 }

From cfb6b3123f9a3e593c4316967ebefc78e01c4bba Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sun, 8 Dec 2024 23:06:51 +0000
Subject: [PATCH 179/294] Fix errors in statusnet addon

---
 statusnet/library/codebirdsn.php     | 24 +++++++++++++-----------
 statusnet/library/statusnetoauth.php |  5 -----
 statusnet/library/twitteroauth.php   |  4 +---
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/statusnet/library/codebirdsn.php b/statusnet/library/codebirdsn.php
index 91e256be..70743356 100644
--- a/statusnet/library/codebirdsn.php
+++ b/statusnet/library/codebirdsn.php
@@ -116,7 +116,7 @@ class CodebirdSN
      * Returns singleton class instance
      * Always use this method unless you're working with multiple authenticated users at once
      *
-     * @return Codebird The instance
+     * @return CodebirdSN The instance
      */
     public static function getInstance()
     {
@@ -420,6 +420,7 @@ class CodebirdSN
                 }
                 break;
             case CODEBIRD_RETURNFORMAT_OBJECT:
+                /** @var object $reply */
                 $reply->httpstatus = $httpstatus;
                 if ($httpstatus == 200) {
                     self::setBearerToken($reply->access_token);
@@ -490,7 +491,7 @@ class CodebirdSN
     /**
      * Generates a (hopefully) unique random string
      *
-     * @param int optional $length The length of the string to generate
+     * @param int $length The optional length of the string to generate
      *
      * @return string The random string
      */
@@ -505,9 +506,9 @@ class CodebirdSN
     /**
      * Generates an OAuth signature
      *
-     * @param string          $httpmethod Usually either 'GET' or 'POST' or 'DELETE'
-     * @param string          $method     The API method to call
-     * @param array  optional $params     The API call parameters, associative
+     * @param string $httpmethod Usually either 'GET' or 'POST' or 'DELETE'
+     * @param string $method     The API method to call
+     * @param array  $params     optional The API call parameters, associative
      *
      * @return string Authorization HTTP header
      */
@@ -871,12 +872,12 @@ class CodebirdSN
     /**
      * Calls the API using cURL
      *
-     * @param string          $httpmethod      The HTTP method to use for making the request
-     * @param string          $method          The API method to call
-     * @param string          $method_template The templated API method to call
-     * @param array  optional $params          The parameters to send along
-     * @param bool   optional $multipart       Whether to use multipart/form-data
-     * @param bool   optional $app_only_auth   Whether to use app-only bearer authentication
+     * @param string $httpmethod      The HTTP method to use for making the request
+     * @param string $method          The API method to call
+     * @param string $method_template The templated API method to call
+     * @param array  $params          optional The parameters to send along
+     * @param bool   $multipart       optional Whether to use multipart/form-data
+     * @param bool   $app_only_auth   optional Whether to use app-only bearer authentication
      *
      * @return mixed The API reply, encoded in the set return_format
      */
@@ -959,6 +960,7 @@ class CodebirdSN
         $httpstatus = curl_getinfo($ch, CURLINFO_HTTP_CODE);
         $reply = $this->_parseApiReply($method_template, $reply);
         if ($this->_return_format == CODEBIRD_RETURNFORMAT_OBJECT) {
+            /** @var object $reply */
             $reply->httpstatus = $httpstatus;
         } elseif ($this->_return_format == CODEBIRD_RETURNFORMAT_ARRAY) {
             $reply['httpstatus'] = $httpstatus;
diff --git a/statusnet/library/statusnetoauth.php b/statusnet/library/statusnetoauth.php
index c9bb0163..c32b2b4f 100644
--- a/statusnet/library/statusnetoauth.php
+++ b/statusnet/library/statusnetoauth.php
@@ -52,11 +52,6 @@ class StatusNetOAuth extends TwitterOAuth
 	 *
 	 * Copied here from the TwitterOAuth library and complemented by applying the proxy settings of Friendica
 	 *
-	 * @param string $method
-	 * @param string $host
-	 * @param string $path
-	 * @param array  $parameters
-	 *
 	 * @return array|object API results
 	 */
 	function http($url, $method, $postfields = NULL)
diff --git a/statusnet/library/twitteroauth.php b/statusnet/library/twitteroauth.php
index b33b5f9d..bf413d23 100644
--- a/statusnet/library/twitteroauth.php
+++ b/statusnet/library/twitteroauth.php
@@ -93,7 +93,7 @@ class TwitterOAuth
 	/**
 	 * Get a request_token
 	 *
-	 * @param callback $oauth_callback
+	 * @param callable $oauth_callback
 	 * @return array
 	 */
 	function getRequestToken($oauth_callback = null)
@@ -112,8 +112,6 @@ class TwitterOAuth
 	/**
 	 * Get the authorize URL
 	 *
-	 * @param array $token
-	 * @param bool $sign_in_with_tumblr
 	 * @return string
 	 */
 	function getAuthorizeURL($token, $sign_in_with_twitter = TRUE)

From fff140ad4360376df6b2e9cb58ac4d2986baee73 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Mon, 9 Dec 2024 23:08:31 +0000
Subject: [PATCH 180/294] Fix last 3 errors

---
 showmore/showmore.php            | 2 +-
 statusnet/library/codebirdsn.php | 2 ++
 tesseract/tesseract.php          | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/showmore/showmore.php b/showmore/showmore.php
index 8e85925a..e326aa98 100644
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -8,7 +8,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
@@ -79,6 +78,7 @@ function get_body_length($body)
 	 * Checking any possible syntax of the style attribute with xpath is impossible
 	 * So we just get any element with a style attribute, and check them with a regexp
 	 */
+	/** @var DOMNodeList $xr */
 	$xr = $xpath->query('//*[@style]');
 	foreach ($xr as $node) {
 		if (preg_match('/.*display: *none *;.*/',$node->getAttribute('style'))) {
diff --git a/statusnet/library/codebirdsn.php b/statusnet/library/codebirdsn.php
index 70743356..9807d97f 100644
--- a/statusnet/library/codebirdsn.php
+++ b/statusnet/library/codebirdsn.php
@@ -54,6 +54,8 @@ unset($id);
  *
  * @package codebird
  * @subpackage codebird-php
+ *
+ * @method object statuses_update(array $postdata)
  */
 class CodebirdSN
 {
diff --git a/tesseract/tesseract.php b/tesseract/tesseract.php
index b3e1feb6..4c630dbb 100644
--- a/tesseract/tesseract.php
+++ b/tesseract/tesseract.php
@@ -26,6 +26,7 @@ function tesseract_ocr_detection(&$media)
 	try {
 		$languages = $ocr->availableLanguages();
 		if ($languages) {
+			/** @phpstan-ignore-next-line ignore call of \thiagoalessio\TesseractOCR\Option::lang() */
 			$ocr->lang(implode('+', $languages));
 		}
 		$ocr->tempDir(System::getTempPath());
@@ -33,5 +34,5 @@ function tesseract_ocr_detection(&$media)
 		$media['description'] = $ocr->run();
 	} catch (\Throwable $th) {
 		Logger::info('Error calling TesseractOCR', ['message' => $th->getMessage()]);
-	}			
+	}
 }

From 5f7482d081b4f41164c9e9c07ad65f6c65880fb7 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 11 Dec 2024 21:42:48 +0000
Subject: [PATCH 181/294] Remove unused use statements for App

---
 .../advancedcontentfilter.php                 |  2 --
 birdavatar/birdavatar.php                     |  1 -
 blackout/blackout.php                         |  1 -
 buglink/buglink.php                           |  1 -
 calc/calc.php                                 | 11 +++++-----
 catavatar/catavatar.php                       |  2 --
 cookienotice/cookienotice.php                 |  1 -
 diaspora/diaspora.php                         |  1 -
 discourse/discourse.php                       |  1 -
 dwpost/dwpost.php                             |  1 -
 fancybox/fancybox.php                         |  1 -
 fromapp/fromapp.php                           |  3 +--
 geocoordinates/geocoordinates.php             |  1 -
 geonames/geonames.php                         |  1 -
 gnot/gnot.php                                 |  5 ++---
 googlemaps/googlemaps.php                     |  1 -
 gravatar/gravatar.php                         |  3 ---
 group_text/group_text.php                     |  2 --
 highlightjs/highlightjs.php                   |  1 -
 ifttt/ifttt.php                               |  1 -
 ijpost/ijpost.php                             |  1 -
 impressum/impressum.php                       |  1 -
 .../infiniteimprobabilitydrive.php            |  1 -
 irc/irc.php                                   |  1 -
 krynn/krynn.php                               |  1 -
 ldapauth/ldapauth.php                         |  1 -
 libertree/libertree.php                       |  1 -
 libravatar/libravatar.php                     |  1 -
 markdown/markdown.php                         |  1 -
 mathjax/mathjax.php                           |  1 -
 morechoice/morechoice.php                     |  1 -
 morepokes/morepokes.php                       |  1 -
 newmemberwidget/newmemberwidget.php           |  1 -
 nitter/nitter.php                             |  1 -
 nominatim/nominatim.php                       |  1 -
 notifyall/notifyall.php                       |  2 --
 numfriends/numfriends.php                     |  5 ++---
 openstreetmap/openstreetmap.php               |  1 -
 opmlexport/opmlexport.php                     |  4 ----
 pageheader/pageheader.php                     |  3 +--
 phpmailer/phpmailer.php                       |  1 -
 piwik/piwik.php                               |  3 +--
 planets/planets.php                           |  1 -
 public_server/public_server.php               |  1 -
 qcomment/qcomment.php                         |  1 -
 randplace/randplace.php                       |  1 -
 rendertime/rendertime.php                     |  1 -
 s3_storage/s3_storage.php                     |  1 -
 securemail/SecureTestEmail.php                |  1 -
 securemail/securemail.php                     |  7 -------
 showmore_dyn/showmore_dyn.php                 |  4 ----
 .../lang/smiley_pack_es/smiley_pack_es.php    | 21 +++++++++----------
 .../lang/smiley_pack_fr/smiley_pack_fr.php    | 19 ++++++++---------
 smileybutton/smileybutton.php                 |  1 -
 smilies_adult/smilies_adult.php               |  5 ++---
 startpage/startpage.php                       |  1 -
 statusnet/statusnet.php                       |  1 -
 testdrive/testdrive.php                       |  1 -
 unicode_smilies/unicode_smilies.php           |  7 +++----
 viewsrc/viewsrc.php                           |  1 -
 webrtc/webrtc.php                             |  1 -
 61 files changed, 36 insertions(+), 115 deletions(-)

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index 84eb468c..329156f1 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -33,7 +33,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Hook;
@@ -42,7 +41,6 @@ use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
-use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\Tag;
 use Friendica\Model\User;
diff --git a/birdavatar/birdavatar.php b/birdavatar/birdavatar.php
index 4841ba52..9a9dce0a 100644
--- a/birdavatar/birdavatar.php
+++ b/birdavatar/birdavatar.php
@@ -6,7 +6,6 @@
  * Author: Fabio <https://kirgroup.com/profile/fabrixxm>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/blackout/blackout.php b/blackout/blackout.php
index 55fb8d32..a3f806ff 100644
--- a/blackout/blackout.php
+++ b/blackout/blackout.php
@@ -44,7 +44,6 @@
  * THE SOFTWARE.
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/buglink/buglink.php b/buglink/buglink.php
index 78fb8bef..b7dd6504 100644
--- a/buglink/buglink.php
+++ b/buglink/buglink.php
@@ -6,7 +6,6 @@
  * Author: Mike Macgirvin <mike@macgirvin.com>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/calc/calc.php b/calc/calc.php
index a8a340c4..76d1805c 100644
--- a/calc/calc.php
+++ b/calc/calc.php
@@ -6,7 +6,6 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
@@ -16,7 +15,7 @@ function calc_install() {
 
 function calc_app_menu(array &$b)
 {
-	$b['app_menu'][] = '<div class="app-title"><a href="calc">Calculator</a></div>'; 
+	$b['app_menu'][] = '<div class="app-title"><a href="calc">Calculator</a></div>';
 }
 
 /**
@@ -296,7 +295,7 @@ $o .=  <<< EOT
 <h3>Calculator</h3>
 <br /><br />
 <table>
-<tbody><tr><td> 
+<tbody><tr><td>
 <table bgcolor="#af9999" border="1">
 <tbody><tr><td>
 <table border="1" cellpadding="2" cellspacing="2">
@@ -323,7 +322,7 @@ $o .=  <<< EOT
 	<td><input name="multiplication" value="&nbsp;&nbsp;*&nbsp;&nbsp;&nbsp;&nbsp;" onclick="multiplyNumbers()" type="button"></td>
 </tr><tr align="left" valign="middle">
 	<td><input name="zero" value="&nbsp;&nbsp;0&nbsp;&nbsp;&nbsp;" onclick="addDisplay(0)" type="button"></td>
-	<td><input name="pi" value="&nbsp;Pi&nbsp;&nbsp;" onclick="addDisplay(Math.PI)" type="button"> </td> 
+	<td><input name="pi" value="&nbsp;Pi&nbsp;&nbsp;" onclick="addDisplay(Math.PI)" type="button"> </td>
 	<td><input name="dot" value="&nbsp;&nbsp;&nbsp;.&nbsp;&nbsp;&nbsp;" onclick='addDisplay(".")' type="button"></td>
 	<td><input name="division" value="&nbsp;&nbsp;&nbsp;/&nbsp;&nbsp;&nbsp;" onclick="divideNumbers()" type="button"></td>
 </tr><tr align="left" valign="middle">
@@ -345,13 +344,13 @@ $o .=  <<< EOT
 </form>
 
 	<!--
-	<TD VALIGN=top> 
+	<TD VALIGN=top>
 		<B>NOTE:</B> All sine and cosine calculations are
 		<br>done in radians. Remember to convert first
 		<br>if using degrees.
 	</TD>
 	-->
-	
+
 </td></tr></tbody></table>
 
 
diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
index 2116ac44..2bdf0cca 100644
--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.php
@@ -6,11 +6,9 @@
  * Author: Fabio <https://kirgroup.com/profile/fabrixxm>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
diff --git a/cookienotice/cookienotice.php b/cookienotice/cookienotice.php
index 2bd6f9b1..bc9d2416 100644
--- a/cookienotice/cookienotice.php
+++ b/cookienotice/cookienotice.php
@@ -7,7 +7,6 @@
  * Author: Peter Liebetrau <https://socivitas/profile/peerteer>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index 979204ba..d6c98e34 100644
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -9,7 +9,6 @@
 
 require_once 'addon/diaspora/Diaspora_Connection.php';
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/discourse/discourse.php b/discourse/discourse.php
index 298b3f3e..e97a4fd8 100644
--- a/discourse/discourse.php
+++ b/discourse/discourse.php
@@ -8,7 +8,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index 1ecd9764..7ce30086 100644
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -8,7 +8,6 @@
  * Author: Cat Gray <https://free-haven.org/profile/catness>
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/fancybox/fancybox.php b/fancybox/fancybox.php
index 73bbdab9..8608bcd7 100644
--- a/fancybox/fancybox.php
+++ b/fancybox/fancybox.php
@@ -7,7 +7,6 @@
  * Status: Unsupported
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index 0d5a5b16..8bd27606 100644
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -7,7 +7,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -76,6 +75,6 @@ function fromapp_post_hook(&$item)
 
 	$apps = explode(',', $app);
 	$item['app'] = trim($apps[mt_rand(0, count($apps)-1)]);
-	
+
 	return;
 }
diff --git a/geocoordinates/geocoordinates.php b/geocoordinates/geocoordinates.php
index 5cb90efd..eb56f093 100644
--- a/geocoordinates/geocoordinates.php
+++ b/geocoordinates/geocoordinates.php
@@ -6,7 +6,6 @@
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/geonames/geonames.php b/geonames/geonames.php
index dcbd65f8..668eb0e7 100644
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -6,7 +6,6 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/gnot/gnot.php b/gnot/gnot.php
index 15fb4da0..5d0919cb 100644
--- a/gnot/gnot.php
+++ b/gnot/gnot.php
@@ -4,11 +4,10 @@
  * Description: Thread email comment notifications on Gmail and anonymise them
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
- * 
+ *
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -38,7 +37,7 @@ function gnot_settings_post($post) {
 }
 
 /**
- * Called from the Addon Setting form. 
+ * Called from the Addon Setting form.
  * Add our own settings info to the page.
  */
 function gnot_settings(array &$data)
diff --git a/googlemaps/googlemaps.php b/googlemaps/googlemaps.php
index 356ce68c..b83a9cf9 100644
--- a/googlemaps/googlemaps.php
+++ b/googlemaps/googlemaps.php
@@ -7,7 +7,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 
diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index 83a8fbb9..ca5eaaf0 100644
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -6,15 +6,12 @@
  * Author: Klaus Weidenbach <http://friendica.dszdw.net/profile/klaus>
  */
 
-use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
-use Friendica\Util\Strings;
 
 /**
  * Installs the addon hook
diff --git a/group_text/group_text.php b/group_text/group_text.php
index 02e9fd0a..e5067fb5 100644
--- a/group_text/group_text.php
+++ b/group_text/group_text.php
@@ -8,9 +8,7 @@
  * Note: Please use Circle Text instead
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
diff --git a/highlightjs/highlightjs.php b/highlightjs/highlightjs.php
index 097d34c7..c1c2aac8 100644
--- a/highlightjs/highlightjs.php
+++ b/highlightjs/highlightjs.php
@@ -6,7 +6,6 @@
  * Author: Hypolite Petovan <hypolite@mrpetovan.com>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index 6d4f402c..51fa8db8 100644
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -6,7 +6,6 @@
  * Version: 0.1
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
-use Friendica\App;
 use Friendica\Content\PageInfo;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index f22dfff2..37c3cd45 100644
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -8,7 +8,6 @@
  * Author: Cat Gray <https://free-haven.org/profile/catness>
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/impressum/impressum.php b/impressum/impressum.php
index 754cb828..19ade933 100644
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -7,7 +7,6 @@
  * License: 3-clause BSD license
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
index aff7aec0..9eb6ab36 100644
--- a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
+++ b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
@@ -6,7 +6,6 @@
 * Author: Thomas Willingham <https://kakste.com/profile/beardyunixer>
 */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/irc/irc.php b/irc/irc.php
index d4435851..db808a99 100644
--- a/irc/irc.php
+++ b/irc/irc.php
@@ -7,7 +7,6 @@
 * Author: Tobias Diekershoff <https://f.diekershoff.de/u/tobias>
 */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/krynn/krynn.php b/krynn/krynn.php
index f7e77c26..fa9db133 100644
--- a/krynn/krynn.php
+++ b/krynn/krynn.php
@@ -10,7 +10,6 @@
  *"My body was my sacrifice... for my magic. This damage is permanent." - Raistlin Majere
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
index 38e2d6a1..14686e99 100644
--- a/ldapauth/ldapauth.php
+++ b/ldapauth/ldapauth.php
@@ -29,7 +29,6 @@
  * The configuration options for this module are described in the config/ldapauth.config.php file
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
diff --git a/libertree/libertree.php b/libertree/libertree.php
index 1d997123..c138e597 100644
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -6,7 +6,6 @@
  * Author: Tony Baldwin <https://free-haven.org/u/tony>
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index 54594b88..b0b2c214 100644
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -6,7 +6,6 @@
  * Author: Klaus Weidenbach <http://friendica.dszdw.net/profile/klaus>
  */
 
-use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/markdown/markdown.php b/markdown/markdown.php
index 6f459244..0822ac83 100644
--- a/markdown/markdown.php
+++ b/markdown/markdown.php
@@ -5,7 +5,6 @@
  * Version: 0.1
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Renderer;
diff --git a/mathjax/mathjax.php b/mathjax/mathjax.php
index d0046cf7..e96aaddf 100644
--- a/mathjax/mathjax.php
+++ b/mathjax/mathjax.php
@@ -8,7 +8,6 @@
  * License: 3-clause BSD license
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/morechoice/morechoice.php b/morechoice/morechoice.php
index fe726d27..fbb88ce1 100644
--- a/morechoice/morechoice.php
+++ b/morechoice/morechoice.php
@@ -8,7 +8,6 @@
  * Status: Deprecated
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/morepokes/morepokes.php b/morepokes/morepokes.php
index abe59a6e..2ac09a73 100644
--- a/morepokes/morepokes.php
+++ b/morepokes/morepokes.php
@@ -7,7 +7,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/newmemberwidget/newmemberwidget.php b/newmemberwidget/newmemberwidget.php
index 01977d0c..d3b68807 100644
--- a/newmemberwidget/newmemberwidget.php
+++ b/newmemberwidget/newmemberwidget.php
@@ -6,7 +6,6 @@
  * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
  ***/
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/nitter/nitter.php b/nitter/nitter.php
index 946b18c0..adbfd6b0 100644
--- a/nitter/nitter.php
+++ b/nitter/nitter.php
@@ -25,7 +25,6 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/nominatim/nominatim.php b/nominatim/nominatim.php
index 6ad4a8a3..a3d14af5 100644
--- a/nominatim/nominatim.php
+++ b/nominatim/nominatim.php
@@ -6,7 +6,6 @@
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index 966a9184..d37bac56 100644
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -9,9 +9,7 @@
  */
 
 use Friendica\Addon\notifyall\NotifyAllEmail;
-use Friendica\App;
 use Friendica\Database\DBA;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
diff --git a/numfriends/numfriends.php b/numfriends/numfriends.php
index 538a4a3e..66c9b74a 100644
--- a/numfriends/numfriends.php
+++ b/numfriends/numfriends.php
@@ -6,7 +6,6 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -39,7 +38,7 @@ function numfriends_settings_post($post) {
 
 /**
  *
- * Called from the Addon Setting form. 
+ * Called from the Addon Setting form.
  * Add our own settings info to the page.
  *
  */
@@ -50,7 +49,7 @@ function numfriends_settings(array &$data)
 	}
 
 	$numfriends = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'display_friend_count', 24);
-	
+
 	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/numfriends/');
 	$html = Renderer::replaceMacros($t, [
 		'$numfriends' => ['numfriends', DI::l10n()->t('How many contacts to display on profile sidebar'), $numfriends],
diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index ae22aff0..c520514c 100644
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -9,7 +9,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/opmlexport/opmlexport.php b/opmlexport/opmlexport.php
index fdfacc3e..3df71275 100644
--- a/opmlexport/opmlexport.php
+++ b/opmlexport/opmlexport.php
@@ -8,12 +8,8 @@
  */
 
 use Friendica\DI;
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
-use Friendica\Network\HTTPException;
-use Friendica\Database\DBA;
-use Friendica\Core\Renderer;
 use Friendica\Core\Protocol;
 use Friendica\Model\Contact;
 use Friendica\Model\User;
diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php
index 057bb863..d729acc1 100644
--- a/pageheader/pageheader.php
+++ b/pageheader/pageheader.php
@@ -5,10 +5,9 @@
  * Version: 1.1
  * Author: Keith Fernie <http://friendika.me4.it/profile/keith>
  *         Hauke Altmann <https://snarl.de/profile/tugelblend>
- * 
+ *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/phpmailer/phpmailer.php b/phpmailer/phpmailer.php
index 4c12709d..5e137b94 100644
--- a/phpmailer/phpmailer.php
+++ b/phpmailer/phpmailer.php
@@ -7,7 +7,6 @@
  * Maintainer: Hypolite Petovan <hypolite@friendica.mrpetovan.com>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 use Friendica\Object\EMail\IEmail;
diff --git a/piwik/piwik.php b/piwik/piwik.php
index fd6d5fc9..b7b49bd4 100644
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -35,7 +35,6 @@
  *     setting.
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -76,7 +75,7 @@ function piwik_analytics(string &$b)
 	 *   Add the Piwik tracking code for the site.
 	 *   If async is set to true use asynchronous tracking
 	 */
-	
+
 	$scriptAsyncValue = $async ? 'true' : 'false';
 	$scriptPhpEndpoint = $shortendpoint ? 'js/' : 'piwik.php';
 	$scriptJsEndpoint = $shortendpoint ? 'js/' : 'piwik.js';
diff --git a/planets/planets.php b/planets/planets.php
index 8a206fb5..d96e33a6 100644
--- a/planets/planets.php
+++ b/planets/planets.php
@@ -7,7 +7,6 @@
  * Author: Tony Baldwin <https://free-haven.org/profile/tony>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/public_server/public_server.php b/public_server/public_server.php
index 7591c7d0..5834f42a 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -6,7 +6,6 @@
  * Author: Keith Fernie <http://friendika.me4.it/profile/keith>
  */
 
-use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/qcomment/qcomment.php b/qcomment/qcomment.php
index 1b8bfcbf..f7126531 100644
--- a/qcomment/qcomment.php
+++ b/qcomment/qcomment.php
@@ -18,7 +18,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/randplace/randplace.php b/randplace/randplace.php
index 34f48c6c..5cb07597 100644
--- a/randplace/randplace.php
+++ b/randplace/randplace.php
@@ -19,7 +19,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php
index 731cf003..1cce5b1b 100644
--- a/rendertime/rendertime.php
+++ b/rendertime/rendertime.php
@@ -7,7 +7,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/s3_storage/s3_storage.php b/s3_storage/s3_storage.php
index 361577be..c08c3172 100644
--- a/s3_storage/s3_storage.php
+++ b/s3_storage/s3_storage.php
@@ -8,7 +8,6 @@
 
 use Friendica\Addon\s3_storage\src\S3Client;
 use Friendica\Addon\s3_storage\src\S3Config;
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/securemail/SecureTestEmail.php b/securemail/SecureTestEmail.php
index c614104f..32510091 100644
--- a/securemail/SecureTestEmail.php
+++ b/securemail/SecureTestEmail.php
@@ -21,7 +21,6 @@
 
 namespace Friendica\Addon\securemail;
 
-use Friendica\App;
 use Friendica\App\BaseURL;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
diff --git a/securemail/securemail.php b/securemail/securemail.php
index 61125587..b56c0cbc 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Addon\securemail\SecureTestEmail;
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -32,8 +31,6 @@ function securemail_install()
  * @link  https://github.com/friendica/friendica/blob/develop/doc/Addons.md#addon_settings 'addon_settings' hook
  *
  * @param array $data
- *
- * @see   App
  */
 function securemail_settings(array &$data)
 {
@@ -67,8 +64,6 @@ function securemail_settings(array &$data)
  * @link  https://github.com/friendica/friendica/blob/develop/doc/Addons.md#addon_settings_post 'addon_settings_post' hook
  *
  * @param array $b hook data
- *
- * @see   App
  */
 function securemail_settings_post(array &$b)
 {
@@ -102,8 +97,6 @@ function securemail_settings_post(array &$b)
  * @link  https://github.com/friendica/friendica/blob/develop/doc/Addons.md#emailer_send_prepare 'emailer_send_prepare' hook
  *
  * @param IEmail $email Email
- *
- * @see   App
  */
 function securemail_emailer_send_prepare(IEmail &$email)
 {
diff --git a/showmore_dyn/showmore_dyn.php b/showmore_dyn/showmore_dyn.php
index 7cb64bcc..4c2e62f5 100644
--- a/showmore_dyn/showmore_dyn.php
+++ b/showmore_dyn/showmore_dyn.php
@@ -7,12 +7,8 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Database\DBA;
 use Friendica\DI;
 
 function showmore_dyn_install()
diff --git a/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php b/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php
index 38b208da..0f41101d 100644
--- a/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php
+++ b/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php
@@ -3,11 +3,10 @@
  * Name: Smiley Pack (Español)
  * Description: Pack of smileys that make master too AOLish.
  * Version: 1.02
- * Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template) 
+ * Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template)
  * All smileys from sites offering them as Public Domain
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
@@ -19,7 +18,7 @@ function smiley_pack_smilies_es(array &$b) {
 
 #Smileys are split into various directories by the intended range of emotions.  This is in case we get too big and need to modularise things.  We can then cut and paste the right lines, move the right directory, and just change the name of the addon to happy_smilies or whatever.
 
-#Be careful with invocation strings.  If you have a smiley called foo, and another called foobar, typing :foobar will call foo.  Avoid this with clever naming, using ~ instead of : 
+#Be careful with invocation strings.  If you have a smiley called foo, and another called foobar, typing :foobar will call foo.  Avoid this with clever naming, using ~ instead of :
 #when all else fails.
 
 
@@ -49,7 +48,7 @@ function smiley_pack_smilies_es(array &$b) {
 
 	$b['texts'][] = ':vaca';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':vaca' . '" />';
-    
+
 	$b['texts'][] = ':cangrejo';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':cangrejo' . '" />';
 
@@ -70,7 +69,7 @@ function smiley_pack_smilies_es(array &$b) {
 
 	$b['texts'][] = ':caballo';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':caballo' . '" />';
-  
+
 	$b['texts'][] = ':loro';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':loro' . '" />';
 
@@ -107,7 +106,7 @@ function smiley_pack_smilies_es(array &$b) {
 
 	$b['texts'][] = ':cuna';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':cuna' . '" />';
-	
+
 
 	$b['texts'][] = ':embarazada';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':embarazada' . '" />';
@@ -116,10 +115,10 @@ function smiley_pack_smilies_es(array &$b) {
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':cigüeña' . '" />';
 
 
-#Confused Smileys	
+#Confused Smileys
 	$b['texts'][] = ':confundido';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confundido' . '" />';
-    
+
 	$b['texts'][] = ':encogehombros';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':encogehombros' . '" />';
 
@@ -154,13 +153,13 @@ function smiley_pack_smilies_es(array &$b) {
 
 	$b['texts'][] = ':diabólico';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':diabólico' . '" />';
-	
+
 	$b['texts'][] = ':adbalancín';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':adbalancín' . '" />';
 
 	$b['texts'][] = ':vuelvedemonio';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':vuelvedemonio' . '" />';
-	
+
 	$b['texts'][] = ':santo';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':santo' . '" />';
 
@@ -242,7 +241,7 @@ function smiley_pack_smilies_es(array &$b) {
 
 	$b['texts'][] = ':billar';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billar' . '" />';
-  
+
 	$b['texts'][] = ':tenis';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tenis' . '" />';
 
diff --git a/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php b/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php
index 63cf613e..c5474e3c 100644
--- a/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php
+++ b/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php
@@ -9,7 +9,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
@@ -23,7 +22,7 @@ function smiley_pack_fr_smilies(array &$b)
 
 #Smileys are split into various directories by the intended range of emotions.  This is in case we get too big and need to modularise things.  We can then cut and paste the right lines, move the right directory, and just change the name of the addon to happy_smilies or whatever.
 
-#Be careful with invocation strings.  If you have a smiley called foo, and another called foobar, typing :foobar will call foo.  Avoid this with clever naming, using ~ instead of : 
+#Be careful with invocation strings.  If you have a smiley called foo, and another called foobar, typing :foobar will call foo.  Avoid this with clever naming, using ~ instead of :
 #when all else fails.
 
 
@@ -56,7 +55,7 @@ function smiley_pack_fr_smilies(array &$b)
 
 	$b['texts'][] = ':vache';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':vache' . '" />';
-    
+
 	$b['texts'][] = ':crabe';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':crabe' . '" />';
 
@@ -74,7 +73,7 @@ function smiley_pack_fr_smilies(array &$b)
 
 	$b['texts'][] = ':cheval';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':cheval' . '" />';
-  
+
 	$b['texts'][] = ':perroquet';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':perroquet' . '" />';
 
@@ -108,7 +107,7 @@ function smiley_pack_fr_smilies(array &$b)
 
 	$b['texts'][] = ':litbébé';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':litbébé' . '" />';
-	
+
 
 	$b['texts'][] = ':enceinte';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':enceinte' . '" />';
@@ -117,10 +116,10 @@ function smiley_pack_fr_smilies(array &$b)
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':cigogne' . '" />';
 
 
-#Confused Smileys	
+#Confused Smileys
 	$b['texts'][] = ':paumé';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':paumé' . '" />';
-    
+
 	$b['texts'][] = ':hausseépaules';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':hausseépaules' . '" />';
 
@@ -152,13 +151,13 @@ function smiley_pack_fr_smilies(array &$b)
 
 	$b['texts'][] = ':démoniaque';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':démoniaque' . '" />';
-	
+
 	$b['texts'][] = ':bascule';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':bascule' . '" />';
 
 	$b['texts'][] = ':possédé';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':possédé' . '" />';
-	
+
 	$b['texts'][] = ':tombe';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':tombe' . '" />';
 
@@ -225,7 +224,7 @@ function smiley_pack_fr_smilies(array &$b)
 
 	$b['texts'][] = ':billard';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billard' . '" />';
-  
+
 	$b['texts'][] = ':équitation';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':équitation' . '" />';
 
diff --git a/smileybutton/smileybutton.php b/smileybutton/smileybutton.php
index 1df717b7..ae0e783b 100644
--- a/smileybutton/smileybutton.php
+++ b/smileybutton/smileybutton.php
@@ -7,7 +7,6 @@
  * Maintainer: Hypolite Petovan <https://friendica.mrpetovan.com/profile/hypolite>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/smilies_adult/smilies_adult.php b/smilies_adult/smilies_adult.php
index e8af21e1..4a80168d 100644
--- a/smilies_adult/smilies_adult.php
+++ b/smilies_adult/smilies_adult.php
@@ -4,12 +4,11 @@
  * Description: Smily icons that could or should not be included in core
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
- * 
+ *
  * This is a template for how to extend the "smily" code.
- * 
+ *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/startpage/startpage.php b/startpage/startpage.php
index e4d80c0c..558af473 100644
--- a/startpage/startpage.php
+++ b/startpage/startpage.php
@@ -7,7 +7,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 48f9c254..bd115115 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -38,7 +38,6 @@ define('STATUSNET_DEFAULT_POLL_INTERVAL', 5); // given in minutes
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'statusnetoauth.php';
 
 use CodebirdSN\CodebirdSN;
-use Friendica\App;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 55645284..40f22e0a 100644
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -6,7 +6,6 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Search;
 use Friendica\Database\DBA;
diff --git a/unicode_smilies/unicode_smilies.php b/unicode_smilies/unicode_smilies.php
index 22ee3439..b39c6f10 100644
--- a/unicode_smilies/unicode_smilies.php
+++ b/unicode_smilies/unicode_smilies.php
@@ -7,7 +7,6 @@
  * Author: Matthias Ebers <https://loma.ml/profile/one>
  */
 
-use Friendica\App;
 use Friendica\Content\Smilies;
 use Friendica\Core\Hook;
 
@@ -691,7 +690,7 @@ function unicode_smilies_smilies(array &$b)
 	Smilies::add($b, ':custard:', '&#x1F36E');
 	Smilies::add($b, ':honey pot:', '&#x1F36F');
 
-// drink  
+// drink
 	Smilies::add($b, ':baby bottle:', '&#x1F37C');
 	Smilies::add($b, ':glass of milk:', '&#x1F95B');
 	Smilies::add($b, ':hot beverage:', '&#x2615');
@@ -1123,7 +1122,7 @@ function unicode_smilies_smilies(array &$b)
 	Smilies::add($b, ':control knobs:', '&#x1F39B');
 	Smilies::add($b, ':microphone:', '&#x1F3A4');
 	Smilies::add($b, ':headphone:', '&#x1F3A7');
-	Smilies::add($b, ':radio:', '&#x1F4FB');    
+	Smilies::add($b, ':radio:', '&#x1F4FB');
 
 // musical-instrument
 	Smilies::add($b, ':saxophone:', '&#x1F3B7');
@@ -1529,7 +1528,7 @@ function unicode_smilies_smilies(array &$b)
 	Smilies::add($b, ':O button (blood type):', '&#x1F17E');
 	Smilies::add($b, ':OK button:', '&#x1F197');
 	Smilies::add($b, ':P button:', '&#x1F17F');
-	Smilies::add($b, ':SOS button:', '&#x1F198');  
+	Smilies::add($b, ':SOS button:', '&#x1F198');
 	Smilies::add($b, ':UP! button:', '&#x1F199');
 	Smilies::add($b, ':VS button:', '&#x1F19A');
 	Smilies::add($b, ':Japanese “here” button:', '&#x1F201');
diff --git a/viewsrc/viewsrc.php b/viewsrc/viewsrc.php
index c4d21ccb..bd07b541 100644
--- a/viewsrc/viewsrc.php
+++ b/viewsrc/viewsrc.php
@@ -7,7 +7,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/webrtc/webrtc.php b/webrtc/webrtc.php
index e142b374..e5d4ce6e 100644
--- a/webrtc/webrtc.php
+++ b/webrtc/webrtc.php
@@ -7,7 +7,6 @@
  * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;

From 84659fc1ad339b0f7cee0b8d11ede9ea9aafba07 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 11 Dec 2024 21:47:10 +0000
Subject: [PATCH 182/294] Replace DI::app() with DI::appHelper()

---
 advancedcontentfilter/advancedcontentfilter.php | 2 +-
 bluesky/bluesky.php                             | 2 +-
 fancybox/fancybox.php                           | 2 +-
 geonames/geonames.php                           | 2 +-
 gravatar/gravatar.php                           | 2 +-
 highlightjs/highlightjs.php                     | 2 +-
 impressum/impressum.php                         | 2 +-
 ldapauth/ldapauth.php                           | 2 +-
 libravatar/libravatar.php                       | 2 +-
 openstreetmap/openstreetmap.php                 | 2 +-
 phpmailer/phpmailer.php                         | 2 +-
 piwik/piwik.php                                 | 2 +-
 pnut/pnut.php                                   | 2 +-
 public_server/public_server.php                 | 2 +-
 pumpio/pumpio.php                               | 2 +-
 smileybutton/smileybutton.php                   | 6 +++---
 testdrive/testdrive.php                         | 2 +-
 tumblr/tumblr.php                               | 2 +-
 twitter/twitter.php                             | 2 +-
 19 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index 329156f1..c03034cd 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -271,7 +271,7 @@ function advancedcontentfilter_content()
 				'rule_expression'   => DI::l10n()->t('Rule Expression'),
 				'cancel'            => DI::l10n()->t('Cancel'),
 			],
-			'$current_theme' => DI::app()->getCurrentTheme(),
+			'$current_theme' => DI::appHelper()->getCurrentTheme(),
 			'$rules' => DBA::toArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => DI::userSession()->getLocalUserId()])),
 			'$form_security_token' => BaseModule::getFormSecurityToken()
 		]);
diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 91e524fe..aa4bc340 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -98,7 +98,7 @@ function bluesky_install()
 
 function bluesky_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('bluesky'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('bluesky'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function bluesky_check_item_notification(array &$notification_data)
diff --git a/fancybox/fancybox.php b/fancybox/fancybox.php
index 8608bcd7..b1a1ff35 100644
--- a/fancybox/fancybox.php
+++ b/fancybox/fancybox.php
@@ -39,7 +39,7 @@ function fancybox_render(array &$b){
 		function ($text) use ($gallery) {
 			// This processes images inlined in posts
 			// Frio / Vier hooks für lightbox are un-hooked in fancybox-config.js. So this works for them, too!
-			//if (!in_array(DI::app()->getCurrentTheme(),['vier','frio']))
+			//if (!in_array(DI::appHelper()->getCurrentTheme(),['vier','frio']))
 			$text = preg_replace(
 				'#<a[^>]*href="([^"]*)"[^>]*>(<img[^>]*src="[^"]*"[^>]*>)</a>#',
 				'<a data-fancybox="' . $gallery . '" href="$1">$2</a>',
diff --git a/geonames/geonames.php b/geonames/geonames.php
index 668eb0e7..d14b1e8f 100644
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -34,7 +34,7 @@ function geonames_install()
 
 function geonames_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('geonames'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('geonames'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function geonames_post_hook(array &$item)
diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index ca5eaaf0..6007c433 100644
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -25,7 +25,7 @@ function gravatar_install() {
 
 function gravatar_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('gravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('gravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 /**
diff --git a/highlightjs/highlightjs.php b/highlightjs/highlightjs.php
index c1c2aac8..762f4117 100644
--- a/highlightjs/highlightjs.php
+++ b/highlightjs/highlightjs.php
@@ -17,7 +17,7 @@ function highlightjs_install()
 
 function highlightjs_head(string &$str)
 {
-	if (DI::app()->getCurrentTheme() == 'frio') {
+	if (DI::appHelper()->getCurrentTheme() == 'frio') {
 		$style = 'bootstrap';
 	} else {
 		$style = 'default';
diff --git a/impressum/impressum.php b/impressum/impressum.php
index 19ade933..f61d7182 100644
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -55,7 +55,7 @@ function impressum_footer(string &$body)
 
 function impressum_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('impressum'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('impressum'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function impressum_show(string &$body)
diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
index 14686e99..f834b4d5 100644
--- a/ldapauth/ldapauth.php
+++ b/ldapauth/ldapauth.php
@@ -44,7 +44,7 @@ function ldapauth_install()
 
 function ldapauth_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('ldapauth'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('ldapauth'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function ldapauth_hook_authenticate(array &$b)
diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index b0b2c214..4cd72c83 100644
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -25,7 +25,7 @@ function libravatar_install()
 
 function libravatar_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('libravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('libravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 /**
diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index c520514c..fc5ebbbe 100644
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -36,7 +36,7 @@ function openstreetmap_install()
 
 function openstreetmap_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function openstreetmap_alterheader(&$navHtml)
diff --git a/phpmailer/phpmailer.php b/phpmailer/phpmailer.php
index 5e137b94..f4bb7753 100644
--- a/phpmailer/phpmailer.php
+++ b/phpmailer/phpmailer.php
@@ -24,7 +24,7 @@ function phpmailer_install()
 
 function phpmailer_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('phpmailer'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('phpmailer'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 /**
diff --git a/piwik/piwik.php b/piwik/piwik.php
index b7b49bd4..fc459a87 100644
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -50,7 +50,7 @@ function piwik_install() {
 
 function piwik_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('piwik'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('piwik'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function piwik_analytics(string &$b)
diff --git a/pnut/pnut.php b/pnut/pnut.php
index 32f60f6d..f298997b 100644
--- a/pnut/pnut.php
+++ b/pnut/pnut.php
@@ -90,7 +90,7 @@ function pnut_connect()
 
 function pnut_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('pnut'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('pnut'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function pnut_addon_admin(string &$o)
diff --git a/public_server/public_server.php b/public_server/public_server.php
index 5834f42a..eb7af1e7 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -28,7 +28,7 @@ function public_server_install()
 
 function public_server_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('public_server'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('public_server'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function public_server_register_account($b)
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index d7c2ac32..ffe5f187 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -319,7 +319,7 @@ function pumpio_settings_post(array &$b)
 
 function pumpio_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('pumpio'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('pumpio'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function pumpio_hook_fork(array &$b)
diff --git a/smileybutton/smileybutton.php b/smileybutton/smileybutton.php
index ae0e783b..4d0a8d42 100644
--- a/smileybutton/smileybutton.php
+++ b/smileybutton/smileybutton.php
@@ -19,7 +19,7 @@ function smileybutton_install()
 function smileybutton_jot_tool(string &$body)
 {
 	// Disable if theme is quattro
-	if (DI::app()->getCurrentTheme() == 'quattro') {
+	if (DI::appHelper()->getCurrentTheme() == 'quattro') {
 		return;
 	}
 
@@ -96,7 +96,7 @@ function smileybutton_jot_tool(string &$body)
 	$s .= '</tr></table>';
 
 	//Add css to header
-	$css_file = __DIR__ . '/view/' . DI::app()->getCurrentTheme() . '.css';
+	$css_file = __DIR__ . '/view/' . DI::appHelper()->getCurrentTheme() . '.css';
 	if (!file_exists($css_file)) {
 		$css_file = __DIR__ . '/view/default.css';
 	}
@@ -104,7 +104,7 @@ function smileybutton_jot_tool(string &$body)
 	DI::page()->registerStylesheet($css_file);
 
 	//Get the correct image for the theme
-	$image = 'addon/smileybutton/view/' . DI::app()->getCurrentTheme() . '.png';
+	$image = 'addon/smileybutton/view/' . DI::appHelper()->getCurrentTheme() . '.png';
 	if (!file_exists($image)) {
 		$image = 'addon/smileybutton/view/default.png';
 	}
diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 40f22e0a..90fb5918 100644
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -26,7 +26,7 @@ function testdrive_install()
 
 function testdrive_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('testdrive'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('testdrive'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function testdrive_globaldir_update(array &$b)
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 1e9f5c7f..580d73e6 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -65,7 +65,7 @@ function tumblr_install()
 
 function tumblr_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('tumblr'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('tumblr'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function tumblr_check_item_notification(array &$notification_data)
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 10f8a2fb..ea4ae356 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -67,7 +67,7 @@ function twitter_install()
 
 function twitter_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('twitter'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('twitter'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function twitter_jot_nets(array &$jotnets_fields)

From 31198294c787497d0c5cb4bcf081e5a15db084e5 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 29 Nov 2024 22:36:05 +0000
Subject: [PATCH 183/294] Fix error in bluesky addon

---
 bluesky/bluesky.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 38934feb..8e2c1ca0 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1563,7 +1563,7 @@ function bluesky_get_uri_class(string $uri): ?stdClass
 	}
 
 	$elements = explode(':', $uri);
-	if (empty($elements) || ($elements[0] != 'at')) {
+	if ($elements[0] !== 'at') {
 		$post = Post::selectFirstPost(['extid'], ['uri' => $uri]);
 		return bluesky_get_uri_class($post['extid'] ?? '');
 	}

From cf8a7870f3765db549ec961cf28f7fc7b8e466ad Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:27:45 +0000
Subject: [PATCH 184/294] Fix errors in bluesky addon

---
 bluesky/bluesky.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 8e2c1ca0..91e524fe 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -683,6 +683,8 @@ function bluesky_create_activity(array $item, stdClass $parent = null)
 		return;
 	}
 
+	$post = [];
+
 	if ($item['verb'] == Activity::LIKE) {
 		$record = [
 			'subject'   => $parent,

From 1860e732aee24ee9b1f6677e7b8f5c503f226db6 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:28:38 +0000
Subject: [PATCH 185/294] Fix errors in convert addon

---
 convert/convert.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/convert/convert.php b/convert/convert.php
index 2c97e2aa..2545974c 100644
--- a/convert/convert.php
+++ b/convert/convert.php
@@ -181,7 +181,7 @@ function convert_content() {
 		}
 	}
 
-	$o .= '<h3>Unit Conversions</h3>';
+	$o = '<h3>Unit Conversions</h3>';
 
 	if (isset($_POST['from_unit']) && isset($_POST['value'])) {
 		$o .= ($conv->getTable(intval($_POST['value']), $_POST['from_unit'], $_POST['to_unit'], 5)) . '</p>';

From 81f232d57e8991ca342751d0db2d2680ec7bc7c8 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:30:39 +0000
Subject: [PATCH 186/294] Fix errors in js_upload addon

---
 .../file-uploader/tests/action-acceptance.php    | 16 ++++++++--------
 .../tests/action-handler-queue-test.php          |  8 ++++----
 .../file-uploader/tests/action-handler-test.php  |  8 ++++----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/js_upload/file-uploader/tests/action-acceptance.php b/js_upload/file-uploader/tests/action-acceptance.php
index fc9583f2..172b8857 100644
--- a/js_upload/file-uploader/tests/action-acceptance.php
+++ b/js_upload/file-uploader/tests/action-acceptance.php
@@ -2,12 +2,12 @@
 
 usleep(100000);
 
-$fileName;
-$fileSize;
+$fileName = '';
+$fileSize = 0;;
 
 if (isset($_GET['qqfile'])){
     $fileName = $_GET['qqfile'];
-    
+
 	// xhr request
 	$headers = apache_request_headers();
 	$fileSize = (int)$headers['Content-Length'];
@@ -34,13 +34,13 @@ if ($fileSize > 9 * 1024){
     die ('{error: "server-error file size is bigger than 9kB"}');
 }
 
-if (count($_GET)){	
+if (count($_GET)){
     array_merge($_GET, array('fileName'=>$fileName));
-    
+
     $response = array_merge($_GET, array('success'=>true, 'fileName'=>$fileName));
-    
-    // to pass data through iframe you will need to encode all html tags		
-	echo htmlspecialchars(json_encode($response), ENT_NOQUOTES);	
+
+    // to pass data through iframe you will need to encode all html tags
+	echo htmlspecialchars(json_encode($response), ENT_NOQUOTES);
 } else {
 	die ('{error: "server-error  query params not passed"}');
 }
diff --git a/js_upload/file-uploader/tests/action-handler-queue-test.php b/js_upload/file-uploader/tests/action-handler-queue-test.php
index ff13576d..78760d64 100644
--- a/js_upload/file-uploader/tests/action-handler-queue-test.php
+++ b/js_upload/file-uploader/tests/action-handler-queue-test.php
@@ -2,11 +2,11 @@
 
 sleep(4);
 
-$fileName;
+$fileName = '';
 
 if (isset($_GET['qqfile'])){
     $fileName = $_GET['qqfile'];
-    
+
 	// xhr request
 	$headers = apache_request_headers();
 	if ((int)$headers['Content-Length'] == 0){
@@ -14,7 +14,7 @@ if (isset($_GET['qqfile'])){
 	}
 } elseif (isset($_FILES['qqfile'])){
     $fileName = basename($_FILES['qqfile']['name']);
-    
+
 	// form request
 	if ($_FILES['qqfile']['size'] == 0){
 		die ('{error: "file size is zero"}');
@@ -25,7 +25,7 @@ if (isset($_GET['qqfile'])){
 
 if (count($_GET)){
     $_GET['success'] = true;
-	echo json_encode(array_merge($_GET));	
+	echo json_encode(array_merge($_GET));
 } else {
 	die ('{error: "query params not passed"}');
 }
diff --git a/js_upload/file-uploader/tests/action-handler-test.php b/js_upload/file-uploader/tests/action-handler-test.php
index 24466b12..9fa72023 100644
--- a/js_upload/file-uploader/tests/action-handler-test.php
+++ b/js_upload/file-uploader/tests/action-handler-test.php
@@ -2,11 +2,11 @@
 
 usleep(300);
 
-$fileName;
+$fileName = '';
 
 if (isset($_GET['qqfile'])){
     $fileName = $_GET['qqfile'];
-    
+
 	// xhr request
 	$headers = apache_request_headers();
 	if ((int)$headers['Content-Length'] == 0){
@@ -14,7 +14,7 @@ if (isset($_GET['qqfile'])){
 	}
 } elseif (isset($_FILES['qqfile'])){
     $fileName = basename($_FILES['qqfile']['name']);
-    
+
 	// form request
 	if ($_FILES['qqfile']['size'] == 0){
 		die ('{error: "file size is zero"}');
@@ -25,7 +25,7 @@ if (isset($_GET['qqfile'])){
 
 if (count($_GET)){
 	//return query params
-	echo json_encode(array_merge($_GET, array('fileName'=>$fileName)));	
+	echo json_encode(array_merge($_GET, array('fileName'=>$fileName)));
 } else {
 	die ('{error: "query params not passed"}');
 }

From 3cf53a334d3d04df83b35423f31a916eea0ab492 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:32:07 +0000
Subject: [PATCH 187/294] Fix errors in keycloakpassword addon

---
 keycloakpassword/keycloakpassword.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/keycloakpassword/keycloakpassword.php b/keycloakpassword/keycloakpassword.php
index bfff4ea4..e9809f86 100644
--- a/keycloakpassword/keycloakpassword.php
+++ b/keycloakpassword/keycloakpassword.php
@@ -6,7 +6,6 @@
  * Author: Ryan <https://verya.pe/profile/ryan>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -92,7 +91,7 @@ function keycloakpassword_authenticate(array &$b)
 			$client_id,
 			$secret,
 			$endpoint . '/logout',
-			[ 'refresh_token' => res['refresh_token'] ]
+			[ 'refresh_token' => $res['refresh_token'] ]
 		);
 	}
 }

From a53d5ae29b1ec11d4063d636ec6c27074855576b Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:35:19 +0000
Subject: [PATCH 188/294] Fix errors in langfilter addon

---
 langfilter/langfilter.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php
index e5efa8fb..2bf986f0 100644
--- a/langfilter/langfilter.php
+++ b/langfilter/langfilter.php
@@ -7,7 +7,6 @@
  * License: MIT
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
@@ -148,6 +147,8 @@ function langfilter_prepare_body_content_filter(&$hook_data)
 
 	$iso639 = new Matriphe\ISO639\ISO639;
 
+	$confidence = null;
+
 	// Extract the language of the post
 	if (!empty($hook_data['item']['language'])) {
 		$languages = json_decode($hook_data['item']['language'], true);

From ee1a917612fb1c014eecce9d37b7dbcfa166aaa9 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:37:58 +0000
Subject: [PATCH 189/294] Fix errors in leistungsschutzrecht addon

---
 leistungsschutzrecht/leistungsschutzrecht.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/leistungsschutzrecht/leistungsschutzrecht.php b/leistungsschutzrecht/leistungsschutzrecht.php
index f6c65399..ec8091ac 100644
--- a/leistungsschutzrecht/leistungsschutzrecht.php
+++ b/leistungsschutzrecht/leistungsschutzrecht.php
@@ -6,7 +6,6 @@
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\DI;
@@ -149,7 +148,7 @@ function leistungsschutzrecht_is_member_site(string $url): bool
 	$cleanedurlpart = explode('%', $urldata['host']);
 
 	$hostname = explode('.', $cleanedurlpart[0]);
-	if (empty($hostname)) {
+	if ($hostname === false || $hostname === '') {
 		return false;
 	}
 

From d08a280ba6d51ea1671b62a65ee72f221f83106c Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:41:11 +0000
Subject: [PATCH 190/294] Fix errors in libravatar addon

---
 libravatar/Services/Libravatar.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libravatar/Services/Libravatar.php b/libravatar/Services/Libravatar.php
index 70fcfe39..e51ef070 100644
--- a/libravatar/Services/Libravatar.php
+++ b/libravatar/Services/Libravatar.php
@@ -401,9 +401,8 @@ class Services_Libravatar
      */
     protected function srvGet($domain, $https = false)
     {
-
         // Are we going secure? Set up a fallback too.
-        if (isset($https) && $https === true) {
+        if ($https === true) {
             $subdomain = '_avatars-sec._tcp.';
             $fallback  = 'seccdn.';
         } else {
@@ -426,6 +425,7 @@ class Services_Libravatar
 
         $top = $srv[0];
         $sum = 0;
+        $pri = [];
 
         // Try to adhere to RFC2782's weighting algorithm, page 3
         // "arrange all SRV RRs (that have not been ordered yet) in any order,

From 984e7c5e5d133ab4305c766a924d2517a03bbd2c Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:42:40 +0000
Subject: [PATCH 191/294] Fix errors in ljpost addon

---
 ljpost/ljpost.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index 7acc6589..b416c605 100644
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -8,7 +8,6 @@
  * Author: Cat Gray <https://free-haven.org/profile/catness>
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
@@ -203,10 +202,12 @@ EOT;
 
 		Logger::debug('ljpost: data: ' . $xml);
 
+		$x = '';
+
 		if ($lj_blog !== 'test') {
 			$x = DI::httpClient()->post($lj_blog, $xml, ['Content-Type' => 'text/xml'])->getBodyString();
 		}
 
-		Logger::info('posted to livejournal: ' . ($x) ? $x : '');
+		Logger::info('posted to livejournal: ' . $x);
 	}
 }

From 6b1b043dd8fc48511f9288249cd18322b8a709b4 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:48:49 +0000
Subject: [PATCH 192/294] fix errors in mailstream addon

---
 mailstream/phpmailer/class.phpmailer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mailstream/phpmailer/class.phpmailer.php b/mailstream/phpmailer/class.phpmailer.php
index ff3d81e3..dcf02361 100644
--- a/mailstream/phpmailer/class.phpmailer.php
+++ b/mailstream/phpmailer/class.phpmailer.php
@@ -3287,7 +3287,7 @@ class PHPMailer
         $result = 'localhost.localdomain';
         if (!empty($this->Hostname)) {
             $result = $this->Hostname;
-        } elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
+        } elseif (array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
             $result = $_SERVER['SERVER_NAME'];
         } elseif (function_exists('gethostname') && gethostname() !== false) {
             $result = gethostname();

From c0971779c6091f0d3621c38df30d77f4f1b7e021 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:50:06 +0000
Subject: [PATCH 193/294] Fix errors in nsfw addon

---
 nsfw/nsfw.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index 4a54d899..674fc201 100644
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -8,7 +8,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
@@ -119,7 +118,9 @@ function nsfw_prepare_body_content_filter(&$hook_data)
 		$word_list = ['nsfw'];
 	}
 
-	$found = false;
+	$found      = false;
+	$tag_search = false;
+
 	if (count($word_list)) {
 		$body = $hook_data['item']['title'] . "\n" . nsfw_extract_photos($hook_data['item']['body']);
 
@@ -129,7 +130,6 @@ function nsfw_prepare_body_content_filter(&$hook_data)
 				continue;
 			}
 
-			$tag_search = false;
 			switch ($word[0]) {
 				case '/'; // Regular expression
 					$found = @preg_match($word, $body);

From 7fa2dfc608d9ac30253ac257c020dfda3061ec8b Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 19:51:18 +0000
Subject: [PATCH 194/294] Fix errors in pnut addon

---
 pnut/lib/phpnut.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pnut/lib/phpnut.php b/pnut/lib/phpnut.php
index 5794d795..89d5e5f8 100644
--- a/pnut/lib/phpnut.php
+++ b/pnut/lib/phpnut.php
@@ -1339,6 +1339,8 @@ class phpnut
      */
     protected function updateUserImage(string $image, string $which='avatar')
     {
+        $mimeType = '';
+
         $test = @getimagesize($image);
         if ($test && array_key_exists('mime', $test)) {
             $mimeType = $test['mime'];

From bda683c56b1800d1c2b3847e44074d554ac34c4b Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 20:12:23 +0000
Subject: [PATCH 195/294] fix errors in pumpio addon

---
 pumpio/pumpio.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 5e053d7c..d7c2ac32 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -6,7 +6,6 @@
  * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
@@ -582,6 +581,8 @@ function pumpio_action(int $uid, string $uri, string $action, string $content =
 		$uri = $orig_post['uri'];
 	}
 
+	$objectType = '';
+
 	if (($orig_post['object-type'] != '') && (strstr($orig_post['object-type'], ActivityNamespace::ACTIVITY_SCHEMA))) {
 		$objectType = str_replace(ActivityNamespace::ACTIVITY_SCHEMA, '', $orig_post['object-type']);
 	} elseif (strstr($uri, '/api/comment/')) {
@@ -827,6 +828,7 @@ function pumpio_dounlike(int $uid, array $self, $post, string $own_id)
 	}
 
 	$contactid = 0;
+	$contact   = [];
 
 	if (Strings::compareLink($post->actor->url, $own_id)) {
 		$contactid = $self['id'];
@@ -1430,6 +1432,8 @@ function pumpio_fetchallcomments($uid, $id)
 
 	Logger::notice('pumpio_fetchallcomments: fetching comment for user ' . $uid . ', URL ' . $url);
 
+	$item = new \stdClass();
+
 	if (pumpio_reachable($url)) {
 		$success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError' => true], $item);
 	} else {

From 5b623c83686b1ac4ac72d15f2072cb380b872ee2 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 20:13:41 +0000
Subject: [PATCH 196/294] fix errors in ratioed addon

---
 ratioed/RatioedPanel.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ratioed/RatioedPanel.php b/ratioed/RatioedPanel.php
index e25c7f34..bd9b44dc 100644
--- a/ratioed/RatioedPanel.php
+++ b/ratioed/RatioedPanel.php
@@ -26,6 +26,7 @@ class RatioedPanel extends Active
 
 		$action = $this->parameters['action'] ?? '';
 		$uid	= $this->parameters['uid']	?? 0;
+		$user   = [];
 
 		if ($uid) {
 			$user = User::getById($uid, ['username', 'blocked']);

From 8e778593ca014916297ad234587f5cbfb426f4f2 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 20:27:57 +0000
Subject: [PATCH 197/294] fix errors in statusnet addon

---
 statusnet/library/codebirdsn.php | 13 +++++++------
 statusnet/statusnet.php          |  2 ++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/statusnet/library/codebirdsn.php b/statusnet/library/codebirdsn.php
index 325bcb07..91e256be 100644
--- a/statusnet/library/codebirdsn.php
+++ b/statusnet/library/codebirdsn.php
@@ -31,11 +31,10 @@ use Friendica\Core\System;
 /**
  * Define constants
  */
-$constants = explode(' ', 'OBJECT ARRAY JSON');
-foreach ($constants as $i => $id) {
-    $id = 'CODEBIRD_RETURNFORMAT_' . $id;
-    defined($id) or define($id, $i);
-}
+defined('CODEBIRD_RETURNFORMAT_ARRAY') or define('CODEBIRD_RETURNFORMAT_ARRAY', 0);
+defined('CODEBIRD_RETURNFORMAT_JSON') or define('CODEBIRD_RETURNFORMAT_JSON', 1);
+defined('CODEBIRD_RETURNFORMAT_OBJECT') or define('CODEBIRD_RETURNFORMAT_OBJECT', 2);
+
 $constants = array(
     'CURLE_SSL_CERTPROBLEM' => 58,
     'CURLE_SSL_CACERT' => 60,
@@ -788,6 +787,8 @@ class CodebirdSN
 
         $possible_files = explode(' ', $possible_files[$method]);
 
+        $data = '';
+
         $multipart_border = '--------------------' . $this->_nonce();
         $multipart_request = '';
         foreach ($params as $key => $value) {
@@ -917,7 +918,7 @@ class CodebirdSN
             $authorization = 'Authorization: Bearer ' . self::$_oauth_bearer_token;
         }
         $request_headers = array();
-        if (isset($authorization)) {
+        if ($authorization !== '') {
             $request_headers[] = $authorization;
             $request_headers[] = 'Expect:';
         }
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 4bc32050..48f9c254 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -366,6 +366,8 @@ function statusnet_post_hook(array &$b)
 	$otoken  = DI::pConfig()->get($b['uid'], 'statusnet', 'oauthtoken');
 	$osecret = DI::pConfig()->get($b['uid'], 'statusnet', 'oauthsecret');
 
+	$iscomment = null;
+
 	if ($ckey && $csecret && $otoken && $osecret) {
 		$dent = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
 		$max_char = $dent->get_maxlength(); // max. length for a dent

From 2f89827deaa09de0cf8bf2a803645441f424cd9a Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 20:36:07 +0000
Subject: [PATCH 198/294] fix errors in tictac addon

---
 tictac/tictac.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tictac/tictac.php b/tictac/tictac.php
index 10103835..082b58c1 100644
--- a/tictac/tictac.php
+++ b/tictac/tictac.php
@@ -7,7 +7,6 @@
  * Status: unsupported
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
@@ -30,7 +29,12 @@ function tictac_module() {}
 
 function tictac_content() {
 
-	$o = '';
+  $o        = '';
+  $dimen    = 3;
+  $handicap = 0;
+  $mefirst  = 0;
+  $yours    = '';
+  $mine     = '';
 
   if($_POST['move']) {
     $handicap = DI::args()->get(1);
@@ -45,9 +49,6 @@ function tictac_content() {
     $handicap = DI::args()->get(1);
     $dimen = 3;
   }
-  else {
-   $dimen = 3;
-  }
 
   $o .=  '<h3>' . DI::l10n()->t('3D Tic-Tac-Toe') . '</h3><br />';
 
@@ -163,7 +164,7 @@ class tictac {
   ];
 
   function __construct($dimen, $handicap, $mefirst, $yours, $mine) {
-    $this->dimen = 3;
+    $this->dimen = $dimen;
     $this->handicap = $handicap ? 1 : 0;
     $this->mefirst = $mefirst ? 1 : 0;
     $this->yours = str_replace('XXX','',$yours);
@@ -228,6 +229,8 @@ class tictac {
   }
 
   function parse_moves($player) {
+    $str = '';
+
     if($player == 'me')
       $str = $this->mine;
     if($player == 'you')

From a71db771d9473852786cc7435e9b1178b842880f Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Sat, 30 Nov 2024 20:36:58 +0000
Subject: [PATCH 199/294] Fix errors in wppost addon

---
 wppost/wppost.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/wppost/wppost.php b/wppost/wppost.php
index dba738de..f2ee5d21 100644
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -259,9 +259,11 @@ EOT;
 
 		Logger::debug('wppost: data: ' . $xml);
 
+		$x = '';
+
 		if ($wp_blog !== 'test') {
 			$x = DI::httpClient()->post($wp_blog, $xml)->getBodyString();
 		}
-		Logger::info('posted to wordpress: ' . (($x) ? $x : ''));
+		Logger::info('posted to wordpress: ' . $x);
 	}
 }

From 729b6e52107dd1f3ce870b2fa45b7a8e1f60cc4d Mon Sep 17 00:00:00 2001
From: Artur Weigandt <Art4@users.noreply.github.com>
Date: Thu, 5 Dec 2024 18:23:51 +0100
Subject: [PATCH 200/294] Update mailstream/phpmailer/class.phpmailer.php

Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
---
 mailstream/phpmailer/class.phpmailer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mailstream/phpmailer/class.phpmailer.php b/mailstream/phpmailer/class.phpmailer.php
index dcf02361..1d9df9af 100644
--- a/mailstream/phpmailer/class.phpmailer.php
+++ b/mailstream/phpmailer/class.phpmailer.php
@@ -3287,7 +3287,7 @@ class PHPMailer
         $result = 'localhost.localdomain';
         if (!empty($this->Hostname)) {
             $result = $this->Hostname;
-        } elseif (array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
+        } elseif (!empty($_SERVER['SERVER_NAME'])) {
             $result = $_SERVER['SERVER_NAME'];
         } elseif (function_exists('gethostname') && gethostname() !== false) {
             $result = gethostname();

From 3719d1eee5d67424e9bb144a47fe06ba5e87d2a0 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 6 Dec 2024 06:46:36 +0000
Subject: [PATCH 201/294] Set extid via guid, nit via id

---
 bluesky/bluesky.php | 4 ++--
 tumblr/tumblr.php   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index dfd7fe06..26ecb967 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -715,7 +715,7 @@ function bluesky_create_activity(array $item, stdClass $parent = null)
 	}
 	Logger::debug('Activity done', ['return' => $activity]);
 	$uri = bluesky_get_uri($activity);
-	Item::update(['extid' => $uri], ['id' => $item['id']]);
+	Item::update(['extid' => $uri], ['guid' => $item['guid']]);
 	Logger::debug('Set extid', ['id' => $item['id'], 'extid' => $activity]);
 }
 
@@ -806,7 +806,7 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
 		}
 		if (($key == 0) && ($item['gravity'] != Item::GRAVITY_PARENT)) {
 			$uri = bluesky_get_uri($parent);
-			Item::update(['extid' => $uri], ['id' => $item['id']]);
+			Item::update(['extid' => $uri], ['guid' => $item['guid']]);
 			Logger::debug('Set extid', ['id' => $item['id'], 'extid' => $uri]);
 		}
 	}
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 1e9f5c7f..ecd6f862 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -564,7 +564,7 @@ function tumblr_send(array &$b)
 			if ($result->meta->status < 400) {
 				Logger::info('Successfully performed activity', ['verb' => $b['verb'], 'deleted' => $b['deleted'], 'meta' => $result->meta, 'response' => $result->response]);
 				if (!$b['deleted'] && !empty($result->response->id_string)) {
-					Item::update(['extid' => 'tumblr::' . $result->response->id_string], ['id' => $b['id']]);
+					Item::update(['extid' => 'tumblr::' . $result->response->id_string], ['guid' => $b['guid']]);
 				}
 			} else {
 				Logger::notice('Error while performing activity', ['verb' => $b['verb'], 'deleted' => $b['deleted'], 'meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'params' => $params]);

From f29908464b87916948ce3e6763c01195290b624f Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 12 Dec 2024 20:20:44 +0000
Subject: [PATCH 202/294] Bluesky: Fix token problems

---
 bluesky/bluesky.php | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 26ecb967..6451f3fa 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -416,7 +416,7 @@ function bluesky_get_status(string $handle = null, string $did = null, string $p
 
 	switch ($status) {
 		case BLUEKSY_STATUS_TOKEN_OK:
-			return DI::l10n()->t("You are authenticated to Bluesky. For security reasons the password isn't stored.");
+			return DI::l10n()->t("You are authenticated to Bluesky.");
 		case BLUEKSY_STATUS_SUCCESS:
 			return DI::l10n()->t('The communication with the personal data server service (PDS) is established.');
 		case BLUEKSY_STATUS_API_FAIL;
@@ -447,6 +447,7 @@ function bluesky_settings_post(array &$b)
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'post',             intval($_POST['bluesky']));
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default',  intval($_POST['bluesky_bydefault']));
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'handle',           $handle);
+	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'password',         $_POST['bluesky_password']);
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'import',           intval($_POST['bluesky_import']));
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'import_feeds',     intval($_POST['bluesky_import_feeds']));
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'complete_threads', intval($_POST['bluesky_complete_threads']));
@@ -466,6 +467,7 @@ function bluesky_settings_post(array &$b)
 	} else {
 		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'bluesky', 'did');
 		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'bluesky', 'pds');
+		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'bluesky', 'password');
 		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'bluesky', 'access_token');
 		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'bluesky', 'refresh_token');
 		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'bluesky', 'token_created');
@@ -2108,6 +2110,11 @@ function bluesky_refresh_token(int $uid): string
 
 	$data = bluesky_post($uid, '/xrpc/com.atproto.server.refreshSession', '', ['Authorization' => ['Bearer ' . $token]]);
 	if (empty($data) || empty($data->accessJwt)) {
+		Logger::debug('Refresh failed', ['return' => $data]);
+		$password = DI::pConfig()->get($uid, 'bluesky', 'password');
+		if (!empty($password)) {
+			return bluesky_create_token($uid, $password);
+		}
 		DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_TOKEN_FAIL);
 		return '';
 	}
@@ -2174,7 +2181,11 @@ function bluesky_post(int $uid, string $url, string $params, array $headers): ?s
 		$data->code = $curlResult->getReturnCode();
 	}
 
-	DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_SUCCESS);
+	if (!empty($data->code) && ($data->code >= 200) && ($data->code < 400)) {
+		DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_SUCCESS);
+	} else {
+		DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_API_FAIL);
+	}
 	return $data;
 }
 
@@ -2197,7 +2208,9 @@ function bluesky_xrpc_get(int $uid, string $url, array $parameters = []): ?stdCl
 	}
 
 	$data = bluesky_get($pds . '/xrpc/' . $url, HttpClientAccept::JSON, [HttpClientOptions::HEADERS => $headers]);
-	DI::pConfig()->set($uid, 'bluesky', 'status', is_null($data) ? BLUEKSY_STATUS_API_FAIL : BLUEKSY_STATUS_SUCCESS);
+	if ($uid != 0) {
+		DI::pConfig()->set($uid, 'bluesky', 'status', is_null($data) ? BLUEKSY_STATUS_API_FAIL : BLUEKSY_STATUS_SUCCESS);
+	}
 	return $data;
 }
 

From 52b18c7d9a7df1dcd6adb1f1d4d25fa0653c76cc Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 14 Dec 2024 19:03:15 +0000
Subject: [PATCH 203/294] Bluesky: Functionality moved to the core

---
 bluesky/bluesky.php | 1267 ++++---------------------------------------
 1 file changed, 91 insertions(+), 1176 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 6451f3fa..c9c7dc67 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -26,7 +26,6 @@
  */
 
 use Friendica\Content\Text\BBCode;
-use Friendica\Content\Text\HTML;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Config\Util\ConfigFileManager;
@@ -39,42 +38,20 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
-use Friendica\Model\GServer;
 use Friendica\Model\Item;
-use Friendica\Model\ItemURI;
 use Friendica\Model\Photo;
 use Friendica\Model\Post;
-use Friendica\Model\Tag;
 use Friendica\Model\User;
-use Friendica\Network\HTTPClient\Client\HttpClientAccept;
-use Friendica\Network\HTTPClient\Client\HttpClientOptions;
-use Friendica\Network\HTTPClient\Client\HttpClientRequest;
 use Friendica\Object\Image;
 use Friendica\Protocol\Activity;
+use Friendica\Protocol\ATProtocol;
 use Friendica\Protocol\Relay;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
 const BLUESKY_DEFAULT_POLL_INTERVAL = 10; // given in minutes
 const BLUESKY_IMAGE_SIZE = [1000000, 500000, 100000, 50000];
 
-const BLUEKSY_STATUS_UNKNOWN    = 0;
-const BLUEKSY_STATUS_TOKEN_OK   = 1;
-const BLUEKSY_STATUS_SUCCESS    = 2;
-const BLUEKSY_STATUS_API_FAIL   = 10;
-const BLUEKSY_STATUS_DID_FAIL   = 11;
-const BLUEKSY_STATUS_PDS_FAIL   = 12;
-const BLUEKSY_STATUS_TOKEN_FAIL = 13;
-
-/*
- * (Currently) hard wired paths for Bluesky services
- */
-const BLUESKY_APPVIEW_API = 'https://public.api.bsky.app'; // Path to the public Bluesky AppView API.
-const BLUESKY_DIRECTORY   = 'https://plc.directory';       // Path to the directory server service to fetch the PDS of a given DID
-const BLUESKY_WEB         = 'https://bsky.app';            // Path to the web interface with the user profile and posts
-const BLUESKY_HOSTNAME    = 'bsky.social';                 // Host name to be added to the handle if incomplete
-
 function bluesky_install()
 {
 	Hook::register('load_config',             __FILE__, 'bluesky_load_config');
@@ -86,13 +63,11 @@ function bluesky_install()
 	Hook::register('connector_settings_post', __FILE__, 'bluesky_settings_post');
 	Hook::register('cron',                    __FILE__, 'bluesky_cron');
 	Hook::register('support_follow',          __FILE__, 'bluesky_support_follow');
-	Hook::register('support_probe',           __FILE__, 'bluesky_support_probe');
 	Hook::register('follow',                  __FILE__, 'bluesky_follow');
 	Hook::register('unfollow',                __FILE__, 'bluesky_unfollow');
 	Hook::register('block',                   __FILE__, 'bluesky_block');
 	Hook::register('unblock',                 __FILE__, 'bluesky_unblock');
 	Hook::register('check_item_notification', __FILE__, 'bluesky_check_item_notification');
-	Hook::register('probe_detect',            __FILE__, 'bluesky_probe_detect');
 	Hook::register('item_by_link',            __FILE__, 'bluesky_item_by_link');
 }
 
@@ -107,7 +82,7 @@ function bluesky_check_item_notification(array &$notification_data)
 		return;
 	}
 
-	$did = bluesky_get_user_did($notification_data['uid']);
+	$did = DI::atProtocol()->getUserDid($notification_data['uid']);
 	if (empty($did)) {
 		return;
 	}
@@ -115,61 +90,6 @@ function bluesky_check_item_notification(array &$notification_data)
 	$notification_data['profiles'][] = $did;
 }
 
-function bluesky_probe_detect(array &$hookData)
-{
-	// Don't overwrite an existing result
-	if (isset($hookData['result'])) {
-		return;
-	}
-
-	// Avoid a lookup for the wrong network
-	if (!in_array($hookData['network'], ['', Protocol::BLUESKY])) {
-		return;
-	}
-
-	$pconfig = DBA::selectFirst('pconfig', ['uid'], ["`cat` = ? AND `k` = ? AND `v` != ?", 'bluesky', 'access_token', '']);
-	if (empty($pconfig['uid'])) {
-		return;
-	}
-
-	if (parse_url($hookData['uri'], PHP_URL_SCHEME) == 'did') {
-		$did = $hookData['uri'];
-	} elseif (parse_url($hookData['uri'], PHP_URL_PATH) == $hookData['uri'] && strpos($hookData['uri'], '@') === false) {
-		$did = bluesky_get_did($hookData['uri'], $pconfig['uid']);
-		if (empty($did)) {
-			return;
-		}
-	} elseif (Network::isValidHttpUrl($hookData['uri'])) {
-		$did = bluesky_get_did_by_profile($hookData['uri'], $pconfig['uid']);
-		if (empty($did)) {
-			return;
-		}
-	} else {
-		return;
-	}
-
-	$token = bluesky_get_token($pconfig['uid']);
-	if (empty($token)) {
-		return;
-	}
-
-	$data = bluesky_xrpc_get($pconfig['uid'], 'app.bsky.actor.getProfile', ['actor' => $did]);
-	if (empty($data) || empty($data->did)) {
-		return;
-	}
-
-	$hookData['result'] = bluesky_get_contact_fields($data, 0, $pconfig['uid'], true);
-
-	// Preparing probe data. This differs slightly from the contact array
-	$hookData['result']['photo']    = $data->avatar ?? '';
-	$hookData['result']['batch']    = '';
-	$hookData['result']['notify']   = '';
-	$hookData['result']['poll']     = '';
-	$hookData['result']['poco']     = '';
-	$hookData['result']['priority'] = 0;
-	$hookData['result']['guid']     = '';
-}
-
 function bluesky_item_by_link(array &$hookData)
 {
 	// Don't overwrite an existing result
@@ -177,16 +97,17 @@ function bluesky_item_by_link(array &$hookData)
 		return;
 	}
 
-	$token = bluesky_get_token($hookData['uid']);
+	$token = DI::atProtocol()->getUserToken($hookData['uid']);
 	if (empty($token)) {
 		return;
 	}
 
-	if (!preg_match('#^' . BLUESKY_WEB . '/profile/(.+)/post/(.+)#', $hookData['uri'], $matches)) {
+	// @todo also support the URI format (at://did/app.bsky.feed.post/cid)
+	if (!preg_match('#^' . ATProtocol::WEB . '/profile/(.+)/post/(.+)#', $hookData['uri'], $matches)) {
 		return;
 	}
 
-	$did = bluesky_get_did($matches[1], $hookData['uid']);
+	$did = DI::atProtocol()->getDid($matches[1]);
 	if (empty($did)) {
 		return;
 	}
@@ -195,7 +116,7 @@ function bluesky_item_by_link(array &$hookData)
 
 	$uri = 'at://' . $did . '/app.bsky.feed.post/' . $matches[2];
 
-	$uri = bluesky_fetch_missing_post($uri, $hookData['uid'], $hookData['uid'], Item::PR_FETCHED, 0, 0, 0);
+	$uri = DI::atpProcessor()->fetchMissingPost($uri, $hookData['uid'], Item::PR_FETCHED, 0, 0);
 	Logger::debug('Got post', ['did' => $did, 'cid' => $matches[2], 'result' => $uri]);
 	if (!empty($uri)) {
 		$item = Post::selectFirst(['id'], ['uri' => $uri, 'uid' => $hookData['uid']]);
@@ -212,16 +133,9 @@ function bluesky_support_follow(array &$data)
 	}
 }
 
-function bluesky_support_probe(array &$data)
-{
-	if ($data['protocol'] == Protocol::BLUESKY) {
-		$data['result'] = true;
-	}
-}
-
 function bluesky_follow(array &$hook_data)
 {
-	$token = bluesky_get_token($hook_data['uid']);
+	$token = DI::atProtocol()->getUserToken($hook_data['uid']);
 	if (empty($token)) {
 		return;
 	}
@@ -240,11 +154,11 @@ function bluesky_follow(array &$hook_data)
 
 	$post = [
 		'collection' => 'app.bsky.graph.follow',
-		'repo'       => bluesky_get_user_did($hook_data['uid']),
+		'repo'       => DI::atProtocol()->getUserDid($hook_data['uid']),
 		'record'     => $record
 	];
 
-	$activity = bluesky_xrpc_post($hook_data['uid'], 'com.atproto.repo.createRecord', $post);
+	$activity = DI::atProtocol()->XRPCPost($hook_data['uid'], 'com.atproto.repo.createRecord', $post);
 	if (!empty($activity->uri)) {
 		$hook_data['contact'] = $contact;
 		Logger::debug('Successfully start following', ['url' => $contact['url'], 'uri' => $activity->uri]);
@@ -253,7 +167,7 @@ function bluesky_follow(array &$hook_data)
 
 function bluesky_unfollow(array &$hook_data)
 {
-	$token = bluesky_get_token($hook_data['uid']);
+	$token = DI::atProtocol()->getUserToken($hook_data['uid']);
 	if (empty($token)) {
 		return;
 	}
@@ -262,7 +176,7 @@ function bluesky_unfollow(array &$hook_data)
 		return;
 	}
 
-	$data = bluesky_xrpc_get($hook_data['uid'], 'app.bsky.actor.getProfile', ['actor' => $hook_data['contact']['url']]);
+	$data = DI::atProtocol()->XRPCGet('app.bsky.actor.getProfile', ['actor' => $hook_data['contact']['url']], $hook_data['uid']);
 	if (empty($data->viewer) || empty($data->viewer->following)) {
 		return;
 	}
@@ -274,7 +188,7 @@ function bluesky_unfollow(array &$hook_data)
 
 function bluesky_block(array &$hook_data)
 {
-	$token = bluesky_get_token($hook_data['uid']);
+	$token = DI::atProtocol()->getUserToken($hook_data['uid']);
 	if (empty($token)) {
 		return;
 	}
@@ -291,11 +205,11 @@ function bluesky_block(array &$hook_data)
 
 	$post = [
 		'collection' => 'app.bsky.graph.block',
-		'repo'       => bluesky_get_user_did($hook_data['uid']),
+		'repo'       => DI::atProtocol()->getUserDid($hook_data['uid']),
 		'record'     => $record
 	];
 
-	$activity = bluesky_xrpc_post($hook_data['uid'], 'com.atproto.repo.createRecord', $post);
+	$activity = DI::atProtocol()->XRPCPost($hook_data['uid'], 'com.atproto.repo.createRecord', $post);
 	if (!empty($activity->uri)) {
 		$ucid = Contact::getUserContactId($hook_data['contact']['id'], $hook_data['uid']);
 		if ($ucid) {
@@ -307,7 +221,7 @@ function bluesky_block(array &$hook_data)
 
 function bluesky_unblock(array &$hook_data)
 {
-	$token = bluesky_get_token($hook_data['uid']);
+	$token = DI::atProtocol()->getUserToken($hook_data['uid']);
 	if (empty($token)) {
 		return;
 	}
@@ -316,7 +230,7 @@ function bluesky_unblock(array &$hook_data)
 		return;
 	}
 
-	$data = bluesky_xrpc_get($hook_data['uid'], 'app.bsky.actor.getProfile', ['actor' => $hook_data['contact']['url']]);
+	$data = DI::atProtocol()->XRPCGet('app.bsky.actor.getProfile', ['actor' => $hook_data['contact']['url']], $hook_data['uid']);
 	if (empty($data->viewer) || empty($data->viewer->blocking)) {
 		return;
 	}
@@ -351,7 +265,7 @@ function bluesky_settings(array &$data)
 	$def_enabled      = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default') ?? false;
 	$pds              = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'pds');
 	$handle           = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'handle');
-	$did              = bluesky_get_user_did(DI::userSession()->getLocalUserId());
+	$did              = DI::atProtocol()->getUserDid(DI::userSession()->getLocalUserId());
 	$token            = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'access_token');
 	$import           = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'import') ?? false;
 	$import_feeds     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'import_feeds') ?? false;
@@ -399,33 +313,33 @@ function bluesky_get_status(string $handle = null, string $did = null, string $p
 		return DI::l10n()->t('You are not authenticated. Please enter your handle and the app password.');
 	}
 
-	$status = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'status') ?? BLUEKSY_STATUS_UNKNOWN;
+	$status = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'status') ?? ATProtocol::STATUS_UNKNOWN;
 
 	// Fallback mechanism for connection that had been established before the introduction of the status
-	if ($status == BLUEKSY_STATUS_UNKNOWN) {
+	if ($status == ATProtocol::STATUS_UNKNOWN) {
 		if (empty($did)) {
-			$status = BLUEKSY_STATUS_DID_FAIL;
+			$status = ATProtocol::STATUS_DID_FAIL;
 		} elseif (empty($pds)) {
-			$status = BLUEKSY_STATUS_PDS_FAIL;
+			$status = ATProtocol::STATUS_PDS_FAIL;
 		} elseif (!empty($token)) {
-			$status = BLUEKSY_STATUS_TOKEN_OK;
+			$status = ATProtocol::STATUS_TOKEN_OK;
 		} else {
-			$status = BLUEKSY_STATUS_TOKEN_FAIL;
+			$status = ATProtocol::STATUS_TOKEN_FAIL;
 		}
 	}
 
 	switch ($status) {
-		case BLUEKSY_STATUS_TOKEN_OK:
+		case ATProtocol::STATUS_TOKEN_OK:
 			return DI::l10n()->t("You are authenticated to Bluesky.");
-		case BLUEKSY_STATUS_SUCCESS:
+		case ATProtocol::STATUS_SUCCESS:
 			return DI::l10n()->t('The communication with the personal data server service (PDS) is established.');
-		case BLUEKSY_STATUS_API_FAIL;
+		case ATProtocol::STATUS_API_FAIL;
 			return DI::l10n()->t('Communication issues with the personal data server service (PDS).');
-		case BLUEKSY_STATUS_DID_FAIL:
+		case ATProtocol::STATUS_DID_FAIL:
 			return DI::l10n()->t('The DID for the provided handle could not be detected. Please check if you entered the correct handle.');
-		case BLUEKSY_STATUS_PDS_FAIL:
+		case ATProtocol::STATUS_PDS_FAIL:
 			return DI::l10n()->t('The personal data server service (PDS) could not be detected.');
-		case BLUEKSY_STATUS_TOKEN_FAIL:
+		case ATProtocol::STATUS_TOKEN_FAIL:
 			return DI::l10n()->t('The authentication with the provided handle and password failed. Please check if you entered the correct password.');
 		default:
 			return '';
@@ -454,11 +368,11 @@ function bluesky_settings_post(array &$b)
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'friendica_handle', intval($_POST['bluesky_friendica_handle'] ?? false));
 
 	if (!empty($handle)) {
-		$did = bluesky_get_user_did(DI::userSession()->getLocalUserId(), empty($old_did) || $old_handle != $handle);
+		$did = DI::atProtocol()->getUserDid(DI::userSession()->getLocalUserId(), empty($old_did) || $old_handle != $handle);
 		if (!empty($did) && (empty($old_pds) || $old_handle != $handle)) {
-			$pds = bluesky_get_pds($did);
+			$pds = DI::atProtocol()->getPdsOfDid($did);
 			if (empty($pds)) {
-				DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'status', BLUEKSY_STATUS_PDS_FAIL);
+				DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'status', ATProtocol::STATUS_PDS_FAIL);
 			}
 			DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'pds', $pds);
 		} else {
@@ -475,7 +389,7 @@ function bluesky_settings_post(array &$b)
 	}
 
 	if (!empty($did) && !empty($pds) && !empty($_POST['bluesky_password'])) {
-		bluesky_create_token(DI::userSession()->getLocalUserId(), $_POST['bluesky_password']);
+		DI::atProtocol()->createUserToken(DI::userSession()->getLocalUserId(), $_POST['bluesky_password']);
 	}
 }
 
@@ -524,7 +438,7 @@ function bluesky_cron()
 
 	$pconfigs = DBA::selectToArray('pconfig', [], ["`cat` = ? AND `k` IN (?, ?) AND `v`", 'bluesky', 'import', 'import_feeds']);
 	foreach ($pconfigs as $pconfig) {
-		if (empty(bluesky_get_user_did($pconfig['uid']))) {
+		if (empty(DI::atProtocol()->getUserDid($pconfig['uid']))) {
 			Logger::debug('User has got no valid DID', ['uid' => $pconfig['uid']]);
 			continue;
 		}
@@ -538,7 +452,13 @@ function bluesky_cron()
 
 		// Refresh the token now, so that it doesn't need to be refreshed in parallel by the following workers
 		Logger::debug('Refresh the token', ['uid' => $pconfig['uid']]);
-		bluesky_get_token($pconfig['uid']);
+		DI::atProtocol()->getUserToken($pconfig['uid']);
+
+		$last_sync = DI::pConfig()->get($pconfig['uid'], 'bluesky', 'last_contact_sync');
+		if ($last_sync < (time() - 86400)) {
+			DI::atpActor()->syncContacts($pconfig['uid']);
+			DI::pConfig()->set($pconfig['uid'], 'bluesky', 'last_contact_sync', time());
+		}
 
 		Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_notifications.php', $pconfig['uid']);
 		if (DI::pConfig()->get($pconfig['uid'], 'bluesky', 'import')) {
@@ -640,7 +560,7 @@ function bluesky_send(array &$b)
 		Logger::debug('Got comment', ['item' => $b]);
 
 		if ($b['deleted']) {
-			$uri = bluesky_get_uri_class($b['uri']);
+			$uri = DI::atpProcessor()->getUriClass($b['uri']);
 			if (empty($uri)) {
 				Logger::debug('Not a bluesky post', ['uri' => $b['uri']]);
 				return;
@@ -649,8 +569,8 @@ function bluesky_send(array &$b)
 			return;
 		}
 
-		$root   = bluesky_get_uri_class($b['parent-uri']);
-		$parent = bluesky_get_uri_class($b['thr-parent']);
+		$root   = DI::atpProcessor()->getUriClass($b['parent-uri']);
+		$parent = DI::atpProcessor()->getUriClass($b['thr-parent']);
 
 		if (empty($root) || empty($parent)) {
 			Logger::debug('No bluesky post', ['parent' => $b['parent'], 'thr-parent' => $b['thr-parent']]);
@@ -675,12 +595,12 @@ function bluesky_send(array &$b)
 function bluesky_create_activity(array $item, stdClass $parent = null)
 {
 	$uid = $item['uid'];
-	$token = bluesky_get_token($uid);
+	$token = DI::atProtocol()->getUserToken($uid);
 	if (empty($token)) {
 		return;
 	}
 
-	$did = bluesky_get_user_did($uid);
+	$did = DI::atProtocol()->getUserDid($uid);
 	if (empty($did)) {
 		return;
 	}
@@ -711,12 +631,12 @@ function bluesky_create_activity(array $item, stdClass $parent = null)
 		];
 	}
 
-	$activity = bluesky_xrpc_post($uid, 'com.atproto.repo.createRecord', $post);
+	$activity = DI::atProtocol()->XRPCPost($uid, 'com.atproto.repo.createRecord', $post);
 	if (empty($activity->uri)) {
 		return;
 	}
 	Logger::debug('Activity done', ['return' => $activity]);
-	$uri = bluesky_get_uri($activity);
+	$uri = DI::atpProcessor()->getUri($activity);
 	Item::update(['extid' => $uri], ['guid' => $item['guid']]);
 	Logger::debug('Set extid', ['id' => $item['id'], 'extid' => $activity]);
 }
@@ -724,7 +644,7 @@ function bluesky_create_activity(array $item, stdClass $parent = null)
 function bluesky_create_post(array $item, stdClass $root = null, stdClass $parent = null)
 {
 	$uid = $item['uid'];
-	$token = bluesky_get_token($uid);
+	$token = DI::atProtocol()->getUserToken($uid);
 	if (empty($token)) {
 		return;
 	}
@@ -791,11 +711,11 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
 
 		$post = [
 			'collection' => 'app.bsky.feed.post',
-			'repo'       => bluesky_get_user_did($uid),
+			'repo'       => DI::atProtocol()->getUserDid($uid),
 			'record'     => $record
 		];
 
-		$parent = bluesky_xrpc_post($uid, 'com.atproto.repo.createRecord', $post);
+		$parent = DI::atProtocol()->XRPCPost($uid, 'com.atproto.repo.createRecord', $post);
 		if (empty($parent->uri)) {
 			if ($part == 0) {
 				Worker::defer();
@@ -807,7 +727,7 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
 			$root = $parent;
 		}
 		if (($key == 0) && ($item['gravity'] != Item::GRAVITY_PARENT)) {
-			$uri = bluesky_get_uri($parent);
+			$uri = DI::atpProcessor()->getUri($parent);
 			Item::update(['extid' => $uri], ['guid' => $item['guid']]);
 			Logger::debug('Set extid', ['id' => $item['id'], 'extid' => $uri]);
 		}
@@ -973,7 +893,7 @@ function bluesky_upload_blob(int $uid, array $photo): ?stdClass
 
 	Logger::info('Uploading', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
 
-	$data = bluesky_post($uid, '/xrpc/com.atproto.repo.uploadBlob', $content, ['Content-type' => $photo['type'], 'Authorization' => ['Bearer ' . bluesky_get_token($uid)]]);
+	$data = DI::atProtocol()->post($uid, '/xrpc/com.atproto.repo.uploadBlob', $content, ['Content-type' => $photo['type'], 'Authorization' => ['Bearer ' . DI::atProtocol()->getUserToken($uid)]]);
 	if (empty($data) || empty($data->blob)) {
 		Logger::info('Uploading failed', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
 		return null;
@@ -986,18 +906,18 @@ function bluesky_upload_blob(int $uid, array $photo): ?stdClass
 
 function bluesky_delete_post(string $uri, int $uid)
 {
-	$parts = bluesky_get_uri_parts($uri);
+	$parts = DI::atpProcessor()->getUriParts($uri);
 	if (empty($parts)) {
 		Logger::debug('No uri delected', ['uri' => $uri]);
 		return;
 	}
-	bluesky_xrpc_post($uid, 'com.atproto.repo.deleteRecord', $parts);
+	DI::atProtocol()->XRPCPost($uid, 'com.atproto.repo.deleteRecord', $parts);
 	Logger::debug('Deleted', ['parts' => $parts]);
 }
 
 function bluesky_fetch_timeline(int $uid)
 {
-	$data = bluesky_xrpc_get($uid, 'app.bsky.feed.getTimeline');
+	$data = DI::atProtocol()->XRPCGet('app.bsky.feed.getTimeline', [], $uid);
 	if (empty($data)) {
 		return;
 	}
@@ -1006,42 +926,39 @@ function bluesky_fetch_timeline(int $uid)
 		return;
 	}
 
-	$last_post = DBA::selectFirst('post-thread-user', ['received'], ['network' => Protocol::BLUESKY, 'uid' => $uid], ['order' => ['received' => true]]);
-	$last_poll = !empty($last_post['received']) ? strtotime($last_post['received']) : 0;
-
 	foreach (array_reverse($data->feed) as $entry) {
-		$causer = bluesky_get_contact($entry->post->author, 0, $uid);
+		$causer = DI::atpActor()->getContactByDID($entry->post->author->did, $uid, 0, true);
 		if (!empty($entry->reply)) {
 			if (!empty($entry->reply->root)) {
-				bluesky_complete_post($entry->reply->root, $uid, Item::PR_COMMENT, $causer['id'], $last_poll, Conversation::PARCEL_CONNECTOR);
+				bluesky_complete_post($entry->reply->root, $uid, Item::PR_COMMENT, $causer['id'], Conversation::PARCEL_CONNECTOR);
 			}
 			if (!empty($entry->reply->parent)) {
-				bluesky_complete_post($entry->reply->parent, $uid, Item::PR_COMMENT, $causer['id'], $last_poll, Conversation::PARCEL_CONNECTOR);
+				bluesky_complete_post($entry->reply->parent, $uid, Item::PR_COMMENT, $causer['id'], Conversation::PARCEL_CONNECTOR);
 			}
 		}
-		bluesky_process_post($entry->post, $uid, $uid, Item::PR_NONE, 0, 0, $last_poll, Conversation::PARCEL_CONNECTOR);
+		DI::atpProcessor()->processPost($entry->post, $uid, Item::PR_NONE, 0, 0, Conversation::PARCEL_CONNECTOR);
 		if (!empty($entry->reason)) {
-			bluesky_process_reason($entry->reason, bluesky_get_uri($entry->post), $uid);
+			bluesky_process_reason($entry->reason, DI::atpProcessor()->getUri($entry->post), $uid);
 		}
 	}
 }
 
-function bluesky_complete_post(stdClass $post, int $uid, int $post_reason, int $causer, int $last_poll, int $protocol): int
+function bluesky_complete_post(stdClass $post, int $uid, int $post_reason, int $causer, int $protocol): int
 {
 	$complete     = DI::pConfig()->get($uid, 'bluesky', 'complete_threads');
-	$existing_uri = bluesky_fetch_post(bluesky_get_uri($post), $uid);
+	$existing_uri = DI::atpProcessor()->getPostUri(DI::atpProcessor()->getUri($post), $uid);
 	if (!empty($existing_uri)) {
 		$comments = Post::countPosts(['thr-parent' => $existing_uri, 'gravity' => Item::GRAVITY_COMMENT]);
 		if (($post->replyCount <= $comments) || !$complete) {
-			return bluesky_fetch_uri_id($existing_uri, $uid);
+			return DI::atpProcessor()->fetchUriId($existing_uri, $uid);
 		}
 	}
 
 	if ($complete) {
-		$uri = bluesky_fetch_missing_post(bluesky_get_uri($post), $uid, $uid, $post_reason, $causer, 0, $last_poll, '', true);
-		$uri_id = bluesky_fetch_uri_id($uri, $uid);
+		$uri = DI::atpProcessor()->fetchMissingPost(DI::atpProcessor()->getUri($post), $uid, $post_reason, $causer, 0, '', true);
+		$uri_id = DI::atpProcessor()->fetchUriId($uri, $uid);
 	} else {
-		$uri_id = bluesky_process_post($post, $uid, $uid, $post_reason, $causer, 0, $last_poll, $protocol);
+		$uri_id = DI::atpProcessor()->processPost($post, $uid, $post_reason, $causer, 0, $protocol);
 	}
 	return $uri_id;
 }
@@ -1053,7 +970,7 @@ function bluesky_process_reason(stdClass $reason, string $uri, int $uid)
 		return;
 	}
 
-	$contact = bluesky_get_contact($reason->by, $uid, $uid);
+	$contact = DI::atpActor()->getContactByDID($reason->by->did, $uid, 0);
 
 	$item = [
 		'network'       => Protocol::BLUESKY,
@@ -1089,16 +1006,13 @@ function bluesky_process_reason(stdClass $reason, string $uri, int $uid)
 
 function bluesky_fetch_notifications(int $uid)
 {
-	$data = bluesky_xrpc_get($uid, 'app.bsky.notification.listNotifications');
+	$data = DI::atProtocol()->XRPCGet('app.bsky.notification.listNotifications', [], $uid);
 	if (empty($data->notifications)) {
 		return;
 	}
 
-	$last_post = DBA::selectFirst('post-thread-user', ['received'], ['network' => Protocol::BLUESKY, 'uid' => $uid], ['order' => ['received' => true]]);
-	$last_poll = !empty($last_post['received']) ? strtotime($last_post['received']) : 0;
-
 	foreach ($data->notifications as $notification) {
-		$uri = bluesky_get_uri($notification);
+		$uri = DI::atpProcessor()->getUri($notification);
 		if (Post::exists(['uri' => $uri, 'uid' => $uid]) || Post::exists(['extid' => $uri, 'uid' => $uid])) {
 			Logger::debug('Notification already processed', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
 			continue;
@@ -1106,11 +1020,11 @@ function bluesky_fetch_notifications(int $uid)
 		Logger::debug('Process notification', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
 		switch ($notification->reason) {
 			case 'like':
-				$item = bluesky_get_header($notification, $uri, $uid, $uid, $last_poll, Conversation::PARCEL_CONNECTOR);
+				$item = DI::atpProcessor()->getHeaderFromPost($notification, $uri, $uid, Conversation::PARCEL_CONNECTOR);
 				$item['gravity'] = Item::GRAVITY_ACTIVITY;
 				$item['body'] = $item['verb'] = Activity::LIKE;
-				$item['thr-parent'] = bluesky_get_uri($notification->record->subject);
-				$item['thr-parent'] = bluesky_fetch_missing_post($item['thr-parent'], $uid, $uid, Item::PR_FETCHED, $item['contact-id'], 0, $last_poll);
+				$item['thr-parent'] = DI::atpProcessor()->getUri($notification->record->subject);
+				$item['thr-parent'] = DI::atpProcessor()->fetchMissingPost($item['thr-parent'], $uid, Item::PR_FETCHED, $item['contact-id'], 0);
 				if (!empty($item['thr-parent'])) {
 					$data = Item::insert($item);
 					Logger::debug('Got like', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
@@ -1120,11 +1034,11 @@ function bluesky_fetch_notifications(int $uid)
 				break;
 
 			case 'repost':
-				$item = bluesky_get_header($notification, $uri, $uid, $uid, $last_poll, Conversation::PARCEL_CONNECTOR);
+				$item = DI::atpProcessor()->getHeaderFromPost($notification, $uri, $uid, Conversation::PARCEL_CONNECTOR);
 				$item['gravity'] = Item::GRAVITY_ACTIVITY;
 				$item['body'] = $item['verb'] = Activity::ANNOUNCE;
-				$item['thr-parent'] = bluesky_get_uri($notification->record->subject);
-				$item['thr-parent'] = bluesky_fetch_missing_post($item['thr-parent'], $uid, $uid, Item::PR_FETCHED, $item['contact-id'], 0, $last_poll);
+				$item['thr-parent'] = DI::atpProcessor()->getUri($notification->record->subject);
+				$item['thr-parent'] = DI::atpProcessor()->fetchMissingPost($item['thr-parent'], $uid, Item::PR_FETCHED, $item['contact-id'], 0);
 				if (!empty($item['thr-parent'])) {
 					$data = Item::insert($item);
 					Logger::debug('Got repost', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
@@ -1134,25 +1048,25 @@ function bluesky_fetch_notifications(int $uid)
 				break;
 
 			case 'follow':
-				$contact = bluesky_get_contact($notification->author, $uid, $uid);
+				$contact = DI::atpActor()->getContactByDID($notification->author->did, $uid, $uid);
 				Logger::debug('New follower', ['uid' => $uid, 'nick' => $contact['nick'], 'uri' => $uri]);
 				break;
 
 			case 'mention':
-				$contact = bluesky_get_contact($notification->author, 0, $uid);
-				$result  = bluesky_fetch_missing_post($uri, $uid, $uid, Item::PR_TO, $contact['id'], 0, $last_poll);
+				$contact = DI::atpActor()->getContactByDID($notification->author->did, $uid, 0);
+				$result  = DI::atpProcessor()->fetchMissingPost($uri, $uid, Item::PR_TO, $contact['id'], 0);
 				Logger::debug('Got mention', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
 			case 'reply':
-				$contact = bluesky_get_contact($notification->author, 0, $uid);
-				$result  = bluesky_fetch_missing_post($uri, $uid, $uid, Item::PR_COMMENT, $contact['id'], 0, $last_poll);
+				$contact = DI::atpActor()->getContactByDID($notification->author->did, $uid, 0);
+				$result  = DI::atpProcessor()->fetchMissingPost($uri, $uid, Item::PR_COMMENT, $contact['id'], 0);
 				Logger::debug('Got reply', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
 			case 'quote':
-				$contact = bluesky_get_contact($notification->author, 0, $uid);
-				$result  = bluesky_fetch_missing_post($uri, $uid, $uid, Item::PR_PUSHED, $contact['id'], 0, $last_poll);
+				$contact = DI::atpActor()->getContactByDID($notification->author->did, $uid, 0);
+				$result  = DI::atpProcessor()->fetchMissingPost($uri, $uid, Item::PR_PUSHED, $contact['id'], 0);
 				Logger::debug('Got quote', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
@@ -1165,7 +1079,7 @@ function bluesky_fetch_notifications(int $uid)
 
 function bluesky_fetch_feed(int $uid, string $feed)
 {
-	$data = bluesky_xrpc_get($uid, 'app.bsky.feed.getFeed', ['feed' => $feed]);
+	$data = DI::atProtocol()->XRPCGet('app.bsky.feed.getFeed', ['feed' => $feed], $uid);
 	if (empty($data)) {
 		return;
 	}
@@ -1174,10 +1088,7 @@ function bluesky_fetch_feed(int $uid, string $feed)
 		return;
 	}
 
-	$last_post = DBA::selectFirst('post-thread-user', ['received'], ['network' => Protocol::BLUESKY, 'uid' => $uid], ['order' => ['received' => true]]);
-	$last_poll = !empty($last_post['received']) ? strtotime($last_post['received']) : 0;
-
-	$feeddata = bluesky_xrpc_get($uid, 'app.bsky.feed.getFeedGenerator', ['feed' => $feed]);
+	$feeddata = DI::atProtocol()->XRPCGet('app.bsky.feed.getFeedGenerator', ['feed' => $feed], $uid);
 	if (!empty($feeddata) && !empty($feeddata->view)) {
 		$feedurl  = $feeddata->view->uri;
 		$feedname = $feeddata->view->displayName;
@@ -1187,15 +1098,15 @@ function bluesky_fetch_feed(int $uid, string $feed)
 	}
 
 	foreach (array_reverse($data->feed) as $entry) {
-		$contact   = bluesky_get_contact($entry->post->author, 0, $uid);
+		$contact   = DI::atpActor()->getContactByDID($entry->post->author->did, $uid, 0);
 		$languages = $entry->post->record->langs ?? [];
 
 		if (!Relay::isWantedLanguage($entry->post->record->text, 0, $contact['id'] ?? 0, $languages)) {
 			Logger::debug('Unwanted language detected', ['languages' => $languages, 'text' => $entry->post->record->text]);
 			continue;
 		}
-		$causer = bluesky_get_contact($entry->post->author, 0, $uid);
-		$uri_id = bluesky_complete_post($entry->post, $uid, Item::PR_TAG, $causer['id'], $last_poll, Conversation::PARCEL_CONNECTOR);
+		$causer = DI::atpActor()->getContactByDID($entry->post->author->did, $uid, 0);
+		$uri_id = bluesky_complete_post($entry->post, $uid, Item::PR_TAG, $causer['id'], Conversation::PARCEL_CONNECTOR);
 		if (!empty($uri_id)) {
 			$stored = Post\Category::storeFileByURIId($uri_id, $uid, Post\Category::SUBCRIPTION, $feedname, $feedurl);
 			Logger::debug('Stored tag subscription for user', ['uri-id' => $uri_id, 'uid' => $uid, 'name' => $feedname, 'url' => $feedurl, 'stored' => $stored]);
@@ -1203,641 +1114,11 @@ function bluesky_fetch_feed(int $uid, string $feed)
 			Logger::notice('Post not found', ['entry' => $entry]);
 		}
 		if (!empty($entry->reason)) {
-			bluesky_process_reason($entry->reason, bluesky_get_uri($entry->post), $uid);
+			bluesky_process_reason($entry->reason, DI::atpProcessor()->getUri($entry->post), $uid);
 		}
 	}
 }
 
-function bluesky_process_post(stdClass $post, int $uid, int $fetch_uid, int $post_reason, int $causer, int $level, int $last_poll, int $protocol): int
-{
-	$uri = bluesky_get_uri($post);
-
-	if ($uri_id = bluesky_fetch_uri_id($uri, $uid)) {
-		return $uri_id;
-	}
-
-	if (empty($post->record)) {
-		Logger::debug('Invalid post', ['uri' => $uri]);
-		return 0;
-	}
-
-	Logger::debug('Importing post', ['uid' => $uid, 'indexedAt' => $post->indexedAt, 'uri' => $post->uri, 'cid' => $post->cid, 'root' => $post->record->reply->root ?? '']);
-
-	$item = bluesky_get_header($post, $uri, $uid, $fetch_uid, $last_poll, $protocol);
-	$item = bluesky_get_content($item, $post->record, $uri, $uid, $fetch_uid, $level, $last_poll);
-	if (empty($item)) {
-		return 0;
-	}
-
-	if (!empty($post->embed)) {
-		$item = bluesky_add_media($post->embed, $item, $uid, $level, $last_poll);
-	}
-
-	$item['restrictions'] = bluesky_get_restrictions_for_user($post, $item, $post_reason);
-
-	if (empty($item['post-reason'])) {
-		$item['post-reason'] = $post_reason;
-	}
-
-	if ($causer != 0) {
-		$item['causer-id'] = $causer;
-	}
-
-	Item::insert($item);
-	return bluesky_fetch_uri_id($uri, $uid);
-}
-
-function bluesky_get_header(stdClass $post, string $uri, int $uid, int $fetch_uid, int $last_poll, int $protocol): array
-{
-	$parts = bluesky_get_uri_parts($uri);
-	if (empty($post->author) || empty($post->cid) || empty($parts->rkey)) {
-		return [];
-	}
-	$contact = bluesky_get_contact($post->author, $uid, $fetch_uid);
-	$item = [
-		'network'       => Protocol::BLUESKY,
-		'protocol'      => $protocol,
-		'uid'           => $uid,
-		'wall'          => false,
-		'uri'           => $uri,
-		'guid'          => $post->cid,
-		'received'      => DateTimeFormat::utc($post->indexedAt, DateTimeFormat::MYSQL),
-		'private'       => Item::UNLISTED,
-		'verb'          => Activity::POST,
-		'contact-id'    => $contact['id'],
-		'author-name'   => $contact['name'],
-		'author-link'   => $contact['url'],
-		'author-avatar' => $contact['avatar'],
-		'plink'         => $contact['alias'] . '/post/' . $parts->rkey,
-		'source'        => json_encode($post),
-	];
-
-	if (($last_poll != 0) && strtotime($item['received']) < $last_poll) {
-		unset($item['received']);
-	}
-
-	$account = Contact::selectFirstAccountUser(['pid'], ['id' => $contact['id']]);
-
-	$item['author-id'] = $account['pid'];
-	$item['uri-id']       = ItemURI::getIdByURI($uri);
-	$item['owner-id']     = $item['author-id'];
-	$item['owner-name']   = $item['author-name'];
-	$item['owner-link']   = $item['author-link'];
-	$item['owner-avatar'] = $item['author-avatar'];
-
-	if (in_array($contact['rel'], [Contact::SHARING, Contact::FRIEND])) {
-		$item['post-reason'] = Item::PR_FOLLOWER;
-	}
-
-	if (!empty($post->labels)) {
-		foreach ($post->labels as $label) {
-			// Only flag posts as sensitive based on labels that had been provided by the author.
-			// When "ver" is set to "1" it was flagged by some automated process.
-			if (empty($label->ver)) {
-				$item['sensitive'] = true;
-				$item['content-warning'] = $label->val ?? '';
-				Logger::debug('Sensitive content', ['uri-id' => $item['uri-id'], 'label' => $label]);
-			}
-		}
-	}
-
-	return $item;
-}
-
-function bluesky_get_restrictions_for_user(stdClass $post, array $item, int $post_reason): ?int
-{
-	if (!empty($post->viewer->replyDisabled)) {
-		return Item::CANT_REPLY;
-	}
-
-	if (empty($post->threadgate)) {
-		return null;
-	}
-
-	if (!isset($post->threadgate->record->allow)) {
-		return null;
-	}
-
-	if ($item['uid'] == 0) {
-		return Item::CANT_REPLY;
-	}
-
-	$restrict = true;
-	$type = '$type';
-	foreach ($post->threadgate->record->allow as $allow) {
-		switch ($allow->$type) {
-			case 'app.bsky.feed.threadgate#followingRule':
-				// Only followers can reply.
-				if (Contact::isFollower($item['author-id'], $item['uid'])) {
-					$restrict = false;
-				}
-				break;
-			case 'app.bsky.feed.threadgate#mentionRule':
-				// Only mentioned accounts can reply.
-				if ($post_reason == Item::PR_TO) {
-					$restrict = false;
-				}
-				break;
-			case 'app.bsky.feed.threadgate#listRule';
-				// Only accounts in the provided list can reply. We don't support this at the moment.
-				break;
-		}
-	}
-
-	return $restrict ? Item::CANT_REPLY : null;
-}
-
-function bluesky_get_content(array $item, stdClass $record, string $uri, int $uid, int $fetch_uid, int $level, int $last_poll): array
-{
-	if (empty($item)) {
-		return [];
-	}
-
-	if (!empty($record->reply)) {
-		$item['parent-uri'] = bluesky_get_uri($record->reply->root);
-		if ($item['parent-uri'] != $uri) {
-			$item['parent-uri'] = bluesky_fetch_missing_post($item['parent-uri'], $uid, $fetch_uid, Item::PR_FETCHED, $item['contact-id'], $level, $last_poll);
-			if (empty($item['parent-uri'])) {
-				return [];
-			}
-		}
-
-		$item['thr-parent'] = bluesky_get_uri($record->reply->parent);
-		if (!in_array($item['thr-parent'], [$uri, $item['parent-uri']])) {
-			$item['thr-parent'] = bluesky_fetch_missing_post($item['thr-parent'], $uid, $fetch_uid, Item::PR_FETCHED, $item['contact-id'], $level, $last_poll, $item['parent-uri']);
-			if (empty($item['thr-parent'])) {
-				return [];
-			}
-		}
-	}
-
-	$item['body']    = bluesky_get_text($record, $item['uri-id']);
-	$item['created'] = DateTimeFormat::utc($record->createdAt, DateTimeFormat::MYSQL);
-	$item['transmitted-languages'] = $record->langs ?? [];
-
-	return $item;
-}
-
-function bluesky_get_text(stdClass $record, int $uri_id): string
-{
-	$text = $record->text ?? '';
-
-	if (empty($record->facets)) {
-		return $text;
-	}
-
-	$facets = [];
-	foreach ($record->facets as $facet) {
-		$facets[$facet->index->byteStart] = $facet;
-	}
-	krsort($facets);
-
-	foreach ($facets as $facet) {
-		$prefix   = substr($text, 0, $facet->index->byteStart);
-		$linktext = substr($text, $facet->index->byteStart, $facet->index->byteEnd - $facet->index->byteStart);
-		$suffix   = substr($text, $facet->index->byteEnd);
-
-		$url  = '';
-		$type = '$type';
-		foreach ($facet->features as $feature) {
-
-			switch ($feature->$type) {
-				case 'app.bsky.richtext.facet#link':
-					$url = $feature->uri;
-					break;
-
-				case 'app.bsky.richtext.facet#mention':
-					$contact = Contact::getByURL($feature->did, null, ['id']);
-					if (!empty($contact['id'])) {
-						$url = DI::baseUrl() . '/contact/' . $contact['id'];
-						if (substr($linktext, 0, 1) == '@') {
-							$prefix .= '@';
-							$linktext = substr($linktext, 1);
-						}
-					}
-					break;
-
-				case 'app.bsky.richtext.facet#tag';
-					Tag::store($uri_id, Tag::HASHTAG, $feature->tag);
-					$url      = DI::baseUrl() . '/search?tag=' . urlencode($feature->tag);
-					$linktext = '#' . $feature->tag;
-					break;
-
-				default:
-					Logger::notice('Unhandled feature type', ['type' => $feature->$type, 'feature' => $feature, 'record' => $record]);
-					break;
-			}
-		}
-		if (!empty($url)) {
-			$text = $prefix . '[url=' . $url . ']' . $linktext . '[/url]' . $suffix;
-		}
-	}
-	return $text;
-}
-
-function bluesky_add_media(stdClass $embed, array $item, int $fetch_uid, int $level, int $last_poll): array
-{
-	$type = '$type';
-	switch ($embed->$type) {
-		case 'app.bsky.embed.images#view':
-			foreach ($embed->images as $image) {
-				$media = [
-					'uri-id'      => $item['uri-id'],
-					'type'        => Post\Media::IMAGE,
-					'url'         => $image->fullsize,
-					'preview'     => $image->thumb,
-					'description' => $image->alt,
-				];
-				Post\Media::insert($media);
-			}
-			break;
-
-		case 'app.bsky.embed.video#view':
-			$media = [
-				'uri-id'      => $item['uri-id'],
-				'type'        => Post\Media::HLS,
-				'url'         => $embed->playlist,
-				'preview'     => $embed->thumbnail,
-				'description' => $embed->alt ?? '',
-				'height'      => $embed->aspectRatio->height ?? null,
-				'width'       => $embed->aspectRatio->width ?? null,
-			];
-			Post\Media::insert($media);
-			break;
-
-		case 'app.bsky.embed.external#view':
-			$media = [
-				'uri-id' => $item['uri-id'],
-				'type'        => Post\Media::HTML,
-				'url'         => $embed->external->uri,
-				'name'        => $embed->external->title,
-				'description' => $embed->external->description,
-			];
-			Post\Media::insert($media);
-			break;
-
-		case 'app.bsky.embed.record#view':
-			$original_uri = $uri = bluesky_get_uri($embed->record);
-			$type = '$type';
-			if (!empty($embed->record->record->$type)) {
-				$embed_type = $embed->record->record->$type;
-				if ($embed_type == 'app.bsky.graph.starterpack') {
-					bluesky_add_starterpack($item, $embed->record);
-					break;
-				}
-			}
-			$fetched_uri = bluesky_fetch_post($uri, $item['uid']);
-			if (!$fetched_uri) {
-				$uri = bluesky_fetch_missing_post($uri, 0, $fetch_uid, Item::PR_FETCHED, $item['contact-id'], $level, $last_poll);
-			} else {
-				$uri = $fetched_uri;
-			}
-			if ($uri) {
-				$shared = Post::selectFirst(['uri-id'], ['uri' => $uri, 'uid' => [$item['uid'], 0]]);
-				$uri_id = $shared['uri-id'] ?? 0;
-			}
-			if (!empty($uri_id)) {
-				$item['quote-uri-id'] = $uri_id;
-			} else {
-				Logger::debug('Quoted post could not be fetched', ['original-uri' => $original_uri, 'uri' => $uri]);
-			}
-			break;
-
-		case 'app.bsky.embed.recordWithMedia#view':
-			bluesky_add_media($embed->media, $item, $fetch_uid, $level, $last_poll);
-			$original_uri = $uri = bluesky_get_uri($embed->record->record);
-			$uri = bluesky_fetch_missing_post($uri, $item['uid'], $fetch_uid, Item::PR_FETCHED, $item['contact-id'], $level, $last_poll);
-			if ($uri) {
-				$shared = Post::selectFirst(['uri-id'], ['uri' => $uri, 'uid' => [$item['uid'], 0]]);
-				$uri_id = $shared['uri-id'] ?? 0;
-			}
-			if (!empty($uri_id)) {
-				$item['quote-uri-id'] = $uri_id;
-			} else {
-				Logger::debug('Quoted post could not be fetched', ['original-uri' => $original_uri, 'uri' => $uri]);
-			}
-			break;
-
-		default:
-			Logger::notice('Unhandled embed type', ['uri-id' => $item['uri-id'], 'type' => $embed->$type, 'embed' => $embed]);
-			break;
-	}
-	return $item;
-}
-
-function bluesky_add_starterpack(array $item, stdClass $record)
-{
-	Logger::debug('Received starterpack', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'uri' => $record->uri]);
-	if (!preg_match('#^at://(.+)/app.bsky.graph.starterpack/(.+)#', $record->uri, $matches)) {
-		return;
-	}
-
-	$media = [
-		'uri-id'      => $item['uri-id'],
-		'type'        => Post\Media::HTML,
-		'url'         => 'https://bsky.app/starter-pack/' . $matches[1] . '/' . $matches[2],
-		'name'        => $record->record->name,
-		'description' => $record->record->description,
-	];
-
-	Post\Media::insert($media);
-
-	$fields = [
-		'name'        => $record->record->name,
-		'description' => $record->record->description,
-	];
-	Post\Media::update($fields, ['uri-id' => $media['uri-id'], 'url' => $media['url']]);
-}
-
-function bluesky_get_uri(stdClass $post): string
-{
-	if (empty($post->cid)) {
-		Logger::info('Invalid URI', ['post' => $post]);
-		return '';
-	}
-	return $post->uri . ':' . $post->cid;
-}
-
-function bluesky_get_uri_class(string $uri): ?stdClass
-{
-	if (empty($uri)) {
-		return null;
-	}
-
-	$elements = explode(':', $uri);
-	if (empty($elements) || ($elements[0] != 'at')) {
-		$post = Post::selectFirstPost(['extid'], ['uri' => $uri]);
-		return bluesky_get_uri_class($post['extid'] ?? '');
-	}
-
-	$class = new stdClass;
-
-	$class->cid = array_pop($elements);
-	$class->uri = implode(':', $elements);
-
-	if ((substr_count($class->uri, '/') == 2) && (substr_count($class->cid, '/') == 2)) {
-		$class->uri .= ':' . $class->cid;
-		$class->cid = '';
-	}
-
-	return $class;
-}
-
-function bluesky_get_uri_parts(string $uri): ?stdClass
-{
-	$class = bluesky_get_uri_class($uri);
-	if (empty($class)) {
-		return null;
-	}
-
-	$parts = explode('/', substr($class->uri, 5));
-
-	$class = new stdClass;
-
-	$class->repo       = $parts[0];
-	$class->collection = $parts[1];
-	$class->rkey       = $parts[2];
-
-	return $class;
-}
-
-function bluesky_fetch_missing_post(string $uri, int $uid, int $fetch_uid, int $post_reason, int $causer, int $level, int $last_poll, string $fallback = '', bool $always_fetch = false, int $Protocol = Conversation::PARCEL_CONNECTOR): string
-{
-	$fetched_uri = bluesky_fetch_post($uri, $uid);
-	if (!$always_fetch && !empty($fetched_uri)) {
-		return $fetched_uri;
-	}
-
-	if (++$level > 100) {
-		Logger::info('Recursion level too deep', ['level' => $level, 'uid' => $uid, 'uri' => $uri, 'fallback' => $fallback]);
-		// When the level is too deep we will fallback to the parent uri.
-		// Allthough the threading won't be correct, we at least had stored all posts and won't try again
-		return $fallback;
-	}
-
-	$class = bluesky_get_uri_class($uri);
-	if (empty($class)) {
-		return $fallback;
-	}
-
-	$fetch_uri = $class->uri;
-
-	Logger::debug('Fetch missing post', ['level' => $level, 'uid' => $uid, 'uri' => $uri]);
-	$data = bluesky_xrpc_get($fetch_uid, 'app.bsky.feed.getPostThread', ['uri' => $fetch_uri]);
-	if (empty($data) || empty($data->thread)) {
-		Logger::info('Thread was not fetched', ['level' => $level, 'uid' => $uid, 'uri' => $uri, 'fallback' => $fallback]);
-		return $fallback;
-	}
-
-	Logger::debug('Reply count', ['level' => $level, 'uid' => $uid, 'uri' => $uri]);
-
-	if ($causer != 0) {
-		$causer = Contact::getPublicContactId($causer, $uid);
-	}
-
-	if (!empty($data->thread->parent)) {
-		$parents = bluesky_fetch_parents($data->thread->parent, $uid);
-
-		foreach ($parents as $parent) {
-			$uri_id = bluesky_process_post($parent, $uid, $fetch_uid, Item::PR_FETCHED, $causer, $level, $last_poll, $Protocol);
-			Logger::debug('Parent created', ['uri-id' => $uri_id]);
-		}
-	}
-
-	return bluesky_process_thread($data->thread, $uid, $fetch_uid, $post_reason, $causer, $level, $last_poll, $Protocol);
-}
-
-function bluesky_fetch_parents(stdClass $parent, int $uid, array $parents = []): array
-{
-	if (!empty($parent->parent)) {
-		$parents = bluesky_fetch_parents($parent->parent, $uid, $parents);
-	}
-
-	if (!empty($parent->post) && empty(bluesky_fetch_post(bluesky_get_uri($parent->post), $uid))) {
-		$parents[] = $parent->post;
-	}
-
-	return $parents;
-}
-
-function bluesky_fetch_post(string $uri, int $uid): string
-{
-	if (Post::exists(['uri' => $uri, 'uid' => [$uid, 0]])) {
-		Logger::debug('Post exists', ['uri' => $uri]);
-		return $uri;
-	}
-
-	$reply = Post::selectFirst(['uri'], ['extid' => $uri, 'uid' => [$uid, 0]]);
-	if (!empty($reply['uri'])) {
-		Logger::debug('Post with extid exists', ['uri' => $uri]);
-		return $reply['uri'];
-	}
-	return '';
-}
-
-function bluesky_fetch_uri_id(string $uri, int $uid): string
-{
-	$reply = Post::selectFirst(['uri-id'], ['uri' => $uri, 'uid' => [$uid, 0]]);
-	if (!empty($reply['uri-id'])) {
-		Logger::debug('Post with extid exists', ['uri' => $uri]);
-		return $reply['uri-id'];
-	}
-	$reply = Post::selectFirst(['uri-id'], ['extid' => $uri, 'uid' => [$uid, 0]]);
-	if (!empty($reply['uri-id'])) {
-		Logger::debug('Post with extid exists', ['uri' => $uri]);
-		return $reply['uri-id'];
-	}
-	return 0;
-}
-
-function bluesky_process_thread(stdClass $thread, int $uid, int $fetch_uid, int $post_reason, int $causer, int $level, int $last_poll, int $protocol): string
-{
-	if (empty($thread->post)) {
-		Logger::info('Invalid post', ['post' => $thread]);
-		return '';
-	}
-	$uri = bluesky_get_uri($thread->post);
-
-	$fetched_uri = bluesky_fetch_post($uri, $uid);
-	if (empty($fetched_uri)) {
-		$uri_id = bluesky_process_post($thread->post, $uid, $fetch_uid, $post_reason, $causer, $level, $last_poll, $protocol);
-		if ($uri_id) {
-			Logger::debug('Post has been processed and stored', ['uri-id' => $uri_id, 'uri' => $uri]);
-			return $uri;
-		} else {
-			Logger::info('Post has not not been stored', ['uri' => $uri]);
-			return '';
-		}
-	} else {
-		Logger::debug('Post exists', ['uri' => $uri]);
-		$uri = $fetched_uri;
-	}
-
-	foreach ($thread->replies ?? [] as $reply) {
-		$reply_uri = bluesky_process_thread($reply, $uid, $fetch_uid, Item::PR_FETCHED, $causer, $level, $last_poll, $protocol);
-		Logger::debug('Reply has been processed', ['uri' => $uri, 'reply' => $reply_uri]);
-	}
-
-	return $uri;
-}
-
-function bluesky_get_contact(stdClass $author, int $uid, int $fetch_uid): array
-{
-	$condition = ['network' => Protocol::BLUESKY, 'uid' => 0, 'nurl' => $author->did];
-	$contact = Contact::selectFirst(['id', 'updated'], $condition);
-
-	$update = empty($contact) || $contact['updated'] < DateTimeFormat::utc('now -24 hours');
-
-	$public_fields = $fields = bluesky_get_contact_fields($author, $uid, $fetch_uid, $update);
-
-	$public_fields['uid'] = 0;
-	$public_fields['rel'] = Contact::NOTHING;
-
-	if (empty($contact)) {
-		$cid = Contact::insert($public_fields);
-	} else {
-		$cid = $contact['id'];
-		Logger::debug('Update contact', ['fields' => $public_fields, 'id' => $cid]);
-		Contact::update($public_fields, ['id' => $cid], true);
-	}
-
-	if ($uid != 0) {
-		$condition = ['network' => Protocol::BLUESKY, 'uid' => $uid, 'nurl' => $author->did];
-
-		$contact = Contact::selectFirst(['id', 'rel', 'uid'], $condition);
-		if (!isset($fields['rel']) && isset($contact['rel'])) {
-			$fields['rel'] = $contact['rel'];
-		} elseif (!isset($fields['rel'])) {
-			$fields['rel'] = Contact::NOTHING;
-		}
-	}
-
-	if (($uid != 0) && ($fields['rel'] != Contact::NOTHING)) {
-		if (empty($contact)) {
-			$cid = Contact::insert($fields);
-		} else {
-			$cid = $contact['id'];
-			Logger::debug('Update contact', ['fields' => $fields, 'id' => $cid]);
-			Contact::update($fields, ['id' => $cid], true);
-		}
-		Logger::debug('Get user contact', ['id' => $cid, 'uid' => $uid, 'update' => $update]);
-	} else {
-		Logger::debug('Get public contact', ['id' => $cid, 'uid' => $uid, 'update' => $update]);
-	}
-	if (!empty($author->avatar)) {
-		Contact::updateAvatar($cid, $author->avatar);
-	}
-
-	return Contact::getById($cid);
-}
-
-function bluesky_get_contact_fields(stdClass $author, int $uid, int $fetch_uid, bool $update): array
-{
-	$nick = $author->handle ?? $author->did;
-	$name = $author->displayName ?? $nick;
-	$fields = [
-		'uid'      => $uid,
-		'network'  => Protocol::BLUESKY,
-		'priority' => 1,
-		'writable' => true,
-		'blocked'  => false,
-		'readonly' => false,
-		'pending'  => false,
-		'url'      => $author->did,
-		'nurl'     => $author->did,
-		'alias'    => BLUESKY_WEB . '/profile/' . $nick,
-		'name'     => $name ?: $nick,
-		'nick'     => $nick,
-		'addr'     => $nick,
-	];
-
-	if (!$update) {
-		Logger::debug('Got contact fields', ['uid' => $uid, 'url' => $fields['url'], 'fields' => $fields]);
-		return $fields;
-	}
-
-	$data = bluesky_get(BLUESKY_DIRECTORY . '/' . $author->did);
-	if (!empty($data)) {
-		$fields['baseurl'] = bluesky_get_pds('', $data);
-		if (!empty($fields['baseurl'])) {
-			GServer::check($fields['baseurl'], Protocol::BLUESKY);
-			$fields['gsid'] = GServer::getID($fields['baseurl'], true);
-		}
-		$fields['pubkey'] = bluesky_get_public_key('', $data);
-	}
-
-	$data = bluesky_xrpc_get($fetch_uid, 'app.bsky.actor.getProfile', ['actor' => $author->did]);
-	if (empty($data)) {
-		Logger::debug('Error fetching contact fields', ['uid' => $uid, 'url' => $fields['url']]);
-		return $fields;
-	}
-
-	$fields['updated'] = DateTimeFormat::utcNow(DateTimeFormat::MYSQL);
-
-	if (!empty($data->description)) {
-		$fields['about'] = HTML::toBBCode($data->description);
-	}
-
-	if (!empty($data->banner)) {
-		$fields['header'] = $data->banner;
-	}
-
-	if (!empty($data->viewer)) {
-		if (!empty($data->viewer->following) && !empty($data->viewer->followedBy)) {
-			$fields['rel'] = Contact::FRIEND;
-		} elseif (!empty($data->viewer->following) && empty($data->viewer->followedBy)) {
-			$fields['rel'] = Contact::SHARING;
-		} elseif (empty($data->viewer->following) && !empty($data->viewer->followedBy)) {
-			$fields['rel'] = Contact::FOLLOWER;
-		} else {
-			$fields['rel'] = Contact::NOTHING;
-		}
-	}
-
-	Logger::debug('Got updated contact fields', ['uid' => $uid, 'url' => $fields['url']]);
-	return $fields;
-}
-
 function bluesky_get_feeds(int $uid): array
 {
 	$type = '$type';
@@ -1861,7 +1142,7 @@ function bluesky_get_preferences(int $uid): ?stdClass
 		return $data;
 	}
 
-	$data = bluesky_xrpc_get($uid, 'app.bsky.actor.getPreferences');
+	$data = DI::atProtocol()->XRPCGet('app.bsky.actor.getPreferences', [], $uid);
 	if (empty($data)) {
 		return null;
 	}
@@ -1869,369 +1150,3 @@ function bluesky_get_preferences(int $uid): ?stdClass
 	DI::cache()->set($cachekey, $data, Duration::HOUR);
 	return $data;
 }
-
-function bluesky_get_did_by_profile(string $url, int $uid): string
-{
-	if (preg_match('#^' . BLUESKY_WEB . '/profile/(.+)#', $url, $matches)) {
-		$did = bluesky_get_did($matches[1], $uid);
-		if (!empty($did)) {
-			return $did;
-		}
-	}
-	try {
-		$curlResult = DI::httpClient()->get($url, HttpClientAccept::HTML, [HttpClientOptions::REQUEST => HttpClientRequest::CONTACTINFO]);
-	} catch (\Throwable $th) {
-		return '';
-	}
-	if (!$curlResult->isSuccess()) {
-		return '';
-	}
-	$profile = $curlResult->getBodyString();
-	if (empty($profile)) {
-		return '';
-	}
-
-	$doc = new DOMDocument();
-	try {
-		@$doc->loadHTML($profile);
-	} catch (\Throwable $th) {
-		return '';
-	}
-	$xpath = new DOMXPath($doc);
-	$list = $xpath->query('//p[@id]');
-	foreach ($list as $node) {
-		foreach ($node->attributes as $attribute) {
-			if ($attribute->name == 'id') {
-				$ids[$attribute->value] = $node->textContent;
-			}
-		}
-	}
-
-	if (empty($ids['bsky_handle']) || empty($ids['bsky_did'])) {
-		return '';
-	}
-
-	if (!bluesky_valid_did($ids['bsky_did'], $ids['bsky_handle'])) {
-		Logger::notice('Invalid DID', ['handle' => $ids['bsky_handle'], 'did' => $ids['bsky_did']]);
-		return '';
-	}
-
-	return $ids['bsky_did'];
-}
-
-function bluesky_get_did_by_wellknown(string $handle): string
-{
-	$curlResult = DI::httpClient()->get('http://' . $handle . '/.well-known/atproto-did');
-	if ($curlResult->isSuccess() && substr($curlResult->getBodyString(), 0, 4) == 'did:') {
-		$did = $curlResult->getBodyString();
-		if (!bluesky_valid_did($did, $handle)) {
-			Logger::notice('Invalid DID', ['handle' => $handle, 'did' => $did]);
-			return '';
-		}
-		return $did;
-	}
-	return '';
-}
-
-function bluesky_get_did_by_dns(string $handle): string
-{
-	$records = @dns_get_record('_atproto.' . $handle . '.', DNS_TXT);
-	if (empty($records)) {
-		return '';
-	}
-	foreach ($records as $record) {
-		if (!empty($record['txt']) && substr($record['txt'], 0, 4) == 'did=') {
-			$did = substr($record['txt'], 4);
-			if (!bluesky_valid_did($did, $handle)) {
-				Logger::notice('Invalid DID', ['handle' => $handle, 'did' => $did]);
-				return '';
-			}
-			return $did;
-		}
-	}
-	return '';
-}
-
-function bluesky_get_did(string $handle, int $uid): string
-{
-	if ($handle == '') {
-		return '';
-	}
-
-	if (strpos($handle, '.') === false) {
-		$handle .= '.' . BLUESKY_HOSTNAME;
-	}
-
-	// At first we use the user PDS. That should cover most cases.
-	$pds = DI::pConfig()->get($uid, 'bluesky', 'pds');
-	if (!empty($pds)) {
-		$data = bluesky_get($pds . '/xrpc/com.atproto.identity.resolveHandle?handle=' . urlencode($handle));
-		if (!empty($data) && !empty($data->did)) {
-			Logger::debug('Got DID by user PDS call', ['handle' => $handle, 'did' => $data->did]);
-			return $data->did;
-		}
-	}
-
-	// Then we query the DNS, which is used for third party handles (DNS should be faster than wellknown)
-	$did = bluesky_get_did_by_dns($handle);
-	if ($did != '') {
-		Logger::debug('Got DID by DNS', ['handle' => $handle, 'did' => $did]);
-		return $did;
-	}
-
-	// Then we query wellknown, which should mostly cover the rest.
-	$did = bluesky_get_did_by_wellknown($handle);
-	if ($did != '') {
-		Logger::debug('Got DID by wellknown', ['handle' => $handle, 'did' => $did]);
-		return $did;
-	}
-
-	// And finally we use the AppView API.
-	$data = bluesky_get(BLUESKY_APPVIEW_API . '/xrpc/com.atproto.identity.resolveHandle?handle=' . urlencode($handle));
-	if (!empty($data) && !empty($data->did)) {
-		Logger::debug('Got DID by system PDS call', ['handle' => $handle, 'did' => $data->did]);
-		return $data->did;
-	}
-
-	Logger::notice('No DID detected', ['handle' => $handle]);
-	return '';
-}
-
-function bluesky_get_user_did(int $uid, bool $refresh = false): ?string
-{
-	if (!$refresh) {
-		$did = DI::pConfig()->get($uid, 'bluesky', 'did');
-		if (!empty($did)) {
-			return $did;
-		}
-	}
-
-	$handle = DI::pConfig()->get($uid, 'bluesky', 'handle');
-	if (empty($handle)) {
-		return null;
-	}
-
-	$did = bluesky_get_did($handle, $uid);
-	if (empty($did)) {
-		return null;
-	}
-
-	Logger::debug('Got DID for user', ['uid' => $uid, 'handle' => $handle, 'did' => $did]);
-	DI::pConfig()->set($uid, 'bluesky', 'did', $did);
-	return $did;
-}
-
-function bluesky_get_user_pds(int $uid): ?string
-{
-	if ($uid == 0) {
-		return BLUESKY_APPVIEW_API;
-	}
-
-	$pds = DI::pConfig()->get($uid, 'bluesky', 'pds');
-	if (!empty($pds)) {
-		return $pds;
-	}
-
-	$did = bluesky_get_user_did($uid);
-	if (empty($did)) {
-		return null;
-	}
-
-	$pds = bluesky_get_pds($did);
-	if (empty($pds)) {
-		return null;
-	}
-
-	DI::pConfig()->set($uid, 'bluesky', 'pds', $pds);
-	return $pds;
-}
-
-function bluesky_get_pds(string $did, stdClass $data = null): ?string
-{
-	if (empty($data)) {
-		$data = bluesky_get(BLUESKY_DIRECTORY . '/' . $did);
-	}
-	if (empty($data) || empty($data->service)) {
-		return null;
-	}
-
-	foreach ($data->service as $service) {
-		if (($service->id == '#atproto_pds') && ($service->type == 'AtprotoPersonalDataServer') && !empty($service->serviceEndpoint)) {
-			return $service->serviceEndpoint;
-		}
-	}
-
-	return null;
-}
-
-function bluesky_get_public_key(string $did, stdClass $data = null): ?string
-{
-	if (empty($data)) {
-		$data = bluesky_get(BLUESKY_DIRECTORY . '/' . $did);
-	}
-	if (empty($data) || empty($data->verificationMethod)) {
-		return null;
-	}
-	foreach ($data->verificationMethod as $method) {
-		if (!empty($method->publicKeyMultibase)) {
-			return $method->publicKeyMultibase;
-		}
-	}
-	return null;
-}
-
-function bluesky_valid_did(string $did, string $handle): bool
-{
-	$data = bluesky_get(BLUESKY_DIRECTORY . '/' . $did);
-	if (empty($data) || empty($data->alsoKnownAs)) {
-		return false;
-	}
-
-	return in_array('at://' . $handle, $data->alsoKnownAs);
-}
-
-function bluesky_get_token(int $uid): string
-{
-	$token   = DI::pConfig()->get($uid, 'bluesky', 'access_token');
-	$created = DI::pConfig()->get($uid, 'bluesky', 'token_created');
-	if (empty($token)) {
-		return '';
-	}
-
-	if ($created + 300 < time()) {
-		return bluesky_refresh_token($uid);
-	}
-	return $token;
-}
-
-function bluesky_refresh_token(int $uid): string
-{
-	$token = DI::pConfig()->get($uid, 'bluesky', 'refresh_token');
-
-	$data = bluesky_post($uid, '/xrpc/com.atproto.server.refreshSession', '', ['Authorization' => ['Bearer ' . $token]]);
-	if (empty($data) || empty($data->accessJwt)) {
-		Logger::debug('Refresh failed', ['return' => $data]);
-		$password = DI::pConfig()->get($uid, 'bluesky', 'password');
-		if (!empty($password)) {
-			return bluesky_create_token($uid, $password);
-		}
-		DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_TOKEN_FAIL);
-		return '';
-	}
-
-	Logger::debug('Refreshed token', ['return' => $data]);
-	DI::pConfig()->set($uid, 'bluesky', 'access_token', $data->accessJwt);
-	DI::pConfig()->set($uid, 'bluesky', 'refresh_token', $data->refreshJwt);
-	DI::pConfig()->set($uid, 'bluesky', 'token_created', time());
-	return $data->accessJwt;
-}
-
-function bluesky_create_token(int $uid, string $password): string
-{
-	$did = bluesky_get_user_did($uid);
-	if (empty($did)) {
-		return '';
-	}
-
-	$data = bluesky_post($uid, '/xrpc/com.atproto.server.createSession', json_encode(['identifier' => $did, 'password' => $password]), ['Content-type' => 'application/json']);
-	if (empty($data) || empty($data->accessJwt)) {
-		DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_TOKEN_FAIL);
-		return '';
-	}
-
-	Logger::debug('Created token', ['return' => $data]);
-	DI::pConfig()->set($uid, 'bluesky', 'access_token', $data->accessJwt);
-	DI::pConfig()->set($uid, 'bluesky', 'refresh_token', $data->refreshJwt);
-	DI::pConfig()->set($uid, 'bluesky', 'token_created', time());
-	DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_TOKEN_OK);
-	return $data->accessJwt;
-}
-
-function bluesky_xrpc_post(int $uid, string $url, $parameters): ?stdClass
-{
-	$data = bluesky_post($uid, '/xrpc/' . $url, json_encode($parameters),  ['Content-type' => 'application/json', 'Authorization' => ['Bearer ' . bluesky_get_token($uid)]]);
-	if (!empty($data)) {
-		Item::incrementOutbound(Protocol::BLUESKY);
-	}
-	return $data;
-}
-
-function bluesky_post(int $uid, string $url, string $params, array $headers): ?stdClass
-{
-	$pds = bluesky_get_user_pds($uid);
-	if (empty($pds)) {
-		return null;
-	}
-
-	try {
-		$curlResult = DI::httpClient()->post($pds . $url, $params, $headers);
-	} catch (\Exception $e) {
-		Logger::notice('Exception on post', ['exception' => $e]);
-		DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_API_FAIL);
-		return null;
-	}
-
-	$data = json_decode($curlResult->getBodyString());
-	if (!$curlResult->isSuccess()) {
-		Logger::notice('API Error', ['url' => $url, 'code' => $curlResult->getReturnCode(), 'error' => $data ?: $curlResult->getBodyString()]);
-		if (!$data) {
-			DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_API_FAIL);
-			return null;
-		}
-		$data->code = $curlResult->getReturnCode();
-	}
-
-	if (!empty($data->code) && ($data->code >= 200) && ($data->code < 400)) {
-		DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_SUCCESS);
-	} else {
-		DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_API_FAIL);
-	}
-	return $data;
-}
-
-function bluesky_xrpc_get(int $uid, string $url, array $parameters = []): ?stdClass
-{
-	if (!empty($parameters)) {
-		$url .= '?' . http_build_query($parameters);
-	}
-
-	$pds = bluesky_get_user_pds($uid);
-	if (empty($pds)) {
-		return null;
-	}
-
-	$headers = ['Authorization' => ['Bearer ' . bluesky_get_token($uid)]];
-
-	$languages = User::getWantedLanguages($uid);
-	if (!empty($languages)) {
-		$headers['Accept-Language'] = implode(',', $languages);
-	}
-
-	$data = bluesky_get($pds . '/xrpc/' . $url, HttpClientAccept::JSON, [HttpClientOptions::HEADERS => $headers]);
-	if ($uid != 0) {
-		DI::pConfig()->set($uid, 'bluesky', 'status', is_null($data) ? BLUEKSY_STATUS_API_FAIL : BLUEKSY_STATUS_SUCCESS);
-	}
-	return $data;
-}
-
-function bluesky_get(string $url, string $accept_content = HttpClientAccept::DEFAULT, array $opts = []): ?stdClass
-{
-	try {
-		$curlResult = DI::httpClient()->get($url, $accept_content, $opts);
-	} catch (\Exception $e) {
-		Logger::notice('Exception on get', ['url' => $url, 'exception' => $e]);
-		return null;
-	}
-
-	$data = json_decode($curlResult->getBodyString());
-	if (!$curlResult->isSuccess()) {
-		Logger::notice('API Error', ['url' => $url, 'code' => $curlResult->getReturnCode(), 'error' => $data ?: $curlResult->getBodyString()]);
-		if (!$data) {
-			return null;
-		}
-		$data->code = $curlResult->getReturnCode();
-	}
-
-	Item::incrementInbound(Protocol::BLUESKY);
-	return $data;
-}

From 01ec6ecb8ea98555d744949305a60e12e2fdb76c Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 17 Dec 2024 04:50:54 +0000
Subject: [PATCH 204/294] Bluesky: Handle problems when uploading pictures

---
 bluesky/bluesky.php | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index c9c7dc67..d6b7624b 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -313,7 +313,8 @@ function bluesky_get_status(string $handle = null, string $did = null, string $p
 		return DI::l10n()->t('You are not authenticated. Please enter your handle and the app password.');
 	}
 
-	$status = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'status') ?? ATProtocol::STATUS_UNKNOWN;
+	$status  = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'status') ?? ATProtocol::STATUS_UNKNOWN;
+	$message = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'status-message') ?? '';
 
 	// Fallback mechanism for connection that had been established before the introduction of the status
 	if ($status == ATProtocol::STATUS_UNKNOWN) {
@@ -330,11 +331,11 @@ function bluesky_get_status(string $handle = null, string $did = null, string $p
 
 	switch ($status) {
 		case ATProtocol::STATUS_TOKEN_OK:
-			return DI::l10n()->t("You are authenticated to Bluesky.");
+			return DI::l10n()->t("You are authenticated to Bluesky. For security reasons the password isn't stored.");
 		case ATProtocol::STATUS_SUCCESS:
 			return DI::l10n()->t('The communication with the personal data server service (PDS) is established.');
 		case ATProtocol::STATUS_API_FAIL;
-			return DI::l10n()->t('Communication issues with the personal data server service (PDS).');
+			return DI::l10n()->t('Communication issues with the personal data server service (PDS): %s', $message);
 		case ATProtocol::STATUS_DID_FAIL:
 			return DI::l10n()->t('The DID for the provided handle could not be detected. Please check if you entered the correct handle.');
 		case ATProtocol::STATUS_PDS_FAIL:
@@ -361,7 +362,6 @@ function bluesky_settings_post(array &$b)
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'post',             intval($_POST['bluesky']));
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default',  intval($_POST['bluesky_bydefault']));
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'handle',           $handle);
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'password',         $_POST['bluesky_password']);
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'import',           intval($_POST['bluesky_import']));
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'import_feeds',     intval($_POST['bluesky_import_feeds']));
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'complete_threads', intval($_POST['bluesky_complete_threads']));
@@ -850,7 +850,14 @@ function bluesky_add_embed(int $uid, array $msg, array $record): array
 			if (empty($blob)) {
 				return [];
 			}
-			$images[] = ['alt' => $image['description'] ?? '', 'image' => $blob];
+			$images[] = [
+				'alt' => $image['description'] ?? '',
+				'image' => $blob,
+				'aspectRatio' => [
+					'width'  => $photo['width'],
+					'height' => $photo['height'],
+				]
+			];
 		}
 		if (!empty($images)) {
 			$record['embed'] = ['$type' => 'app.bsky.embed.images', 'images' => $images];
@@ -888,10 +895,15 @@ function bluesky_upload_blob(int $uid, array $photo): ?stdClass
 	$picture    = Photo::resizeToFileSize($picture, BLUESKY_IMAGE_SIZE[$retrial]);
 	$new_height = $picture->getHeight();
 	$new_width  = $picture->getWidth();
-	$content    = $picture->asString();
+	$content    = (string)$picture->asString();
 	$new_size   = strlen($content);
 
-	Logger::info('Uploading', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
+	if (($size != 0) && ($new_size == 0) && ($retrial == 0)) {
+		Logger::warning('Size is empty after resize, uploading original file', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
+		$content = Photo::getImageForPhoto($photo);
+	} else {
+		Logger::info('Uploading', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
+	}
 
 	$data = DI::atProtocol()->post($uid, '/xrpc/com.atproto.repo.uploadBlob', $content, ['Content-type' => $photo['type'], 'Authorization' => ['Bearer ' . DI::atProtocol()->getUserToken($uid)]]);
 	if (empty($data) || empty($data->blob)) {
@@ -955,7 +967,7 @@ function bluesky_complete_post(stdClass $post, int $uid, int $post_reason, int $
 	}
 
 	if ($complete) {
-		$uri = DI::atpProcessor()->fetchMissingPost(DI::atpProcessor()->getUri($post), $uid, $post_reason, $causer, 0, '', true);
+		$uri = DI::atpProcessor()->fetchMissingPost(DI::atpProcessor()->getUri($post), $uid, $post_reason, $causer, 0, '', true, $protocol);
 		$uri_id = DI::atpProcessor()->fetchUriId($uri, $uid);
 	} else {
 		$uri_id = DI::atpProcessor()->processPost($post, $uid, $post_reason, $causer, 0, $protocol);

From 16e06f9b2b85dba28a109ec85aaccc75509f2209 Mon Sep 17 00:00:00 2001
From: loma-one <loma-one@noreply.git.friendi.ca>
Date: Sun, 17 Nov 2024 08:20:49 +0100
Subject: [PATCH 205/294] Small bug fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Close the Uni-Code Smilies link with a ’;’
---
 unicode_smilies/unicode_smilies.php | 3099 +++++++++++++--------------
 1 file changed, 1548 insertions(+), 1551 deletions(-)

diff --git a/unicode_smilies/unicode_smilies.php b/unicode_smilies/unicode_smilies.php
index 22ee3439..8d55c4be 100644
--- a/unicode_smilies/unicode_smilies.php
+++ b/unicode_smilies/unicode_smilies.php
@@ -2,7 +2,7 @@
 /*
  * Name: Unicode Smilies
  * Description: Smilies based on the unicode emojis - On Linux use https://github.com/eosrei/emojione-color-font to see them in color and http://www.unicode.org/emoji/charts/full-emoji-list.html
- * Version: 1.1.2
+ * Version: 1.1.3
  * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
  * Author: Matthias Ebers <https://loma.ml/profile/one>
  */
@@ -25,7 +25,7 @@ function unicode_smilies_smilies(array &$b)
 	Smilies::add($b, ':-D', '&#x1F601;');
 	Smilies::add($b, ':D', '&#x1F601;');
 	Smilies::add($b, ';-)', '&#x1F609;');
-	// Smilies::add($b, ';)', '&#x1F609;');  // Deactivated since this leads to disturbed html entities
+// Smilies::add($b, ';)', '&#x1F609;');  // Deactivated since this leads to disturbed html entities
 	Smilies::add($b, ':-P', '&#x1F61B;');
 	Smilies::add($b, ':-p', '&#x1F61B;');
 	Smilies::add($b, ':P', '&#x1F61B;');
@@ -54,353 +54,350 @@ function unicode_smilies_smilies(array &$b)
 //	Smilies::add($b, 'O_o', '&#x;');
 
 // face-smiling
-	Smilies::add($b, ':grinning face:', '&#x1F600');
-	Smilies::add($b, ':grinning face with big eyes:', '&#x1F603');
-	Smilies::add($b, ':grinning face with smiling eyes:', '&#x1F604');
-	Smilies::add($b, ':beaming face with smiling eyes:', '&#x1F601');
-	Smilies::add($b, ':grinning squinting face:', '&#x1F606');
-	Smilies::add($b, ':laughing:', '&#x1F606');
-	Smilies::add($b, ':grinning face with sweat:', '&#x1F605');
-	Smilies::add($b, ':rolling on the floor laughing:', '&#x1F923');
+	Smilies::add($b, ':grinning face:', '&#x1F600;');
+	Smilies::add($b, ':grinning face with big eyes:', '&#x1F603;');
+	Smilies::add($b, ':grinning face with smiling eyes:', '&#x1F604;');
+	Smilies::add($b, ':beaming face with smiling eyes:', '&#x1F601;');
+	Smilies::add($b, ':grinning squinting face:', '&#x1F606;');
+	Smilies::add($b, ':laughing:', '&#x1F606;');
+	Smilies::add($b, ':grinning face with sweat:', '&#x1F605;');
+	Smilies::add($b, ':rolling on the floor laughing:', '&#x1F923;');
 	Smilies::add($b, ':rofl:', '&#x1F923;');
-	Smilies::add($b, ':face with tears of joy:', '&#x1F602');
+	Smilies::add($b, ':face with tears of joy:', '&#x1F602;');
 	Smilies::add($b, ':tearsofjoy:', '&#x1F602;');
-	Smilies::add($b, ':slightly smiling face:', '&#x1F642');
-	Smilies::add($b, ':upside-down face:', '&#x1F643');
-	Smilies::add($b, ':winking face:', '&#x1F609');
-	Smilies::add($b, ':smiling face with smiling eyes:', '&#x1F60A');
-	Smilies::add($b, ':smiling face with halo:', '&#x1F607');
+	Smilies::add($b, ':slightly smiling face:', '&#x1F642;');
+	Smilies::add($b, ':upside-down face:', '&#x1F643;');
+	Smilies::add($b, ':winking face:', '&#x1F609;');
+	Smilies::add($b, ':smiling face with smiling eyes:', '&#x1F60A;');
+	Smilies::add($b, ':smiling face with halo:', '&#x1F607;');
 
 // face-affection
-	Smilies::add($b, ':smiling face with hearts:', '&#x1F970');
-	Smilies::add($b, ':smiling face with heart-eyes:', '&#x1F60D');
-	Smilies::add($b, ':star-struck:', '&#x1F929');
-	Smilies::add($b, ':face blowing a kiss:', '&#x1F618');
-	Smilies::add($b, ':kissing face:', '&#x1F617');
-	Smilies::add($b, ':smiling face:', '&#x263A');
-	Smilies::add($b, ':kissing face with closed eyes:', '&#x1F61A');
-	Smilies::add($b, ':kissing face with smiling eyes:', '&#x1F619');
+	Smilies::add($b, ':smiling face with hearts:', '&#x1F970;');
+	Smilies::add($b, ':smiling face with heart-eyes:', '&#x1F60D;');
+	Smilies::add($b, ':star-struck:', '&#x1F929;');
+	Smilies::add($b, ':face blowing a kiss:', '&#x1F618;');
+	Smilies::add($b, ':kissing face:', '&#x1F617;');
+	Smilies::add($b, ':smiling face:', '&#x263A;');
+	Smilies::add($b, ':kissing face with closed eyes:', '&#x1F61A;');
+	Smilies::add($b, ':kissing face with smiling eyes:', '&#x1F619;');
 
 // face-tongue
-	Smilies::add($b, ':face savoring food:', '&#x1F60B');
-	Smilies::add($b, ':face with tongue:', '&#x1F61B');
-	Smilies::add($b, ':winking face with tongue:', '&#x1F61C');
-	Smilies::add($b, ':zany face:', '&#x1F92A');
-	Smilies::add($b, ':squinting face with tongue:', '&#x1F61D');
-	Smilies::add($b, ':money-mouth face:', '&#x1F911');
+	Smilies::add($b, ':face savoring food:', '&#x1F60B;');
+	Smilies::add($b, ':face with tongue:', '&#x1F61B;');
+	Smilies::add($b, ':winking face with tongue:', '&#x1F61C;');
+	Smilies::add($b, ':zany face:', '&#x1F92A;');
+	Smilies::add($b, ':squinting face with tongue:', '&#x1F61D;');
+	Smilies::add($b, ':money-mouth face:', '&#x1F911;');
 
 // face-hand
-	Smilies::add($b, ':hugging face:', '&#x1F917');
-	Smilies::add($b, ':face with hand over mouth:', '&#x1F92D');
-	Smilies::add($b, ':shushing face:', '&#x1F92B');
-	Smilies::add($b, ':thinking face:', '&#x1F914');
+	Smilies::add($b, ':hugging face:', '&#x1F917;');
+	Smilies::add($b, ':face with hand over mouth:', '&#x1F92D;');
+	Smilies::add($b, ':shushing face:', '&#x1F92B;');
+	Smilies::add($b, ':thinking face:', '&#x1F914;');
 
 // face-neutral-skeptical
-	Smilies::add($b, ':zipper-mouth face:', '&#x1F910');
-	Smilies::add($b, ':face with raised eyebrow:', '&#x1F928');
-	Smilies::add($b, ':neutral face:', '&#x1F610');
-	Smilies::add($b, ':expressionless face:', '&#x1F611');
-	Smilies::add($b, ':face without mouth:', '&#x1F636');
-	Smilies::add($b, ':smirking face:', '&#x1F60F');
-	Smilies::add($b, ':unamused face:', '&#x1F612');
-	Smilies::add($b, ':face with rolling eyes:', '&#x1F644');
-	Smilies::add($b, ':grimacing face:', '&#x1F62C');
-	Smilies::add($b, ':lying face:', '&#x1F925');
+	Smilies::add($b, ':zipper-mouth face:', '&#x1F910;');
+	Smilies::add($b, ':face with raised eyebrow:', '&#x1F928;');
+	Smilies::add($b, ':neutral face:', '&#x1F610;');
+	Smilies::add($b, ':expressionless face:', '&#x1F611;');
+	Smilies::add($b, ':face without mouth:', '&#x1F636;');
+	Smilies::add($b, ':smirking face:', '&#x1F60F;');
+	Smilies::add($b, ':unamused face:', '&#x1F612;');
+	Smilies::add($b, ':face with rolling eyes:', '&#x1F644;');
+	Smilies::add($b, ':grimacing face:', '&#x1F62C;');
+	Smilies::add($b, ':lying face:', '&#x1F925;');
 
 // face-sleepy
-	Smilies::add($b, ':relieved face:', '&#x1F60C');
-	Smilies::add($b, ':pensive face:', '&#x1F614');
-	Smilies::add($b, ':sleepy face:', '&#x1F62A');
-	Smilies::add($b, ':drooling face:', '&#x1F924');
+	Smilies::add($b, ':relieved face:', '&#x1F60C;');
+	Smilies::add($b, ':pensive face:', '&#x1F614;');
+	Smilies::add($b, ':sleepy face:', '&#x1F62A;');
+	Smilies::add($b, ':drooling face:', '&#x1F924;');
 	Smilies::add($b, ':drool:', '&#x1F924;');
-	Smilies::add($b, ':sleeping face:', '&#x1F634');
+	Smilies::add($b, ':sleeping face:', '&#x1F634;');
 
 // face-unwell
-	Smilies::add($b, ':face with medical mask:', '&#x1F637');
-	Smilies::add($b, ':face with thermometer:', '&#x1F912');
-	Smilies::add($b, ':face with head-bandage:', '&#x1F915');
-	Smilies::add($b, ':nauseated face:', '&#x1F922');
-	Smilies::add($b, ':face vomiting:', '&#x1F92E');
+	Smilies::add($b, ':face with medical mask:', '&#x1F637;');
+	Smilies::add($b, ':face with thermometer:', '&#x1F912;');
+	Smilies::add($b, ':face with head-bandage:', '&#x1F915;');
+	Smilies::add($b, ':nauseated face:', '&#x1F922;');
+	Smilies::add($b, ':face vomiting:', '&#x1F92E;');
 	Smilies::add($b, ':vomit:', '&#x1F92E;');
-	Smilies::add($b, ':sneezing face:', '&#x1F927');
-	Smilies::add($b, ':hot face:', '&#x1F975');
-	Smilies::add($b, ':cold face:', '&#x1F976');
-	Smilies::add($b, ':woozy face:', '&#x1F974');
-	Smilies::add($b, ':dizzy face:', '&#x1F635');
+	Smilies::add($b, ':sneezing face:', '&#x1F927;');
+	Smilies::add($b, ':hot face:', '&#x1F975;');
+	Smilies::add($b, ':cold face:', '&#x1F976;');
+	Smilies::add($b, ':woozy face:', '&#x1F974;');
+	Smilies::add($b, ':dizzy face:', '&#x1F635;');
 	Smilies::add($b, ':dead:', '&#x1F635;');
-	Smilies::add($b, ':exploding head:', '&#x1F92F');
+	Smilies::add($b, ':exploding head:', '&#x1F92F;');
 
 // face-hat
-	Smilies::add($b, ':cowboy hat face:', '&#x1F920');
-	Smilies::add($b, ':partying face:', '&#x1F973');
+	Smilies::add($b, ':cowboy hat face:', '&#x1F920;');
+	Smilies::add($b, ':partying face:', '&#x1F973;');
 
 // face-glasses
-	Smilies::add($b, ':smiling face with sunglasses:', '&#x1F60E');
-	Smilies::add($b, ':nerd face:', '&#x1F913');
-	Smilies::add($b, ':face with monocle:', '&#x1F9D0');
+	Smilies::add($b, ':smiling face with sunglasses:', '&#x1F60E;');
+	Smilies::add($b, ':nerd face:', '&#x1F913;');
+	Smilies::add($b, ':face with monocle:', '&#x1F9D0;');
 
 // face-concerned
-	Smilies::add($b, ':confused face:', '&#x1F615');
-	Smilies::add($b, ':worried face:', '&#x1F61F');
-	Smilies::add($b, ':slightly frowning face:', '&#x1F641');
-	Smilies::add($b, ':frowning face:', '&#x2639');
-	Smilies::add($b, ':face with open mouth:', '&#x1F62E');
-	Smilies::add($b, ':hushed face:', '&#x1F62F');
-	Smilies::add($b, ':astonished face:', '&#x1F632');
-	Smilies::add($b, ':flushed face:', '&#x1F633');
+	Smilies::add($b, ':confused face:', '&#x1F615;');
+	Smilies::add($b, ':worried face:', '&#x1F61F;');
+	Smilies::add($b, ':slightly frowning face:', '&#x1F641;');
+	Smilies::add($b, ':frowning face:', '&#x2639;');
+	Smilies::add($b, ':face with open mouth:', '&#x1F62E;');
+	Smilies::add($b, ':hushed face:', '&#x1F62F;');
+	Smilies::add($b, ':astonished face:', '&#x1F632;');
+	Smilies::add($b, ':flushed face:', '&#x1F633;');
 	Smilies::add($b, ':dazed:', '&#x1F633;');
-	Smilies::add($b, ':pleading face:', '&#x1F97A');
-	Smilies::add($b, ':frowning face with open mouth:', '&#x1F626');
-	Smilies::add($b, ':anguished face:', '&#x1F627');
-	Smilies::add($b, ':fearful face:', '&#x1F628');
-	Smilies::add($b, ':anxious face with sweat:', '&#x1F630');
-	Smilies::add($b, ':sad but relieved face:', '&#x1F625');
-	Smilies::add($b, ':crying face:', '&#x1F622');
-	Smilies::add($b, ':loudly crying face:', '&#x1F62D');
-	Smilies::add($b, ':face screaming in fear:', '&#x1F631');
-	Smilies::add($b, ':confounded face:', '&#x1F616');
-	Smilies::add($b, ':persevering face:', '&#x1F623');
-	Smilies::add($b, ':disappointed face:', '&#x1F61E');
+	Smilies::add($b, ':pleading face:', '&#x1F97A;');
+	Smilies::add($b, ':frowning face with open mouth:', '&#x1F626;');
+	Smilies::add($b, ':anguished face:', '&#x1F627;');
+	Smilies::add($b, ':fearful face:', '&#x1F628;');
+	Smilies::add($b, ':anxious face with sweat:', '&#x1F630;');
+	Smilies::add($b, ':sad but relieved face:', '&#x1F625;');
+	Smilies::add($b, ':crying face:', '&#x1F622;');
+	Smilies::add($b, ':loudly crying face:', '&#x1F62D;');
+	Smilies::add($b, ':face screaming in fear:', '&#x1F631;');
+	Smilies::add($b, ':confounded face:', '&#x1F616;');
+	Smilies::add($b, ':persevering face:', '&#x1F623;');
+	Smilies::add($b, ':disappointed face:', '&#x1F61E;');
 
 // face-negative
-	Smilies::add($b, ':face with steam from nose:', '&#x1F624');
-	Smilies::add($b, ':pouting face:', '&#x1F621');
-	Smilies::add($b, ':angry face:', '&#x1F620');
-	Smilies::add($b, ':face with symbols on mouth:', '&#x1F92C');
-	Smilies::add($b, ':smiling face with horns:', '&#x1F608');
-	Smilies::add($b, ':angry face with horns:', '&#x1F47F');
-	Smilies::add($b, ':skull:', '&#x1F480');
-	Smilies::add($b, ':skull and crossbones:', '&#x2620');
+	Smilies::add($b, ':face with steam from nose:', '&#x1F624;');
+	Smilies::add($b, ':pouting face:', '&#x1F621;');
+	Smilies::add($b, ':angry face:', '&#x1F620;');
+	Smilies::add($b, ':face with symbols on mouth:', '&#x1F92C;');
+	Smilies::add($b, ':smiling face with horns:', '&#x1F608;');
+	Smilies::add($b, ':angry face with horns:', '&#x1F47F;');
+	Smilies::add($b, ':skull:', '&#x1F480;');
+	Smilies::add($b, ':skull and crossbones:', '&#x2620;');
 
 // face-costume
-	Smilies::add($b, ':pile of poo:', '&#x1F4A9');
-	Smilies::add($b, ':clown face:', '&#x1F921');
-	Smilies::add($b, ':ogre:', '&#x1F479');
-	Smilies::add($b, ':goblin:', '&#x1F47A');
-	Smilies::add($b, ':ghost:', '&#x1F47B');
-	Smilies::add($b, ':alien:', '&#x1F47D');
-	Smilies::add($b, ':alien monster:', '&#x1F47E');
-	Smilies::add($b, ':robot:', '&#x1F916');
+	Smilies::add($b, ':pile of poo:', '&#x1F4A9;');
+	Smilies::add($b, ':clown face:', '&#x1F921;');
+	Smilies::add($b, ':ogre:', '&#x1F479;');
+	Smilies::add($b, ':goblin:', '&#x1F47A;');
+	Smilies::add($b, ':ghost:', '&#x1F47B;');
+	Smilies::add($b, ':alien:', '&#x1F47D;');
+	Smilies::add($b, ':alien monster:', '&#x1F47E;');
+	Smilies::add($b, ':robot:', '&#x1F916;');
 
 // cat-face
-	Smilies::add($b, ':grinning cat:', '&#x1F63A');
-	Smilies::add($b, ':grinning cat with smiling eyes:', '&#x1F638');
-	Smilies::add($b, ':cat with tears of joy:', '&#x1F639');
-	Smilies::add($b, ':smiling cat with heart-eyes:', '&#x1F63B');
-	Smilies::add($b, ':cat with wry smile:', '&#x1F63C');
-	Smilies::add($b, ':kissing cat:', '&#x1F63D');
-	Smilies::add($b, ':weary cat:', '&#x1F640');
-	Smilies::add($b, ':crying cat:', '&#x1F63F');
-	Smilies::add($b, ':pouting cat:', '&#x1F63E');
+	Smilies::add($b, ':grinning cat:', '&#x1F63A;');
+	Smilies::add($b, ':grinning cat with smiling eyes:', '&#x1F638;');
+	Smilies::add($b, ':cat with tears of joy:', '&#x1F639;');
+	Smilies::add($b, ':smiling cat with heart-eyes:', '&#x1F63B;');
+	Smilies::add($b, ':cat with wry smile:', '&#x1F63C;');
+	Smilies::add($b, ':kissing cat:', '&#x1F63D;');
+	Smilies::add($b, ':weary cat:', '&#x1F640;');
+	Smilies::add($b, ':crying cat:', '&#x1F63F;');
+	Smilies::add($b, ':pouting cat:', '&#x1F63E;');
 
 // monkey-face
-	Smilies::add($b, ':see-no-evil monkey:', '&#x1F648');
-	Smilies::add($b, ':hear-no-evil monkey:', '&#x1F649');
-	Smilies::add($b, ':speak-no-evil monkey:', '&#x1F64A');
+	Smilies::add($b, ':see-no-evil monkey:', '&#x1F648;');
+	Smilies::add($b, ':hear-no-evil monkey:', '&#x1F649;');
+	Smilies::add($b, ':speak-no-evil monkey:', '&#x1F64A;');
 
 //emotion
-	Smilies::add($b, ':kiss mark:', '&#x1F48B');
-	Smilies::add($b, ':love letter:', '&#x1F48C');
-	Smilies::add($b, ':heart with arrow:', '&#x1F498');
-	Smilies::add($b, ':heart with ribbon:', '&#x1F49D');
-	Smilies::add($b, ':sparkling heart:', '&#x1F496');
-    Smilies::add($b, ':loveheart:', '&#x1F496;');
-	Smilies::add($b, ':growing heart:', '&#x1F497');
-	Smilies::add($b, ':beating heart:', '&#x1F493');
-	Smilies::add($b, ':revolving hearts:', '&#x1F49E');
-	Smilies::add($b, ':two hearts:', '&#x1F495');
-	Smilies::add($b, ':heart decoration:', '&#x1F49F');
-	Smilies::add($b, ':heart exclamation:', '&#x2763');
-	Smilies::add($b, ':broken heart:', '&#x1F494');
-	Smilies::add($b, ':red heart:', '&#x2764');
-	Smilies::add($b, ':orange heart:', '&#x1F9E1');
-	Smilies::add($b, ':yellow heart:', '&#x1F49B');
-	Smilies::add($b, ':green heart:', '&#x1F49A');
-	Smilies::add($b, ':blue heart:', '&#x1F499');
-	Smilies::add($b, ':purple heart:', '&#x1F49C');
-	Smilies::add($b, ':brown heart:', '&#x1F90E');
-	Smilies::add($b, ':black heart:', '&#x1F5A4');
-	Smilies::add($b, ':white heart:', '&#x1F90D');
-	Smilies::add($b, ':hundred points:', '&#x1F4AF');
-	Smilies::add($b, ':anger symbol:', '&#x1F4A2');
-	Smilies::add($b, ':collision:', '&#x1F4A5');
-	Smilies::add($b, ':dizzy:', '&#x1F4AB');
-	Smilies::add($b, ':sweat droplets:', '&#x1F4A6');
-	Smilies::add($b, ':dashing away:', '&#x1F4A8');
-	Smilies::add($b, ':hole:', '&#x1F573');
-	Smilies::add($b, ':bomb:', '&#x1F4A3');
-	Smilies::add($b, ':speech balloon:', '&#x1F4AC');
-	Smilies::add($b, ':left speech bubble:', '&#x1F5E8');
-	Smilies::add($b, ':right anger bubble:', '&#x1F5EF');
-	Smilies::add($b, ':thought balloon:', '&#x1F4AD');
-	Smilies::add($b, ':zzz:', '&#x1F4A4');
+	Smilies::add($b, ':kiss mark:', '&#x1F48B;');
+	Smilies::add($b, ':love letter:', '&#x1F48C;');
+	Smilies::add($b, ':heart with arrow:', '&#x1F498;');
+	Smilies::add($b, ':heart with ribbon:', '&#x1F49D;');
+	Smilies::add($b, ':sparkling heart:', '&#x1F496;');
+	Smilies::add($b, ':loveheart:', '&#x1F496;');
+	Smilies::add($b, ':growing heart:', '&#x1F497;');
+	Smilies::add($b, ':beating heart:', '&#x1F493;');
+	Smilies::add($b, ':revolving hearts:', '&#x1F49E;');
+	Smilies::add($b, ':two hearts:', '&#x1F495;');
+	Smilies::add($b, ':heart decoration:', '&#x1F49F;');
+	Smilies::add($b, ':heart exclamation:', '&#x2763;');
+	Smilies::add($b, ':broken heart:', '&#x1F494;');
+	Smilies::add($b, ':red heart:', '&#x2764;');
+	Smilies::add($b, ':orange heart:', '&#x1F9E1;');
+	Smilies::add($b, ':yellow heart:', '&#x1F49B;');
+	Smilies::add($b, ':green heart:', '&#x1F49A;');
+	Smilies::add($b, ':blue heart:', '&#x1F499;');
+	Smilies::add($b, ':purple heart:', '&#x1F49C;');
+	Smilies::add($b, ':brown heart:', '&#x1F90E;');
+	Smilies::add($b, ':black heart:', '&#x1F5A4;');
+	Smilies::add($b, ':white heart:', '&#x1F90D;');
+	Smilies::add($b, ':hundred points:', '&#x1F4AF;');
+	Smilies::add($b, ':anger symbol:', '&#x1F4A2;');
+	Smilies::add($b, ':collision:', '&#x1F4A5;');
+	Smilies::add($b, ':dizzy:', '&#x1F4AB;');
+	Smilies::add($b, ':sweat droplets:', '&#x1F4A6;');
+	Smilies::add($b, ':dashing away:', '&#x1F4A8;');
+	Smilies::add($b, ':hole:', '&#x1F573;');
+	Smilies::add($b, ':bomb:', '&#x1F4A3;');
+	Smilies::add($b, ':speech balloon:', '&#x1F4AC;');
+	Smilies::add($b, ':left speech bubble:', '&#x1F5E8;');
+	Smilies::add($b, ':right anger bubble:', '&#x1F5EF;');
+	Smilies::add($b, ':thought balloon:', '&#x1F4AD;');
+	Smilies::add($b, ':zzz:', '&#x1F4A4;');
 
 // People & Body
 // hand-fingers-open
-	Smilies::add($b, ':waving hand:', '&#x1F44B');
-	Smilies::add($b, ':raised back of hand:', '&#x1F91A');
-	Smilies::add($b, ':hand with fingers splayed:', '&#x1F590');
-	Smilies::add($b, ':raised hand:', '&#x270B');
-	Smilies::add($b, ':vulcan salute:', '&#x1F596');
+	Smilies::add($b, ':waving hand:', '&#x1F44B;');
+	Smilies::add($b, ':raised back of hand:', '&#x1F91A;');
+	Smilies::add($b, ':hand with fingers splayed:', '&#x1F590;');
+	Smilies::add($b, ':raised hand:', '&#x270B;');
+	Smilies::add($b, ':vulcan salute:', '&#x1F596;');
 
 // hand-fingers-partial
-	Smilies::add($b, ':OK hand:', '&#x1F44C');
-//	Smilies::add($b, ':pinching hand:', '&#x1F90F');
-	Smilies::add($b, ':victory hand:', '&#x270C');
-	Smilies::add($b, ':crossed fingers:', '&#x1F91E');
-	Smilies::add($b, ':love-you gesture:', '&#x1F91F');
-	Smilies::add($b, ':sign of the horns:', '&#x1F918');
-	Smilies::add($b, ':call me hand:', '&#x1F919');
+	Smilies::add($b, ':OK hand:', '&#x1F44C;');
+	Smilies::add($b, ':victory hand:', '&#x270C;');
+	Smilies::add($b, ':crossed fingers:', '&#x1F91E;');
+	Smilies::add($b, ':love-you gesture:', '&#x1F91F;');
+	Smilies::add($b, ':sign of the horns:', '&#x1F918;');
+	Smilies::add($b, ':call me hand:', '&#x1F919;');
 
 // hand-single-finger
-	Smilies::add($b, ':backhand index pointing left:', '&#x1F448');
-	Smilies::add($b, ':backhand index pointing right:', '&#x1F449');
-	Smilies::add($b, ':backhand index pointing up:', '&#x1F446');
-	Smilies::add($b, ':middle finger:', '&#x1F595');
-	Smilies::add($b, ':backhand index pointing down:', '&#x1F447');
-	Smilies::add($b, ':index pointing up:', '&#x261D');
+	Smilies::add($b, ':backhand index pointing left:', '&#x1F448;');
+	Smilies::add($b, ':backhand index pointing right:', '&#x1F449;');
+	Smilies::add($b, ':backhand index pointing up:', '&#x1F446;');
+	Smilies::add($b, ':middle finger:', '&#x1F595;');
+	Smilies::add($b, ':backhand index pointing down:', '&#x1F447;');
+	Smilies::add($b, ':index pointing up:', '&#x261D;');
 
 // hand-fingers-closed
-	Smilies::add($b, ':thumbs up:', '&#x1F44D');
+	Smilies::add($b, ':thumbs up:', '&#x1F44D;');
 	Smilies::add($b, ':like:', '&#x1F44D;');
 	Smilies::add($b, '\\o/', '&#x1F44D;');
-	Smilies::add($b, ':thumbs down:', '&#x1F44E');
+	Smilies::add($b, ':thumbs down:', '&#x1F44E;');
 	Smilies::add($b, ':dislike:', '&#x1F44E;');
-	Smilies::add($b, ':raised fist:', '&#x270A');
-	Smilies::add($b, ':oncoming fist:', '&#x1F44A');
-	Smilies::add($b, ':left-facing fist:', '&#x1F91B');
-	Smilies::add($b, ':right-facing fist:', '&#x1F91C');
+	Smilies::add($b, ':raised fist:', '&#x270A;');
+	Smilies::add($b, ':oncoming fist:', '&#x1F44A;');
+	Smilies::add($b, ':left-facing fist:', '&#x1F91B;');
+	Smilies::add($b, ':right-facing fist:', '&#x1F91C;');
 
 // hands
-	Smilies::add($b, ':clapping hands:', '&#x1F44F');
-	Smilies::add($b, ':raising hands:', '&#x1F64C');
-	Smilies::add($b, ':open hands:', '&#x1F450');
-	Smilies::add($b, ':palms up together:', '&#x1F932');
-	Smilies::add($b, ':handshake:', '&#x1F91D');
-	Smilies::add($b, ':folded hands:', '&#x1F64F');
+	Smilies::add($b, ':clapping hands:', '&#x1F44F;');
+	Smilies::add($b, ':raising hands:', '&#x1F64C;');
+	Smilies::add($b, ':open hands:', '&#x1F450;');
+	Smilies::add($b, ':palms up together:', '&#x1F932;');
+	Smilies::add($b, ':handshake:', '&#x1F91D;');
+	Smilies::add($b, ':folded hands:', '&#x1F64F;');
 
 // hand-prop
-	Smilies::add($b, ':writing hand:', '&#x270D');
-	Smilies::add($b, ':nail polish:', '&#x1F485');
-	Smilies::add($b, ':selfie:', '&#x1F933');
+	Smilies::add($b, ':writing hand:', '&#x270D;');
+	Smilies::add($b, ':nail polish:', '&#x1F485;');
+	Smilies::add($b, ':selfie:', '&#x1F933;');
 
 // body-parts
-	Smilies::add($b, ':flexed biceps:', '&#x1F4AA');
-	Smilies::add($b, ':mechanical arm:', '&#x1F9BE');
-	Smilies::add($b, ':mechanical leg:', '&#x1F9BF');
-	Smilies::add($b, ':leg:', '&#x1F9B5');
-	Smilies::add($b, ':foot:', '&#x1F9B6');
-	Smilies::add($b, ':ear:', '&#x1F442');
-//	Smilies::add($b, ':ear with hearing aid:', '&#x1F9BB');
-	Smilies::add($b, ':nose:', '&#x1F443');
-	Smilies::add($b, ':brain:', '&#x1F9E0');
-	Smilies::add($b, ':tooth:', '&#x1F9B7');
-	Smilies::add($b, ':bone:', '&#x1F9B4');
-	Smilies::add($b, ':eyes:', '&#x1F440');
-	Smilies::add($b, ':eye:', '&#x1F441');
-	Smilies::add($b, ':tongue:', '&#x1F445');
-	Smilies::add($b, ':mouth:', '&#x1F444');
+	Smilies::add($b, ':flexed biceps:', '&#x1F4AA;');
+	Smilies::add($b, ':mechanical arm:', '&#x1F9BE;');
+	Smilies::add($b, ':mechanical leg:', '&#x1F9BF;');
+	Smilies::add($b, ':leg:', '&#x1F9B5;');
+	Smilies::add($b, ':foot:', '&#x1F9B6;');
+	Smilies::add($b, ':ear:', '&#x1F442;');
+	Smilies::add($b, ':brain:', '&#x1F9E0;');
+	Smilies::add($b, ':tooth:', '&#x1F9B7;');
+	Smilies::add($b, ':bone:', '&#x1F9B4;');
+	Smilies::add($b, ':eyes:', '&#x1F440;');
+	Smilies::add($b, ':eye:', '&#x1F441;');
+	Smilies::add($b, ':tongue:', '&#x1F445;');
+	Smilies::add($b, ':mouth:', '&#x1F444;');
 
 // person
-	Smilies::add($b, ':baby:', '&#x1F476');
-	Smilies::add($b, ':child:', '&#x1F9D2');
-	Smilies::add($b, ':boy:', '&#x1F466');
-	Smilies::add($b, ':girl:', '&#x1F467');
-	Smilies::add($b, ':person:', '&#x1F9D1');
-	Smilies::add($b, ':person: blond hair:', '&#x1F471');
-	Smilies::add($b, ':man:', '&#x1F468');
-	Smilies::add($b, ':man: beard:', '&#x1F9D4');
+	Smilies::add($b, ':baby:', '&#x1F476;');
+	Smilies::add($b, ':child:', '&#x1F9D2;');
+	Smilies::add($b, ':boy:', '&#x1F466;');
+	Smilies::add($b, ':girl:', '&#x1F467;');
+	Smilies::add($b, ':person:', '&#x1F9D1;');
+	Smilies::add($b, ':person: blond hair:', '&#x1F471;');
+	Smilies::add($b, ':man:', '&#x1F468;');
+	Smilies::add($b, ':man: beard:', '&#x1F9D4;');
 	Smilies::add($b, ':beard:', '&#x1F9D4;');
-	Smilies::add($b, ':man: red hair:', '&#x1F468&#x200D&#x1F9B0');
-	Smilies::add($b, ':man: curly hair:', '&#x1F468&#x200D&#x1F9B1');
-	Smilies::add($b, ':man: white hair:', '&#x1F468&#x200D&#x1F9B3');
-	Smilies::add($b, ':man: bald:', '&#x1F468&#x200D&#x1F9B2');
-	Smilies::add($b, ':woman:', '&#x1F469');
-	Smilies::add($b, ':woman: red hair:', '&#x1F469&#x200D&#x1F9B0');
-	Smilies::add($b, ':person: red hair:', '&#x1F9D1&#x200D&#x1F9B0');
-	Smilies::add($b, ':woman: curly hair:', '&#x1F469&#x200D&#x1F9B1');
-	Smilies::add($b, ':person: curly hair:', '&#x1F9D1&#x200D&#x1F9B1');
-	Smilies::add($b, ':woman: white hair:', '&#x1F469&#x200D&#x1F9B3');
-	Smilies::add($b, ':person: white hair:', '&#x1F9D1&#x200D&#x1F9B3');
-	Smilies::add($b, ':woman: bald:', '&#x1F469&#x200D&#x1F9B2');
-	Smilies::add($b, ':bald::', '&#x1F9D1&#x200D&#x1F9B2');
-	Smilies::add($b, ':woman: blond hair:', '&#x1F471&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':man: blond hair:', '&#x1F471&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':older person:', '&#x1F9D3');
-	Smilies::add($b, ':old man:', '&#x1F474');
-	Smilies::add($b, ':old woman:', '&#x1F475');
+	Smilies::add($b, ':man: red hair:', '&#x1F468;&#x200D;&#x1F9B0;');
+	Smilies::add($b, ':man: curly hair:', '&#x1F468;&#x200D;&#x1F9B1;');
+	Smilies::add($b, ':man: white hair:', '&#x1F468;&#x200D;&#x1F9B3;');
+	Smilies::add($b, ':man: bald:', '&#x1F468;&#x200D;&#x1F9B2;');
+	Smilies::add($b, ':woman:', '&#x1F469;');
+	Smilies::add($b, ':woman: red hair:', '&#x1F469;&#x200D;&#x1F9B0;');
+	Smilies::add($b, ':person: red hair:', '&#x1F9D1;&#x200D;&#x1F9B0;');
+	Smilies::add($b, ':woman: curly hair:', '&#x1F469;&#x200D;&#x1F9B1;');
+	Smilies::add($b, ':person: curly hair:', '&#x1F9D1;&#x200D;&#x1F9B1;');
+	Smilies::add($b, ':woman: white hair:', '&#x1F469;&#x200D;&#x1F9B3;');
+	Smilies::add($b, ':person: white hair:', '&#x1F9D1;&#x200D;&#x1F9B3;');
+	Smilies::add($b, ':woman: bald:', '&#x1F469;&#x200D;&#x1F9B2;');
+	Smilies::add($b, ':bald::', '&#x1F9D1;&#x200D;&#x1F9B2;');
+	Smilies::add($b, ':woman: blond hair:', '&#x1F471;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':man: blond hair:', '&#x1F471;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':older person:', '&#x1F9D3;');
+	Smilies::add($b, ':old man:', '&#x1F474;');
+	Smilies::add($b, ':old woman:', '&#x1F475;');
 	Smilies::add($b, ':pregnant:', '&#x1F930;');
 
 // person-gesture
-	Smilies::add($b, ':person frowning:', '&#x1F64D');
-	Smilies::add($b, ':man frowning:', '&#x1F64D&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman frowning:', '&#x1F64D&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':person pouting:', '&#x1F64E');
-	Smilies::add($b, ':man pouting:', '&#x1F64E&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman pouting:', '&#x1F64E&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':person gesturing NO:', '&#x1F645');
-	Smilies::add($b, ':man gesturing NO:', '&#x1F645&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman gesturing NO:', '&#x1F645&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':person gesturing OK:', '&#x1F646');
-	Smilies::add($b, ':man gesturing OK:', '&#x1F646&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman gesturing OK:', '&#x1F646&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':person tipping hand:', '&#x1F481');
-	Smilies::add($b, ':man tipping hand:', '&#x1F481&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman tipping hand:', '&#x1F481&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':person raising hand:', '&#x1F64B');
-	Smilies::add($b, ':man raising hand:', '&#x1F64B&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman raising hand', '&#x1F64B&#x200D&#x2640&#xFE0F');
-//	Smilies::add($b, ':deaf person:', '&#x1F9CF');
-//	Smilies::add($b, ':deaf man:', '&#x1F9CF&#x200D&#x2642&#xFE0F');
-//	Smilies::add($b, ':deaf woman:', '&#x1F9CF&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':person bowing:', '&#x1F647');
+	Smilies::add($b, ':person frowning:', '&#x1F64D;');
+	Smilies::add($b, ':man frowning:', '&#x1F64D;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman frowning:', '&#x1F64D;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':person pouting:', '&#x1F64E;');
+	Smilies::add($b, ':man pouting:', '&#x1F64E;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman pouting:', '&#x1F64E;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':person gesturing NO:', '&#x1F645;');
+	Smilies::add($b, ':man gesturing NO:', '&#x1F645;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman gesturing NO:', '&#x1F645;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':person gesturing OK:', '&#x1F646;');
+	Smilies::add($b, ':man gesturing OK:', '&#x1F646;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman gesturing OK:', '&#x1F646;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':person tipping hand:', '&#x1F481;');
+	Smilies::add($b, ':man tipping hand:', '&#x1F481;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman tipping hand:', '&#x1F481;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':person raising hand:', '&#x1F64B;');
+	Smilies::add($b, ':man raising hand:', '&#x1F64B;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman raising hand', '&#x1F64B;&#x200D;&#x2640;&#xFE0F;');
+//	Smilies::add($b, ':deaf person:', '&#x1F9CF;');
+//	Smilies::add($b, ':deaf man:', '&#x1F9CF;&#x200D;&#x2642;&#xFE0F;');
+//	Smilies::add($b, ':deaf woman:', '&#x1F9CF;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':person bowing:', '&#x1F647;');
 	Smilies::add($b, ':bow:', '&#x1F647;');
-	Smilies::add($b, ':man bowing:', '&#x1F647&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman bowing:', '&#x1F647&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':person facepalming:', '&#x1F926');
+	Smilies::add($b, ':man bowing:', '&#x1F647;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman bowing:', '&#x1F647;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':person facepalming:', '&#x1F926;');
 	Smilies::add($b, ':facepalm:', '&#x1F926;');
-	Smilies::add($b, ':man facepalming:', '&#x1F926&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman facepalming:', '&#x1F926&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':person shrugging:', '&#x1F937');
+	Smilies::add($b, ':man facepalming:', '&#x1F926;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman facepalming:', '&#x1F926;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':person shrugging:', '&#x1F937;');
 	Smilies::add($b, ':shrug:', '&#x1F937;');
-	Smilies::add($b, ':man shrugging:', '&#x1F937&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman shrugging:', '&#x1F937&#x200D&#x2640&#xFE0F');
+	Smilies::add($b, ':man shrugging:', '&#x1F937;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman shrugging:', '&#x1F937;&#x200D;&#x2640;&#xFE0F;');
 
 // person-role
 
 // person-fantasy
-	Smilies::add($b, ':baby angel:', '&#x1F47C');
+	Smilies::add($b, ':baby angel:', '&#x1F47C;');
 	Smilies::add($b, ':angel:', '&#x1F47C;');
 	Smilies::add($b, ':cherub:', '&#x1F47C;');
-	Smilies::add($b, ':Santa Claus:', '&#x1F385');
-	Smilies::add($b, ':Mrs. Claus:', '&#x1F936');
-	Smilies::add($b, ':superhero:', '&#x1F9B8');
-	Smilies::add($b, ':man superhero:', '&#x1F9B8&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman superhero:', '&#x1F9B8&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':supervillain:', '&#x1F9B9');
-	Smilies::add($b, ':man supervillain:', '&#x1F9B9&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman supervillain:', '&#x1F9B9&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':mage:', '&#x1F9D9');
-	Smilies::add($b, ':man mage:', '&#x1F9D9&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman mage:', '&#x1F9D9&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':fairy:', '&#x1F9DA');
-	Smilies::add($b, ':man fairy:', '&#x1F9DA&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman fairy:', '&#x1F9DA&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':vampire:', '&#x1F9DB');
-	Smilies::add($b, ':man vampire:', '&#x1F9DB&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman vampire:', '&#x1F9DB&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':merperson:', '&#x1F9DC');
-	Smilies::add($b, ':merman:', '&#x1F9DC&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':mermaid:', '&#x1F9DC&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':elf:', '&#x1F9DD');
-	Smilies::add($b, ':man elf:', '&#x1F9DD&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman elf:', '&#x1F9DD&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':genie:', '&#x1F9DE');
-	Smilies::add($b, ':man genie:', '&#x1F9DE&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman genie:', '&#x1F9DE&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':zombie:', '&#x1F9DF');
-	Smilies::add($b, ':man zombie:', '&#x1F9DF&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman zombie:', '&#x1F9DF&#x200D&#x2640&#xFE0F');
+	Smilies::add($b, ':Santa Claus:', '&#x1F385;');
+	Smilies::add($b, ':Mrs. Claus:', '&#x1F936;');
+	Smilies::add($b, ':superhero:', '&#x1F9B8;');
+	Smilies::add($b, ':man superhero:', '&#x1F9B8;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman superhero:', '&#x1F9B8;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':supervillain:', '&#x1F9B9;');
+	Smilies::add($b, ':man supervillain:', '&#x1F9B9;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman supervillain:', '&#x1F9B9;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':mage:', '&#x1F9D9;');
+	Smilies::add($b, ':man mage:', '&#x1F9D9;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman mage:', '&#x1F9D9;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':fairy:', '&#x1F9DA;');
+	Smilies::add($b, ':man fairy:', '&#x1F9DA;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman fairy:', '&#x1F9DA;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':vampire:', '&#x1F9DB;');
+	Smilies::add($b, ':man vampire:', '&#x1F9DB;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman vampire:', '&#x1F9DB;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':merperson:', '&#x1F9DC;');
+	Smilies::add($b, ':merman:', '&#x1F9DC;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':mermaid:', '&#x1F9DC;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':elf:', '&#x1F9DD;');
+	Smilies::add($b, ':man elf:', '&#x1F9DD;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman elf:', '&#x1F9DD;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':genie:', '&#x1F9DE;');
+	Smilies::add($b, ':man genie:', '&#x1F9DE;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman genie:', '&#x1F9DE;&#x200D;&#x2640;&#xFE0F;');
+	Smilies::add($b, ':zombie:', '&#x1F9DF;');
+	Smilies::add($b, ':man zombie:', '&#x1F9DF;&#x200D;&#x2642;&#xFE0F;');
+	Smilies::add($b, ':woman zombie:', '&#x1F9DF;&#x200D;&#x2640;&#xFE0F;');
 
 // person-activity
 
@@ -411,83 +408,83 @@ function unicode_smilies_smilies(array &$b)
 // person-resting
 
 // family
-	Smilies::add($b, ':people holding hands:', '&#x1F9D1&#x200D&#x1F91D&#x200D&#x1F9D1');
-	Smilies::add($b, ':women holding hands:', '&#x1F46D');
-	Smilies::add($b, ':woman and man holding hands:', '&#x1F46B');
-	Smilies::add($b, ':men holding hands:', '&#x1F46C');
-	Smilies::add($b, ':kiss:', '&#x1F48F');
-	Smilies::add($b, ':couple with heart:', '&#x1F491');
-	Smilies::add($b, ':family:', '&#x1F46A');
+	Smilies::add($b, ':people holding hands:', '&#x1F9D1;&#x200D;&#x1F91D;&#x200D;&#x1F9D1;');
+	Smilies::add($b, ':women holding hands:', '&#x1F46D;');
+	Smilies::add($b, ':woman and man holding hands:', '&#x1F46B;');
+	Smilies::add($b, ':men holding hands:', '&#x1F46C;');
+	Smilies::add($b, ':kiss:', '&#x1F48F;');
+	Smilies::add($b, ':couple with heart:', '&#x1F491;');
+	Smilies::add($b, ':family:', '&#x1F46A;');
 
 // person-symbol
-	Smilies::add($b, ':speaking head:', '&#x1F5E3');
-	Smilies::add($b, ':bust in silhouette:', '&#x1F464');
-	Smilies::add($b, ':busts in silhouette:', '&#x1F465');
-	Smilies::add($b, ':footprints:', '&#x1F463');
+	Smilies::add($b, ':speaking head:', '&#x1F5E3;');
+	Smilies::add($b, ':bust in silhouette:', '&#x1F464;');
+	Smilies::add($b, ':busts in silhouette:', '&#x1F465;');
+	Smilies::add($b, ':footprints:', '&#x1F463;');
 
 // Component
 // hair-style
 
 // Animals & Nature
 // animal-mammal
-	Smilies::add($b, ':monkey face:', '&#x1F435');
-	Smilies::add($b, ':monkey:', '&#x1F412');
-	Smilies::add($b, ':gorilla:', '&#x1F98D');
-	Smilies::add($b, ':orangutan:', '&#x1F9A7');
-	Smilies::add($b, ':dog face:', '&#x1F436');
-	Smilies::add($b, ':dog:', '&#x1F415');
-	Smilies::add($b, ':guide dog:', '&#x1F9AE');
-	Smilies::add($b, ':poodle:', '&#x1F429');
-	Smilies::add($b, ':wolf:', '&#x1F43A');
-	Smilies::add($b, ':fox:', '&#x1F98A');
-	Smilies::add($b, ':raccoon:', '&#x1F99D');
-	Smilies::add($b, ':cat face:', '&#x1F431');
-	Smilies::add($b, ':cat:', '&#x1F408');
-	Smilies::add($b, ':lion:', '&#x1F981');
-	Smilies::add($b, ':tiger face:', '&#x1F42F');
-	Smilies::add($b, ':tiger:', '&#x1F405');
-	Smilies::add($b, ':leopard:', '&#x1F406');
-	Smilies::add($b, ':horse face:', '&#x1F434');
-	Smilies::add($b, ':horse:', '&#x1F40E');
-	Smilies::add($b, ':unicorn:', '&#x1F984');
-	Smilies::add($b, ':zebra:', '&#x1F993');
-	Smilies::add($b, ':deer:', '&#x1F98C');
-	Smilies::add($b, ':cow face:', '&#x1F42E');
-	Smilies::add($b, ':ox:', '&#x1F402');
-	Smilies::add($b, ':water buffalo:', '&#x1F403');
-	Smilies::add($b, ':cow:', '&#x1F404');
-	Smilies::add($b, ':pig face:', '&#x1F437');
-	Smilies::add($b, ':pig:', '&#x1F416');
+	Smilies::add($b, ':monkey face:', '&#x1F435;');
+	Smilies::add($b, ':monkey:', '&#x1F412;');
+	Smilies::add($b, ':gorilla:', '&#x1F98D;');
+	Smilies::add($b, ':orangutan:', '&#x1F9A7;');
+	Smilies::add($b, ':dog face:', '&#x1F436;');
+	Smilies::add($b, ':dog:', '&#x1F415;');
+	Smilies::add($b, ':guide dog:', '&#x1F9AE;');
+	Smilies::add($b, ':poodle:', '&#x1F429;');
+	Smilies::add($b, ':wolf:', '&#x1F43A;');
+	Smilies::add($b, ':fox:', '&#x1F98A;');
+	Smilies::add($b, ':raccoon:', '&#x1F99D;');
+	Smilies::add($b, ':cat face:', '&#x1F431;');
+	Smilies::add($b, ':cat:', '&#x1F408;');
+	Smilies::add($b, ':lion:', '&#x1F981;');
+	Smilies::add($b, ':tiger face:', '&#x1F42F;');
+	Smilies::add($b, ':tiger:', '&#x1F405;');
+	Smilies::add($b, ':leopard:', '&#x1F406;');
+	Smilies::add($b, ':horse face:', '&#x1F434;');
+	Smilies::add($b, ':horse:', '&#x1F40E;');
+	Smilies::add($b, ':unicorn:', '&#x1F984;');
+	Smilies::add($b, ':zebra:', '&#x1F993;');
+	Smilies::add($b, ':deer:', '&#x1F98C;');
+	Smilies::add($b, ':cow face:', '&#x1F42E;');
+	Smilies::add($b, ':ox:', '&#x1F402;');
+	Smilies::add($b, ':water buffalo:', '&#x1F403;');
+	Smilies::add($b, ':cow:', '&#x1F404;');
+	Smilies::add($b, ':pig face:', '&#x1F437;');
+	Smilies::add($b, ':pig:', '&#x1F416;');
 	Smilies::add($b, ':boar:', '&#x1F417');
-	Smilies::add($b, ':pig nose:', '&#x1F43D');
-	Smilies::add($b, ':ram:', '&#x1F40F');
-	Smilies::add($b, ':sheep:', '&#x1F411');
-	Smilies::add($b, ':goat:', '&#x1F410');
+	Smilies::add($b, ':pig nose:', '&#x1F43D;');
+	Smilies::add($b, ':ram:', '&#x1F40F;');
+	Smilies::add($b, ':sheep:', '&#x1F411;');
+	Smilies::add($b, ':goat:', '&#x1F410;');
 	Smilies::add($b, ':camel:', '&#x1F42A');
-	Smilies::add($b, ':two-hump camel:', '&#x1F42B');
-	Smilies::add($b, ':llama:', '&#x1F999');
-	Smilies::add($b, ':giraffe:', '&#x1F992');
-	Smilies::add($b, ':elephant:', '&#x1F418');
-	Smilies::add($b, ':rhinoceros:', '&#x1F98F');
-	Smilies::add($b, ':hippopotamus:', '&#x1F99B');
-	Smilies::add($b, ':mouse face:', '&#x1F42D');
-	Smilies::add($b, ':mouse:', '&#x1F401');
-	Smilies::add($b, ':rat:', '&#x1F400');
-	Smilies::add($b, ':hamster:', '&#x1F439');
-	Smilies::add($b, ':rabbit face:', '&#x1F430');
-	Smilies::add($b, ':rabbit:', '&#x1F407');
-	Smilies::add($b, ':chipmunk:', '&#x1F43F');
-	Smilies::add($b, ':hedgehog:', '&#x1F994');
-	Smilies::add($b, ':bat:', '&#x1F987');
-	Smilies::add($b, ':bear:', '&#x1F43B');
-	Smilies::add($b, ':koala:', '&#x1F428');
-	Smilies::add($b, ':panda:', '&#x1F43C');
-	Smilies::add($b, ':sloth:', '&#x1F9A5');
-	Smilies::add($b, ':otter:', '&#x1F9A6');
-	Smilies::add($b, ':skunk:', '&#x1F9A8');
-	Smilies::add($b, ':kangaroo:', '&#x1F998');
-	Smilies::add($b, ':badger:', '&#x1F9A1');
-	Smilies::add($b, ':paw prints:', '&#x1F43E');
+	Smilies::add($b, ':two-hump camel:', '&#x1F42B;');
+	Smilies::add($b, ':llama:', '&#x1F999;');
+	Smilies::add($b, ':giraffe:', '&#x1F992;');
+	Smilies::add($b, ':elephant:', '&#x1F418;');
+	Smilies::add($b, ':rhinoceros:', '&#x1F98F;');
+	Smilies::add($b, ':hippopotamus:', '&#x1F99B;');
+	Smilies::add($b, ':mouse face:', '&#x1F42D;');
+	Smilies::add($b, ':mouse:', '&#x1F401;');
+	Smilies::add($b, ':rat:', '&#x1F400;');
+	Smilies::add($b, ':hamster:', '&#x1F439;');
+	Smilies::add($b, ':rabbit face:', '&#x1F430;');
+	Smilies::add($b, ':rabbit:', '&#x1F407;');
+	Smilies::add($b, ':chipmunk:', '&#x1F43F;');
+	Smilies::add($b, ':hedgehog:', '&#x1F994;');
+	Smilies::add($b, ':bat:', '&#x1F987;');
+	Smilies::add($b, ':bear:', '&#x1F43B;');
+	Smilies::add($b, ':koala:', '&#x1F428;');
+	Smilies::add($b, ':panda:', '&#x1F43C;');
+	Smilies::add($b, ':sloth:', '&#x1F9A5;');
+	Smilies::add($b, ':otter:', '&#x1F9A6;');
+	Smilies::add($b, ':skunk:', '&#x1F9A8;');
+	Smilies::add($b, ':kangaroo:', '&#x1F998;');
+	Smilies::add($b, ':badger:', '&#x1F9A1;');
+	Smilies::add($b, ':paw prints:', '&#x1F43E;');
 //	Smilies::add($b, ':bunnyflowers:', '&#x;');
 	Smilies::add($b, ':chick:', '&#x1F424;');
 	Smilies::add($b, ':ladybird:', '&#x1F41E;');
@@ -495,959 +492,958 @@ function unicode_smilies_smilies(array &$b)
 //	Smilies::add($b, ':dragonfly:', '&#x;');
 
 // animal-bird
-	Smilies::add($b, ':turkey:', '&#x1F983');
-	Smilies::add($b, ':chicken:', '&#x1F414');
-	Smilies::add($b, ':rooster:', '&#x1F413');
-	Smilies::add($b, ':hatching chick:', '&#x1F423');
-	Smilies::add($b, ':baby chick:', '&#x1F424');
-	Smilies::add($b, ':front-facing baby chick:', '&#x1F425');
-	Smilies::add($b, ':bird:', '&#x1F426');
-	Smilies::add($b, ':tux:', '&#x1F427');
-	Smilies::add($b, ':dove:', '&#x1F54A');
-	Smilies::add($b, ':eagle:', '&#x1F985');
-	Smilies::add($b, ':duck:', '&#x1F986');
-	Smilies::add($b, ':swan:', '&#x1F9A2');
-	Smilies::add($b, ':owl:', '&#x1F989');
-	Smilies::add($b, ':flamingo:', '&#x1F9A9');
-	Smilies::add($b, ':peacock:', '&#x1F99A');
-	Smilies::add($b, ':parrot:', '&#x1F99C');
+	Smilies::add($b, ':turkey:', '&#x1F983;');
+	Smilies::add($b, ':chicken:', '&#x1F414;');
+	Smilies::add($b, ':rooster:', '&#x1F413;');
+	Smilies::add($b, ':hatching chick:', '&#x1F423;');
+	Smilies::add($b, ':baby chick:', '&#x1F424;');
+	Smilies::add($b, ':front-facing baby chick:', '&#x1F425;');
+	Smilies::add($b, ':bird:', '&#x1F426;');
+	Smilies::add($b, ':tux:', '&#x1F427;');
+	Smilies::add($b, ':dove:', '&#x1F54A;');
+	Smilies::add($b, ':eagle:', '&#x1F985;');
+	Smilies::add($b, ':duck:', '&#x1F986;');
+	Smilies::add($b, ':swan:', '&#x1F9A2;');
+	Smilies::add($b, ':owl:', '&#x1F989;');
+	Smilies::add($b, ':flamingo:', '&#x1F9A9;');
+	Smilies::add($b, ':peacock:', '&#x1F99A;');
+	Smilies::add($b, ':parrot:', '&#x1F99C;');
 
 // animal-amphibian
-	Smilies::add($b, ':frog:', '&#x1F438');
+	Smilies::add($b, ':frog:', '&#x1F438;');
 
 // animal-reptile
-	Smilies::add($b, ':crocodile:', '&#x1F40A');
-	Smilies::add($b, ':turtle:', '&#x1F422');
-	Smilies::add($b, ':lizard:', '&#x1F98E');
-	Smilies::add($b, ':snake:', '&#x1F40D');
-	Smilies::add($b, ':dragon face:', '&#x1F432');
-	Smilies::add($b, ':dragon:', '&#x1F409');
+	Smilies::add($b, ':crocodile:', '&#x1F40A;');
+	Smilies::add($b, ':turtle:', '&#x1F422;');
+	Smilies::add($b, ':lizard:', '&#x1F98E;');
+	Smilies::add($b, ':snake:', '&#x1F40D;');
+	Smilies::add($b, ':dragon face:', '&#x1F432;');
+	Smilies::add($b, ':dragon:', '&#x1F409;');
 	Smilies::add($b, ':draco:', '&#x1F409;');
-	Smilies::add($b, ':sauropod:', '&#x1F995');
-	Smilies::add($b, ':T-Rex:', '&#x1F996');
+	Smilies::add($b, ':sauropod:', '&#x1F995;');
+	Smilies::add($b, ':T-Rex:', '&#x1F996;');
 
 // animal-marine
-	Smilies::add($b, ':spouting whale:', '&#x1F433');
-	Smilies::add($b, ':whale:', '&#x1F40B');
-	Smilies::add($b, ':dolphin:', '&#x1F42C');
-	Smilies::add($b, ':fish:', '&#x1F41F');
-	Smilies::add($b, ':tropical fish:', '&#x1F420');
-	Smilies::add($b, ':blowfish:', '&#x1F421');
-	Smilies::add($b, ':shark:', '&#x1F988');
-	Smilies::add($b, ':octopus:', '&#x1F419');
-	Smilies::add($b, ':spiral shell:', '&#x1F41A');
+	Smilies::add($b, ':spouting whale:', '&#x1F433;');
+	Smilies::add($b, ':whale:', '&#x1F40B;');
+	Smilies::add($b, ':dolphin:', '&#x1F42C;');
+	Smilies::add($b, ':fish:', '&#x1F41F;');
+	Smilies::add($b, ':tropical fish:', '&#x1F420;');
+	Smilies::add($b, ':blowfish:', '&#x1F421;');
+	Smilies::add($b, ':shark:', '&#x1F988;');
+	Smilies::add($b, ':octopus:', '&#x1F419;');
+	Smilies::add($b, ':spiral shell:', '&#x1F41A;');
 
 // animal-bug
-	Smilies::add($b, ':snail:', '&#x1F40C');
-	Smilies::add($b, ':butterfly:', '&#x1F98B');
-	Smilies::add($b, ':bug:', '&#x1F41B');
-	Smilies::add($b, ':ant:', '&#x1F41C');
-	Smilies::add($b, ':honeybee:', '&#x1F41D');
-	Smilies::add($b, ':lady beetle:', '&#x1F41E');
-	Smilies::add($b, ':cricket:', '&#x1F997');
-	Smilies::add($b, ':spider:', '&#x1F577');
-	Smilies::add($b, ':spider web:', '&#x1F578');
-	Smilies::add($b, ':scorpion:', '&#x1F982');
-	Smilies::add($b, ':mosquito:', '&#x1F99F');
-	Smilies::add($b, ':microbe:', '&#x1F9A0');
+	Smilies::add($b, ':snail:', '&#x1F40C;');
+	Smilies::add($b, ':butterfly:', '&#x1F98B;');
+	Smilies::add($b, ':bug:', '&#x1F41B;');
+	Smilies::add($b, ':ant:', '&#x1F41C;');
+	Smilies::add($b, ':honeybee:', '&#x1F41D;');
+	Smilies::add($b, ':lady beetle:', '&#x1F41E;');
+	Smilies::add($b, ':cricket:', '&#x1F997;');
+	Smilies::add($b, ':spider:', '&#x1F577;');
+	Smilies::add($b, ':spider web:', '&#x1F578;');
+	Smilies::add($b, ':scorpion:', '&#x1F982;');
+	Smilies::add($b, ':mosquito:', '&#x1F99F;');
+	Smilies::add($b, ':microbe:', '&#x1F9A0;');
 
 // plant-flower
-	Smilies::add($b, ':bouquet:', '&#x1F490');
-	Smilies::add($b, ':cherry blossom:', '&#x1F338');
-	Smilies::add($b, ':white flower:', '&#x1F4AE');
-	Smilies::add($b, ':rosette:', '&#x1F3F5');
-	Smilies::add($b, ':rose:', '&#x1F339');
-	Smilies::add($b, ':wilted flower:', '&#x1F940');
-	Smilies::add($b, ':hibiscus:', '&#x1F33A');
-	Smilies::add($b, ':sunflower:', '&#x1F33B');
-	Smilies::add($b, ':blossom:', '&#x1F33C');
-	Smilies::add($b, ':tulip:', '&#x1F337');
+	Smilies::add($b, ':bouquet:', '&#x1F490;');
+	Smilies::add($b, ':cherry blossom:', '&#x1F338;');
+	Smilies::add($b, ':white flower:', '&#x1F4AE;');
+	Smilies::add($b, ':rosette:', '&#x1F3F5;');
+	Smilies::add($b, ':rose:', '&#x1F339;');
+	Smilies::add($b, ':wilted flower:', '&#x1F940;');
+	Smilies::add($b, ':hibiscus:', '&#x1F33A;');
+	Smilies::add($b, ':sunflower:', '&#x1F33B;');
+	Smilies::add($b, ':blossom:', '&#x1F33C;');
+	Smilies::add($b, ':tulip:', '&#x1F337;');
 
 // plant-other
-	Smilies::add($b, ':seedling:', '&#x1F331');
-	Smilies::add($b, ':evergreen tree:', '&#x1F332');
-	Smilies::add($b, ':deciduous tree:', '&#x1F333');
-	Smilies::add($b, ':palm tree:', '&#x1F334');
-	Smilies::add($b, ':cactus:', '&#x1F335');
-	Smilies::add($b, ':sheaf of rice:', '&#x1F33E');
-	Smilies::add($b, ':herb:', '&#x1F33F');
-	Smilies::add($b, ':shamrock:', '&#x2618');
-	Smilies::add($b, ':four leaf clover:', '&#x1F340');
-	Smilies::add($b, ':maple leaf:', '&#x1F341');
-	Smilies::add($b, ':fallen leaf:', '&#x1F342');
-	Smilies::add($b, ':leaf fluttering in wind:', '&#x1F343');
+	Smilies::add($b, ':seedling:', '&#x1F331;');
+	Smilies::add($b, ':evergreen tree:', '&#x1F332;');
+	Smilies::add($b, ':deciduous tree:', '&#x1F333;');
+	Smilies::add($b, ':palm tree:', '&#x1F334;');
+	Smilies::add($b, ':cactus:', '&#x1F335;');
+	Smilies::add($b, ':sheaf of rice:', '&#x1F33E;');
+	Smilies::add($b, ':herb:', '&#x1F33F;');
+	Smilies::add($b, ':shamrock:', '&#x2618;');
+	Smilies::add($b, ':four leaf clover:', '&#x1F340;');
+	Smilies::add($b, ':maple leaf:', '&#x1F341;');
+	Smilies::add($b, ':fallen leaf:', '&#x1F342;');
+	Smilies::add($b, ':leaf fluttering in wind:', '&#x1F343;');
 
 // Food & Drink
 // food-fruit
-	Smilies::add($b, ':grapes:', '&#x1F347');
-	Smilies::add($b, ':melon:', '&#x1F348');
-	Smilies::add($b, ':watermelon:', '&#x1F349');
-	Smilies::add($b, ':tangerine:', '&#x1F34A');
-	Smilies::add($b, ':lemon:', '&#x1F34B');
-	Smilies::add($b, ':banana:', '&#x1F34C');
-	Smilies::add($b, ':pineapple:', '&#x1F34D');
-	Smilies::add($b, ':mango:', '&#x1F96D');
-	Smilies::add($b, ':red apple:', '&#x1F34E');
+	Smilies::add($b, ':grapes:', '&#x1F347;');
+	Smilies::add($b, ':melon:', '&#x1F348;');
+	Smilies::add($b, ':watermelon:', '&#x1F349;');
+	Smilies::add($b, ':tangerine:', '&#x1F34A;');
+	Smilies::add($b, ':lemon:', '&#x1F34B;');
+	Smilies::add($b, ':banana:', '&#x1F34C;');
+	Smilies::add($b, ':pineapple:', '&#x1F34D;');
+	Smilies::add($b, ':mango:', '&#x1F96D;');
+	Smilies::add($b, ':red apple:', '&#x1F34E;');
 	Smilies::add($b, ':apple:', '&#x1F34E;');
-	Smilies::add($b, ':green apple:', '&#x1F34F');
-	Smilies::add($b, ':pear:', '&#x1F350');
-	Smilies::add($b, ':peach:', '&#x1F351');
-	Smilies::add($b, ':cherries:', '&#x1F352');
-	Smilies::add($b, ':strawberry:', '&#x1F353');
-	Smilies::add($b, ':kiwi fruit:', '&#x1F95D');
-	Smilies::add($b, ':tomato:', '&#x1F345');
-	Smilies::add($b, ':coconut:', '&#x1F965');
+	Smilies::add($b, ':green apple:', '&#x1F34F;');
+	Smilies::add($b, ':pear:', '&#x1F350;');
+	Smilies::add($b, ':peach:', '&#x1F351;');
+	Smilies::add($b, ':cherries:', '&#x1F352;');
+	Smilies::add($b, ':strawberry:', '&#x1F353;');
+	Smilies::add($b, ':kiwi fruit:', '&#x1F95D;');
+	Smilies::add($b, ':tomato:', '&#x1F345;');
+	Smilies::add($b, ':coconut:', '&#x1F965;');
 
 // food-vegetable
-	Smilies::add($b, ':avocado:', '&#x1F951');
-	Smilies::add($b, ':eggplant:', '&#x1F346');
-	Smilies::add($b, ':potato:', '&#x1F954');
-	Smilies::add($b, ':carrot:', '&#x1F955');
-	Smilies::add($b, ':ear of corn:', '&#x1F33D');
-	Smilies::add($b, ':hot pepper:', '&#x1F336');
-	Smilies::add($b, ':cucumber:', '&#x1F952');
-	Smilies::add($b, ':leafy green:', '&#x1F96C');
-	Smilies::add($b, ':broccoli:', '&#x1F966');
-	Smilies::add($b, ':garlic:', '&#x1F9C4');
-	Smilies::add($b, ':onion:', '&#x1F9C5');
-	Smilies::add($b, ':mushroom:', '&#x1F344');
-	Smilies::add($b, ':peanuts:', '&#x1F95C');
-	Smilies::add($b, ':chestnut:', '&#x1F330');
+	Smilies::add($b, ':avocado:', '&#x1F951;');
+	Smilies::add($b, ':eggplant:', '&#x1F346;');
+	Smilies::add($b, ':potato:', '&#x1F954;');
+	Smilies::add($b, ':carrot:', '&#x1F955;');
+	Smilies::add($b, ':ear of corn:', '&#x1F33D;');
+	Smilies::add($b, ':hot pepper:', '&#x1F336;');
+	Smilies::add($b, ':cucumber:', '&#x1F952;');
+	Smilies::add($b, ':leafy green:', '&#x1F96C;');
+	Smilies::add($b, ':broccoli:', '&#x1F966;');
+	Smilies::add($b, ':garlic:', '&#x1F9C4;');
+	Smilies::add($b, ':onion:', '&#x1F9C5;');
+	Smilies::add($b, ':mushroom:', '&#x1F344;');
+	Smilies::add($b, ':peanuts:', '&#x1F95C;');
+	Smilies::add($b, ':chestnut:', '&#x1F330;');
 
 // food-prepared
-	Smilies::add($b, ':bread:', '&#x1F35E');
-	Smilies::add($b, ':croissant:', '&#x1F950');
-	Smilies::add($b, ':baguette bread:', '&#x1F956');
-	Smilies::add($b, ':pretzel:', '&#x1F968');
-	Smilies::add($b, ':bagel:', '&#x1F96F');
-	Smilies::add($b, ':pancakes:', '&#x1F95E');
-	Smilies::add($b, ':waffle:', '&#x1F9C7');
-	Smilies::add($b, ':cheese wedge:', '&#x1F9C0');
-	Smilies::add($b, ':meat on bone:', '&#x1F356');
-	Smilies::add($b, ':poultry leg:', '&#x1F357');
-	Smilies::add($b, ':cut of meat:', '&#x1F969');
-	Smilies::add($b, ':bacon:', '&#x1F953');
-	Smilies::add($b, ':hamburger:', '&#x1F354');
-	Smilies::add($b, ':french fries:', '&#x1F35F');
-	Smilies::add($b, ':pizza:', '&#x1F355');
-	Smilies::add($b, ':hot dog:', '&#x1F32D');
-	Smilies::add($b, ':sandwich:', '&#x1F96A');
-	Smilies::add($b, ':taco:', '&#x1F32E');
-	Smilies::add($b, ':burrito:', '&#x1F32F');
-	Smilies::add($b, ':stuffed flatbread:', '&#x1F959');
-	Smilies::add($b, ':falafel:', '&#x1F9C6');
-	Smilies::add($b, ':egg:', '&#x1F95A');
-	Smilies::add($b, ':cooking:', '&#x1F373');
+	Smilies::add($b, ':bread:', '&#x1F35E;');
+	Smilies::add($b, ':croissant:', '&#x1F950;');
+	Smilies::add($b, ':baguette bread:', '&#x1F956;');
+	Smilies::add($b, ':pretzel:', '&#x1F968;');
+	Smilies::add($b, ':bagel:', '&#x1F96F;');
+	Smilies::add($b, ':pancakes:', '&#x1F95E;');
+	Smilies::add($b, ':waffle:', '&#x1F9C7;');
+	Smilies::add($b, ':cheese wedge:', '&#x1F9C0;');
+	Smilies::add($b, ':meat on bone:', '&#x1F356;');
+	Smilies::add($b, ':poultry leg:', '&#x1F357;');
+	Smilies::add($b, ':cut of meat:', '&#x1F969;');
+	Smilies::add($b, ':bacon:', '&#x1F953;');
+	Smilies::add($b, ':hamburger:', '&#x1F354;');
+	Smilies::add($b, ':french fries:', '&#x1F35F;');
+	Smilies::add($b, ':pizza:', '&#x1F355;');
+	Smilies::add($b, ':hot dog:', '&#x1F32D;');
+	Smilies::add($b, ':sandwich:', '&#x1F96A;');
+	Smilies::add($b, ':taco:', '&#x1F32E;');
+	Smilies::add($b, ':burrito:', '&#x1F32F;');
+	Smilies::add($b, ':stuffed flatbread:', '&#x1F959;');
+	Smilies::add($b, ':falafel:', '&#x1F9C6;');
+	Smilies::add($b, ':egg:', '&#x1F95A;');
+	Smilies::add($b, ':cooking:', '&#x1F373;');
 	Smilies::add($b, ':fryegg:', '&#x1F373;');
-	Smilies::add($b, ':shallow pan of food:', '&#x1F958');
-	Smilies::add($b, ':pot of food:', '&#x1F372');
-	Smilies::add($b, ':bowl with spoon:', '&#x1F963');
-	Smilies::add($b, ':green salad:', '&#x1F957');
-	Smilies::add($b, ':popcorn:', '&#x1F37F');
-	Smilies::add($b, ':butter:', '&#x1F9C8');
-	Smilies::add($b, ':salt:', '&#x1F9C2');
-	Smilies::add($b, ':canned food:', '&#x1F96B');
+	Smilies::add($b, ':shallow pan of food:', '&#x1F958;');
+	Smilies::add($b, ':pot of food:', '&#x1F372;');
+	Smilies::add($b, ':bowl with spoon:', '&#x1F963;');
+	Smilies::add($b, ':green salad:', '&#x1F957;');
+	Smilies::add($b, ':popcorn:', '&#x1F37F;');
+	Smilies::add($b, ':butter:', '&#x1F9C8;');
+	Smilies::add($b, ':salt:', '&#x1F9C2;');
+	Smilies::add($b, ':canned food:', '&#x1F96B;');
 
 // food-asian
-	Smilies::add($b, ':bento box:', '&#x1F371');
-	Smilies::add($b, ':rice cracker:', '&#x1F358');
-	Smilies::add($b, ':rice ball:', '&#x1F359');
-	Smilies::add($b, ':cooked rice:', '&#x1F35A');
-	Smilies::add($b, ':curry rice:', '&#x1F35B');
-	Smilies::add($b, ':steaming bowl:', '&#x1F35C');
-	Smilies::add($b, ':spaghetti:', '&#x1F35D');
-	Smilies::add($b, ':roasted sweet potato:', '&#x1F360');
-	Smilies::add($b, ':oden:', '&#x1F362');
-	Smilies::add($b, ':sushi:', '&#x1F363');
-	Smilies::add($b, ':fried shrimp:', '&#x1F364');
-	Smilies::add($b, ':fish cake with swirl:', '&#x1F365');
-	Smilies::add($b, ':moon cake:', '&#x1F96E');
-	Smilies::add($b, ':dango:', '&#x1F361');
-	Smilies::add($b, ':dumpling:', '&#x1F95F');
-	Smilies::add($b, ':fortune cookie:', '&#x1F960');
-	Smilies::add($b, ':takeout box:', '&#x1F961');
+	Smilies::add($b, ':bento box:', '&#x1F371;');
+	Smilies::add($b, ':rice cracker:', '&#x1F358;');
+	Smilies::add($b, ':rice ball:', '&#x1F359;');
+	Smilies::add($b, ':cooked rice:', '&#x1F35A;');
+	Smilies::add($b, ':curry rice:', '&#x1F35B;');
+	Smilies::add($b, ':steaming bowl:', '&#x1F35C;');
+	Smilies::add($b, ':spaghetti:', '&#x1F35D;');
+	Smilies::add($b, ':roasted sweet potato:', '&#x1F360;');
+	Smilies::add($b, ':oden:', '&#x1F362;');
+	Smilies::add($b, ':sushi:', '&#x1F363;');
+	Smilies::add($b, ':fried shrimp:', '&#x1F364;');
+	Smilies::add($b, ':fish cake with swirl:', '&#x1F365;');
+	Smilies::add($b, ':moon cake:', '&#x1F96E;');
+	Smilies::add($b, ':dango:', '&#x1F361;');
+	Smilies::add($b, ':dumpling:', '&#x1F95F;');
+	Smilies::add($b, ':fortune cookie:', '&#x1F960;');
+	Smilies::add($b, ':takeout box:', '&#x1F961;');
 
 // food-marine
-	Smilies::add($b, ':crab:', '&#x1F980');
-	Smilies::add($b, ':lobster:', '&#x1F99E');
-	Smilies::add($b, ':shrimp:', '&#x1F990');
-	Smilies::add($b, ':squid:', '&#x1F991');
-// 	Smilies::add($b, ':oyster:', '&#x1F9AA');
+	Smilies::add($b, ':crab:', '&#x1F980;');
+	Smilies::add($b, ':lobster:', '&#x1F99E;');
+	Smilies::add($b, ':shrimp:', '&#x1F990;');
+	Smilies::add($b, ':squid:', '&#x1F991;');
+// Smilies::add($b, ':oyster:', '&#x1F9AA;');
 
 // food-sweet
-	Smilies::add($b, ':soft ice cream:', '&#x1F366');
-	Smilies::add($b, ':shaved ice:', '&#x1F367');
-	Smilies::add($b, ':ice cream:', '&#x1F368');
-	Smilies::add($b, ':doughnut:', '&#x1F369');
-	Smilies::add($b, ':cookie:', '&#x1F36A');
-	Smilies::add($b, ':birthday cake:', '&#x1F382');
-	Smilies::add($b, ':shortcake:', '&#x1F370');
+	Smilies::add($b, ':soft ice cream:', '&#x1F366;');
+	Smilies::add($b, ':shaved ice:', '&#x1F367;');
+	Smilies::add($b, ':ice cream:', '&#x1F368;');
+	Smilies::add($b, ':doughnut:', '&#x1F369;');
+	Smilies::add($b, ':cookie:', '&#x1F36A;');
+	Smilies::add($b, ':birthday cake:', '&#x1F382;');
+	Smilies::add($b, ':shortcake:', '&#x1F370;');
 	Smilies::add($b, ':cake:', '&#x1F370;');
-	Smilies::add($b, ':cupcake:', '&#x1F9C1');
-	Smilies::add($b, ':pie:', '&#x1F967');
-	Smilies::add($b, ':chocolate bar:', '&#x1F36B');
-	Smilies::add($b, ':candy:', '&#x1F36C');
-	Smilies::add($b, ':lollipop:', '&#x1F36D');
-	Smilies::add($b, ':custard:', '&#x1F36E');
-	Smilies::add($b, ':honey pot:', '&#x1F36F');
+	Smilies::add($b, ':cupcake:', '&#x1F9C1;');
+	Smilies::add($b, ':pie:', '&#x1F967;');
+	Smilies::add($b, ':chocolate bar:', '&#x1F36B;');
+	Smilies::add($b, ':candy:', '&#x1F36C;');
+	Smilies::add($b, ':lollipop:', '&#x1F36D;');
+	Smilies::add($b, ':custard:', '&#x1F36E;');
+	Smilies::add($b, ':honey pot:', '&#x1F36F;');
 
-// drink  
-	Smilies::add($b, ':baby bottle:', '&#x1F37C');
-	Smilies::add($b, ':glass of milk:', '&#x1F95B');
-	Smilies::add($b, ':hot beverage:', '&#x2615');
+// drink
+	Smilies::add($b, ':baby bottle:', '&#x1F37C;');
+	Smilies::add($b, ':glass of milk:', '&#x1F95B;');
+	Smilies::add($b, ':hot beverage:', '&#x2615;');
 	Smilies::add($b, ':coffee:', '&#x2615;');
 	Smilies::add($b, ':tea:', '&#x2615;');
 	Smilies::add($b, ':tee:', '&#x2615;');
-	Smilies::add($b, ':teacup without handle:', '&#x1F375');
-	Smilies::add($b, ':sake:', '&#x1F376');
-	Smilies::add($b, ':bottle with popping cork:', '&#x1F37E');
-	Smilies::add($b, ':wine glass:', '&#x1F377');
-	Smilies::add($b, ':cocktail glass:', '&#x1F378');
-	Smilies::add($b, ':tropical drink:', '&#x1F379');
-	Smilies::add($b, ':beer mug:', '&#x1F37A');
+	Smilies::add($b, ':teacup without handle:', '&#x1F375;');
+	Smilies::add($b, ':sake:', '&#x1F376;');
+	Smilies::add($b, ':bottle with popping cork:', '&#x1F37E;');
+	Smilies::add($b, ':wine glass:', '&#x1F377;');
+	Smilies::add($b, ':cocktail glass:', '&#x1F378;');
+	Smilies::add($b, ':tropical drink:', '&#x1F379;');
+	Smilies::add($b, ':beer mug:', '&#x1F37A;');
 	Smilies::add($b, ':beer:', '&#x1F37A;');
 	Smilies::add($b, ':homebrew:', '&#x1F37A;');
-	Smilies::add($b, ':clinking beer mugs:', '&#x1F37B');
-	Smilies::add($b, ':clinking glasses:', '&#x1F942');
-	Smilies::add($b, ':tumbler glass:', '&#x1F943');
-	Smilies::add($b, ':cup with straw:', '&#x1F964');
-//	Smilies::add($b, ':beverage box:', '&#x1F9C3');
-	Smilies::add($b, ':mate:', '&#x1F9C9');
-	Smilies::add($b, ':ice:', '&#x1F9CA');
+	Smilies::add($b, ':clinking beer mugs:', '&#x1F37B;');
+	Smilies::add($b, ':clinking glasses:', '&#x1F942;');
+	Smilies::add($b, ':tumbler glass:', '&#x1F943;');
+	Smilies::add($b, ':cup with straw:', '&#x1F964;');
+//  Smilies::add($b, ':beverage box:', '&#x1F9C3;');
+	Smilies::add($b, ':mate:', '&#x1F9C9;');
+	Smilies::add($b, ':ice:', '&#x1F9CA;');
 
 // dishware
-	Smilies::add($b, ':chopsticks:', '&#x1F962');
-	Smilies::add($b, ':fork and knife with plate:', '&#x1F37D');
-	Smilies::add($b, ':fork and knife:', '&#x1F374');
-	Smilies::add($b, ':spoon:', '&#x1F944');
-	Smilies::add($b, ':kitchen knife:', '&#x1F52A');
-	Smilies::add($b, ':amphora:', '&#x1F3FA');
+	Smilies::add($b, ':chopsticks:', '&#x1F962;');
+	Smilies::add($b, ':fork and knife with plate:', '&#x1F37D;');
+	Smilies::add($b, ':fork and knife:', '&#x1F374;');
+	Smilies::add($b, ':spoon:', '&#x1F944;');
+	Smilies::add($b, ':kitchen knife:', '&#x1F52A;');
+	Smilies::add($b, ':amphora:', '&#x1F3FA;');
 
 // Travel & Places
 // place-map
-	Smilies::add($b, ':globe showing Europe-Africa:', '&#x1F30D');
-	Smilies::add($b, ':globe showing Americas:', '&#x1F30E');
-	Smilies::add($b, ':globe showing Asia-Australia:', '&#x1F30F');
-	Smilies::add($b, ':globe with meridians:', '&#x1F310');
-	Smilies::add($b, ':world map:', '&#x1F5FA');
-	Smilies::add($b, ':map of Japan:', '&#x1F5FE');
-	Smilies::add($b, ':compass:', '&#x1F9ED');
+	Smilies::add($b, ':globe showing Europe-Africa:', '&#x1F30D;');
+	Smilies::add($b, ':globe showing Americas:', '&#x1F30E;');
+	Smilies::add($b, ':globe showing Asia-Australia:', '&#x1F30F;');
+	Smilies::add($b, ':globe with meridians:', '&#x1F310;');
+	Smilies::add($b, ':world map:', '&#x1F5FA;');
+	Smilies::add($b, ':map of Japan:', '&#x1F5FE;');
+	Smilies::add($b, ':compass:', '&#x1F9ED;');
 
 // place-geographic
-	Smilies::add($b, ':snow-capped mountain:', '&#x1F3D4');
-	Smilies::add($b, ':mountain:', '&#x26F0');
-	Smilies::add($b, ':volcano:', '&#x1F30B');
-	Smilies::add($b, ':mount fuji:', '&#x1F5FB');
-	Smilies::add($b, ':camping:', '&#x1F3D5');
-	Smilies::add($b, ':beach with umbrella:', '&#x1F3D6');
-	Smilies::add($b, ':desert:', '&#x1F3DC');
-	Smilies::add($b, ':desert island:', '&#x1F3DD');
-	Smilies::add($b, ':national park:', '&#x1F3DE');
+	Smilies::add($b, ':snow-capped mountain:', '&#x1F3D4;');
+	Smilies::add($b, ':mountain:', '&#x26F0;');
+	Smilies::add($b, ':volcano:', '&#x1F30B;');
+	Smilies::add($b, ':mount fuji:', '&#x1F5FB;');
+	Smilies::add($b, ':camping:', '&#x1F3D5;');
+	Smilies::add($b, ':beach with umbrella:', '&#x1F3D6;');
+	Smilies::add($b, ':desert:', '&#x1F3DC;');
+	Smilies::add($b, ':desert island:', '&#x1F3DD;');
+	Smilies::add($b, ':national park:', '&#x1F3DE;');
 
 // place-building
-	Smilies::add($b, ':stadium:', '&#x1F3DF');
-	Smilies::add($b, ':classical building:', '&#x1F3DB');
-	Smilies::add($b, ':building construction:', '&#x1F3D7');
-	Smilies::add($b, ':brick:', '&#x1F9F1');
-	Smilies::add($b, ':houses:', '&#x1F3D8');
-	Smilies::add($b, ':derelict house:', '&#x1F3DA');
-	Smilies::add($b, ':house:', '&#x1F3E0');
-	Smilies::add($b, ':house with garden:', '&#x1F3E1');
-	Smilies::add($b, ':office building:', '&#x1F3E2');
-	Smilies::add($b, ':Japanese post office:', '&#x1F3E3');
-	Smilies::add($b, ':post office:', '&#x1F3E4');
-	Smilies::add($b, ':hospital:', '&#x1F3E5');
-	Smilies::add($b, ':bank:', '&#x1F3E6');
-	Smilies::add($b, ':hotel:', '&#x1F3E8');
-	Smilies::add($b, ':love hotel:', '&#x1F3E9');
-	Smilies::add($b, ':convenience store:', '&#x1F3EA');
-	Smilies::add($b, ':school:', '&#x1F3EB');
-	Smilies::add($b, ':department store:', '&#x1F3EC');
-	Smilies::add($b, ':factory:', '&#x1F3ED');
-	Smilies::add($b, ':Japanese castle:', '&#x1F3EF');
-	Smilies::add($b, ':castle:', '&#x1F3F0');
-	Smilies::add($b, ':wedding:', '&#x1F492');
-	Smilies::add($b, ':Tokyo tower:', '&#x1F5FC');
-	Smilies::add($b, ':Statue of Liberty:', '&#x1F5FD');
-
+	Smilies::add($b, ':stadium:', '&#x1F3DF;');
+	Smilies::add($b, ':classical building:', '&#x1F3DB;');
+	Smilies::add($b, ':building construction:', '&#x1F3D7;');
+	Smilies::add($b, ':brick:', '&#x1F9F1;');
+	Smilies::add($b, ':houses:', '&#x1F3D8;');
+	Smilies::add($b, ':derelict house:', '&#x1F3DA;');
+	Smilies::add($b, ':house:', '&#x1F3E0;');
+	Smilies::add($b, ':house with garden:', '&#x1F3E1;');
+	Smilies::add($b, ':office building:', '&#x1F3E2;');
+	Smilies::add($b, ':Japanese post office:', '&#x1F3E3;');
+	Smilies::add($b, ':post office:', '&#x1F3E4;');
+	Smilies::add($b, ':hospital:', '&#x1F3E5;');
+	Smilies::add($b, ':bank:', '&#x1F3E6;');
+	Smilies::add($b, ':hotel:', '&#x1F3E8;');
+	Smilies::add($b, ':love hotel:', '&#x1F3E9;');
+	Smilies::add($b, ':convenience store:', '&#x1F3EA;');
+	Smilies::add($b, ':school:', '&#x1F3EB;');
+	Smilies::add($b, ':department store:', '&#x1F3EC;');
+	Smilies::add($b, ':factory:', '&#x1F3ED;');
+	Smilies::add($b, ':Japanese castle:', '&#x1F3EF;');
+	Smilies::add($b, ':castle:', '&#x1F3F0;');
+	Smilies::add($b, ':wedding:', '&#x1F492;');
+	Smilies::add($b, ':Tokyo tower:', '&#x1F5FC;');
+	Smilies::add($b, ':Statue of Liberty:', '&#x1F5FD;');
 
 // place-religious
-	Smilies::add($b, ':church:', '&#x26EA');
-	Smilies::add($b, ':mosque:', '&#x1F54C');
-// 	Smilies::add($b, ':hindu temple:', '&#x1F6D5');
-	Smilies::add($b, ':synagogue:', '&#x1F54D');
-	Smilies::add($b, ':shinto shrine:', '&#x26E9');
-	Smilies::add($b, ':kaaba:', '&#x1F54B');
+	Smilies::add($b, ':church:', '&#x26EA;');
+	Smilies::add($b, ':mosque:', '&#x1F54C;');
+//  Smilies::add($b, ':hindu temple:', '&#x1F6D5;');
+	Smilies::add($b, ':synagogue:', '&#x1F54D;');
+	Smilies::add($b, ':shinto shrine:', '&#x26E9;');
+	Smilies::add($b, ':kaaba:', '&#x1F54B;');
 
 // place-other
-	Smilies::add($b, ':fountain:', '&#x26F2');
-	Smilies::add($b, ':tent:', '&#x26FA');
-	Smilies::add($b, ':foggy:', '&#x1F301');
-	Smilies::add($b, ':night with stars:', '&#x1F303');
-	Smilies::add($b, ':cityscape:', '&#x1F3D9');
-	Smilies::add($b, ':sunrise over mountains:', '&#x1F304');
-	Smilies::add($b, ':sunrise:', '&#x1F305');
-	Smilies::add($b, ':cityscape at dusk:', '&#x1F306');
-	Smilies::add($b, ':sunset:', '&#x1F307');
-	Smilies::add($b, ':bridge at night:', '&#x1F309');
-	Smilies::add($b, ':hot springs:', '&#x2668');
-	Smilies::add($b, ':carousel horse:', '&#x1F3A0');
-	Smilies::add($b, ':ferris wheel:', '&#x1F3A1');
-	Smilies::add($b, ':roller coaster:', '&#x1F3A2');
-	Smilies::add($b, ':barber pole:', '&#x1F488');
-	Smilies::add($b, ':circus tent:', '&#x1F3AA');
+	Smilies::add($b, ':fountain:', '&#x26F2;');
+	Smilies::add($b, ':tent:', '&#x26FA;');
+	Smilies::add($b, ':foggy:', '&#x1F301;');
+	Smilies::add($b, ':night with stars:', '&#x1F303;');
+	Smilies::add($b, ':cityscape:', '&#x1F3D9;');
+	Smilies::add($b, ':sunrise over mountains:', '&#x1F304;');
+	Smilies::add($b, ':sunrise:', '&#x1F305;');
+	Smilies::add($b, ':cityscape at dusk:', '&#x1F306;');
+	Smilies::add($b, ':sunset:', '&#x1F307;');
+	Smilies::add($b, ':bridge at night:', '&#x1F309;');
+	Smilies::add($b, ':hot springs:', '&#x2668;');
+	Smilies::add($b, ':carousel horse:', '&#x1F3A0;');
+	Smilies::add($b, ':ferris wheel:', '&#x1F3A1;');
+	Smilies::add($b, ':roller coaster:', '&#x1F3A2;');
+	Smilies::add($b, ':barber pole:', '&#x1F488;');
+	Smilies::add($b, ':circus tent:', '&#x1F3AA;');
 
 // transport-ground
-	Smilies::add($b, ':locomotive:', '&#x1F682');
-	Smilies::add($b, ':railway car:', '&#x1F683');
-	Smilies::add($b, ':high-speed train:', '&#x1F684');
-	Smilies::add($b, ':bullet train:', '&#x1F685');
-	Smilies::add($b, ':train:', '&#x1F686');
-	Smilies::add($b, ':metro:', '&#x1F687');
-	Smilies::add($b, ':light rail:', '&#x1F688');
-	Smilies::add($b, ':station:', '&#x1F689');
-	Smilies::add($b, ':tram:', '&#x1F68A');
-	Smilies::add($b, ':monorail:', '&#x1F69D');
-	Smilies::add($b, ':mountain railway:', '&#x1F69E');
-	Smilies::add($b, ':tram car:', '&#x1F68B');
-	Smilies::add($b, ':bus:', '&#x1F68C');
-	Smilies::add($b, ':oncoming bus:', '&#x1F68D');
-	Smilies::add($b, ':trolleybus:', '&#x1F68E');
-	Smilies::add($b, ':minibus:', '&#x1F690');
-	Smilies::add($b, ':ambulance:', '&#x1F691');
-	Smilies::add($b, ':fire engine:', '&#x1F692');
-	Smilies::add($b, ':police car:', '&#x1F693');
-	Smilies::add($b, ':oncoming police car:', '&#x1F694');
-	Smilies::add($b, ':taxi:', '&#x1F695');
-	Smilies::add($b, ':oncoming taxi:', '&#x1F696');
-	Smilies::add($b, ':automobile:', '&#x1F697');
-	Smilies::add($b, ':oncoming automobile:', '&#x1F698');
-	Smilies::add($b, ':sport utility vehicle:', '&#x1F699');
-	Smilies::add($b, ':delivery truck:', '&#x1F69A');
-	Smilies::add($b, ':articulated lorry:', '&#x1F69B');
-	Smilies::add($b, ':tractor:', '&#x1F69C');
-	Smilies::add($b, ':racing car:', '&#x1F3CE');
-	Smilies::add($b, ':motorcycle:', '&#x1F3CD');
-	Smilies::add($b, ':motor scooter:', '&#x1F6F5');
-//	Smilies::add($b, ':manual wheelchair:', '&#x1F9BD');
-//	Smilies::add($b, ':motorized wheelchair:', '&#x1F9BC');
-//	Smilies::add($b, ':auto rickshaw:', '&#x1F6FA');
-	Smilies::add($b, ':bicycle:', '&#x1F6B2');
-	Smilies::add($b, ':kick scooter:', '&#x1F6F4');
-	Smilies::add($b, ':skateboard:', '&#x1F6F9');
-	Smilies::add($b, ':bus stop:', '&#x1F68F');
-	Smilies::add($b, ':motorway:', '&#x1F6E3');
-	Smilies::add($b, ':railway track:', '&#x1F6E4');
-	Smilies::add($b, ':oil drum:', '&#x1F6E2');
-	Smilies::add($b, ':fuel pump:', '&#x26FD');
-	Smilies::add($b, ':police car light:', '&#x1F6A8');
-	Smilies::add($b, ':horizontal traffic light:', '&#x1F6A5');
-	Smilies::add($b, ':vertical traffic light:', '&#x1F6A6');
-	Smilies::add($b, ':stop sign:', '&#x1F6D1');
-	Smilies::add($b, ':construction:', '&#x1F6A7');
+	Smilies::add($b, ':locomotive:', '&#x1F682;');
+	Smilies::add($b, ':railway car:', '&#x1F683;');
+	Smilies::add($b, ':high-speed train:', '&#x1F684;');
+	Smilies::add($b, ':bullet train:', '&#x1F685;');
+	Smilies::add($b, ':train:', '&#x1F686;');
+	Smilies::add($b, ':metro:', '&#x1F687;');
+	Smilies::add($b, ':light rail:', '&#x1F688;');
+	Smilies::add($b, ':station:', '&#x1F689;');
+	Smilies::add($b, ':tram:', '&#x1F68A;');
+	Smilies::add($b, ':monorail:', '&#x1F69D;');
+	Smilies::add($b, ':mountain railway:', '&#x1F69E;');
+	Smilies::add($b, ':tram car:', '&#x1F68B;');
+	Smilies::add($b, ':bus:', '&#x1F68C;');
+	Smilies::add($b, ':oncoming bus:', '&#x1F68D;');
+	Smilies::add($b, ':trolleybus:', '&#x1F68E;');
+	Smilies::add($b, ':minibus:', '&#x1F690;');
+	Smilies::add($b, ':ambulance:', '&#x1F691;');
+	Smilies::add($b, ':fire engine:', '&#x1F692;');
+	Smilies::add($b, ':police car:', '&#x1F693;');
+	Smilies::add($b, ':oncoming police car:', '&#x1F694;');
+	Smilies::add($b, ':taxi:', '&#x1F695;');
+	Smilies::add($b, ':oncoming taxi:', '&#x1F696;');
+	Smilies::add($b, ':automobile:', '&#x1F697;');
+	Smilies::add($b, ':oncoming automobile:', '&#x1F698;');
+	Smilies::add($b, ':sport utility vehicle:', '&#x1F699;');
+	Smilies::add($b, ':delivery truck:', '&#x1F69A;');
+	Smilies::add($b, ':articulated lorry:', '&#x1F69B;');
+	Smilies::add($b, ':tractor:', '&#x1F69C;');
+	Smilies::add($b, ':racing car:', '&#x1F3CE;');
+	Smilies::add($b, ':motorcycle:', '&#x1F3CD;');
+	Smilies::add($b, ':motor scooter:', '&#x1F6F5;');
+//  Smilies::add($b, ':manual wheelchair:', '&#x1F9BD;');
+//  Smilies::add($b, ':motorized wheelchair:', '&#x1F9BC;');
+//  Smilies::add($b, ':auto rickshaw:', '&#x1F6FA;');
+	Smilies::add($b, ':bicycle:', '&#x1F6B2;');
+	Smilies::add($b, ':kick scooter:', '&#x1F6F4;');
+	Smilies::add($b, ':skateboard:', '&#x1F6F9;');
+	Smilies::add($b, ':bus stop:', '&#x1F68F;');
+	Smilies::add($b, ':motorway:', '&#x1F6E3;');
+	Smilies::add($b, ':railway track:', '&#x1F6E4;');
+	Smilies::add($b, ':oil drum:', '&#x1F6E2;');
+	Smilies::add($b, ':fuel pump:', '&#x26FD;');
+	Smilies::add($b, ':police car light:', '&#x1F6A8;');
+	Smilies::add($b, ':horizontal traffic light:', '&#x1F6A5;');
+	Smilies::add($b, ':vertical traffic light:', '&#x1F6A6;');
+	Smilies::add($b, ':stop sign:', '&#x1F6D1;');
+	Smilies::add($b, ':construction:', '&#x1F6A7;');
 
 // transport-water
-	Smilies::add($b, ':anchor:', '&#x2693');
-	Smilies::add($b, ':sailboat:', '&#x26F5');
-	Smilies::add($b, ':canoe:', '&#x1F6F6');
-	Smilies::add($b, ':speedboat:', '&#x1F6A4');
-	Smilies::add($b, ':passenger ship:', '&#x1F6F3');
-	Smilies::add($b, ':ferry:', '&#x26F4');
-	Smilies::add($b, ':motor boat:', '&#x1F6E5');
-	Smilies::add($b, ':ship:', '&#x1F6A2');
+	Smilies::add($b, ':anchor:', '&#x2693;');
+	Smilies::add($b, ':sailboat:', '&#x26F5;');
+	Smilies::add($b, ':canoe:', '&#x1F6F6;');
+	Smilies::add($b, ':speedboat:', '&#x1F6A4;');
+	Smilies::add($b, ':passenger ship:', '&#x1F6F3;');
+	Smilies::add($b, ':ferry:', '&#x26F4;');
+	Smilies::add($b, ':motor boat:', '&#x1F6E5;');
+	Smilies::add($b, ':ship:', '&#x1F6A2;');
 
 // transport-air
-	Smilies::add($b, ':airplane:', '&#x2708');
-	Smilies::add($b, ':small airplane:', '&#x1F6E9');
-	Smilies::add($b, ':airplane departure:', '&#x1F6EB');
-	Smilies::add($b, ':airplane arrival:', '&#x1F6EC');
-	Smilies::add($b, ':parachute:', '&#x1FA82');
-	Smilies::add($b, ':seat:', '&#x1F4BA');
-	Smilies::add($b, ':helicopter:', '&#x1F681');
-	Smilies::add($b, ':suspension railway:', '&#x1F69F');
-	Smilies::add($b, ':mountain cableway:', '&#x1F6A0');
-	Smilies::add($b, ':aerial tramway:', '&#x1F6A1');
-	Smilies::add($b, ':satellite:', '&#x1F6F0');
-	Smilies::add($b, ':rocket:', '&#x1F680');
-	Smilies::add($b, ':flying saucer:', '&#x1F6F8');
+	Smilies::add($b, ':airplane:', '&#x2708;');
+	Smilies::add($b, ':small airplane:', '&#x1F6E9;');
+	Smilies::add($b, ':airplane departure:', '&#x1F6EB;');
+	Smilies::add($b, ':airplane arrival:', '&#x1F6EC;');
+	Smilies::add($b, ':parachute:', '&#x1FA82;');
+	Smilies::add($b, ':seat:', '&#x1F4BA;');
+	Smilies::add($b, ':helicopter:', '&#x1F681;');
+	Smilies::add($b, ':suspension railway:', '&#x1F69F;');
+	Smilies::add($b, ':mountain cableway:', '&#x1F6A0;');
+	Smilies::add($b, ':aerial tramway:', '&#x1F6A1;');
+	Smilies::add($b, ':satellite:', '&#x1F6F0;');
+	Smilies::add($b, ':rocket:', '&#x1F680;');
+	Smilies::add($b, ':flying saucer:', '&#x1F6F8;');
 
 // hotel
-	Smilies::add($b, ':bellhop bell:', '&#x1F6CE');
-	Smilies::add($b, ':luggage:', '&#x1F9F3');
+	Smilies::add($b, ':bellhop bell:', '&#x1F6CE;');
+	Smilies::add($b, ':luggage:', '&#x1F9F3;');
 
 // time
-	Smilies::add($b, ':hourglass done:', '&#x231B');
-	Smilies::add($b, ':hourglass not done:', '&#x23F3');
-	Smilies::add($b, ':watch:', '&#x231A');
-	Smilies::add($b, ':alarm clock:', '&#x23F0');
-	Smilies::add($b, ':stopwatch:', '&#x23F1');
-	Smilies::add($b, ':timer clock:', '&#x23F2');
-	Smilies::add($b, ':mantelpiece clock:', '&#x1F570');
-	Smilies::add($b, ':twelve o’clock:', '&#x1F55B');
-	Smilies::add($b, ':twelve-thirty:', '&#x1F567');
-	Smilies::add($b, ':one o’clock:', '&#x1F550');
-	Smilies::add($b, ':one-thirty:', '&#x1F55C');
-	Smilies::add($b, ':two o’clock:', '&#x1F551');
-	Smilies::add($b, ':two-thirty:', '&#x1F55D');
-	Smilies::add($b, ':three o’clock:', '&#x1F552');
-	Smilies::add($b, ':three-thirty:', '&#x1F55E');
-	Smilies::add($b, ':four o’clock:', '&#x1F553');
-	Smilies::add($b, ':four-thirty:', '&#x1F55F');
-	Smilies::add($b, ':five o’clock:', '&#x1F554');
-	Smilies::add($b, ':five-thirty:', '&#x1F560');
-	Smilies::add($b, ':six o’clock:', '&#x1F555');
-	Smilies::add($b, ':six-thirty:', '&#x1F561');
-	Smilies::add($b, ':seven o’clock:', '&#x1F556');
-	Smilies::add($b, ':seven-thirty:', '&#x1F562');
-	Smilies::add($b, ':eight o’clock:', '&#x1F557');
-	Smilies::add($b, ':eight-thirty:', '&#x1F563');
-	Smilies::add($b, ':nine o’clock:', '&#x1F558');
-	Smilies::add($b, ':nine-thirty:', '&#x1F564');
-	Smilies::add($b, ':ten o’clock:', '&#x1F559');
-	Smilies::add($b, ':ten-thirty:', '&#x1F565');
-	Smilies::add($b, ':eleven o’clock:', '&#x1F55A');
-	Smilies::add($b, ':eleven-thirty:', '&#x1F566');
+	Smilies::add($b, ':hourglass done:', '&#x231B;');
+	Smilies::add($b, ':hourglass not done:', '&#x23F3;');
+	Smilies::add($b, ':watch:', '&#x231A;');
+	Smilies::add($b, ':alarm clock:', '&#x23F0;');
+	Smilies::add($b, ':stopwatch:', '&#x23F1;');
+	Smilies::add($b, ':timer clock:', '&#x23F2;');
+	Smilies::add($b, ':mantelpiece clock:', '&#x1F570;');
+	Smilies::add($b, ':twelve o’clock:', '&#x1F55B;');
+	Smilies::add($b, ':twelve-thirty:', '&#x1F567;');
+	Smilies::add($b, ':one o’clock:', '&#x1F550;');
+	Smilies::add($b, ':one-thirty:', '&#x1F55C;');
+	Smilies::add($b, ':two o’clock:', '&#x1F551;');
+	Smilies::add($b, ':two-thirty:', '&#x1F55D;');
+	Smilies::add($b, ':three o’clock:', '&#x1F552;');
+	Smilies::add($b, ':three-thirty:', '&#x1F55E;');
+	Smilies::add($b, ':four o’clock:', '&#x1F553;');
+	Smilies::add($b, ':four-thirty:', '&#x1F55F;');
+	Smilies::add($b, ':five o’clock:', '&#x1F554;');
+	Smilies::add($b, ':five-thirty:', '&#x1F560;');
+	Smilies::add($b, ':six o’clock:', '&#x1F555;');
+	Smilies::add($b, ':six-thirty:', '&#x1F561;');
+	Smilies::add($b, ':seven o’clock:', '&#x1F556;');
+	Smilies::add($b, ':seven-thirty:', '&#x1F562;');
+	Smilies::add($b, ':eight o’clock:', '&#x1F557;');
+	Smilies::add($b, ':eight-thirty:', '&#x1F563;');
+	Smilies::add($b, ':nine o’clock:', '&#x1F558;');
+	Smilies::add($b, ':nine-thirty:', '&#x1F564;');
+	Smilies::add($b, ':ten o’clock:', '&#x1F559;');
+	Smilies::add($b, ':ten-thirty:', '&#x1F565;');
+	Smilies::add($b, ':eleven o’clock:', '&#x1F55A;');
+	Smilies::add($b, ':eleven-thirty:', '&#x1F566;');
 
 // sky & weather
-	Smilies::add($b, ':new moon:', '&#x1F311');
-	Smilies::add($b, ':waxing crescent moon:', '&#x1F312');
-	Smilies::add($b, ':first quarter moon:', '&#x1F313');
-	Smilies::add($b, ':waxing gibbous moon:', '&#x1F314');
-	Smilies::add($b, ':full moon:', '&#x1F315');
-	Smilies::add($b, ':waning gibbous moon:', '&#x1F316');
-	Smilies::add($b, ':last quarter moon:', '&#x1F317');
-	Smilies::add($b, ':waning crescent moon:', '&#x1F318');
-	Smilies::add($b, ':crescent moon:', '&#x1F319');
-	Smilies::add($b, ':new moon face:', '&#x1F31A');
-	Smilies::add($b, ':first quarter moon face:', '&#x1F31B');
-	Smilies::add($b, ':last quarter moon face:', '&#x1F31C');
-	Smilies::add($b, ':thermometer:', '&#x1F321');
-	Smilies::add($b, ':sun:', '&#x2600');
-	Smilies::add($b, ':full moon face:', '&#x1F31D');
-	Smilies::add($b, ':sun with face:', '&#x1F31E');
-	Smilies::add($b, ':ringed planet:', '&#x1FA90');
-	Smilies::add($b, ':star:', '&#x2B50');
-	Smilies::add($b, ':glowing star:', '&#x1F31F');
-	Smilies::add($b, ':shooting star:', '&#x1F320');
-	Smilies::add($b, ':milky way:', '&#x1F30C');
-	Smilies::add($b, ':cloud:', '&#x2601');
-	Smilies::add($b, ':sun behind cloud:', '&#x26C5');
-	Smilies::add($b, ':cloud with lightning and rain:', '&#x26C8');
-	Smilies::add($b, ':sun behind small cloud:', '&#x1F324');
-	Smilies::add($b, ':sun behind large cloud:', '&#x1F325');
-	Smilies::add($b, ':sun behind rain cloud:', '&#x1F326');
-	Smilies::add($b, ':cloud with rain:', '&#x1F327');
-	Smilies::add($b, ':cloud with snow:', '&#x1F328');
-	Smilies::add($b, ':cloud with lightning:', '&#x1F329');
-	Smilies::add($b, ':tornado:', '&#x1F32A');
-	Smilies::add($b, ':fog:', '&#x1F32B');
-	Smilies::add($b, ':wind face:', '&#x1F32C');
-	Smilies::add($b, ':cyclone:', '&#x1F300');
-	Smilies::add($b, ':rainbow:', '&#x1F308');
-	Smilies::add($b, ':closed umbrella:', '&#x1F302');
-	Smilies::add($b, ':umbrella:', '&#x2602');
-	Smilies::add($b, ':umbrella with rain drops:', '&#x2614');
-	Smilies::add($b, ':umbrella on ground:', '&#x26F1');
-	Smilies::add($b, ':high voltage:', '&#x26A1');
-	Smilies::add($b, ':snowflake:', '&#x2744');
-	Smilies::add($b, ':snowman:', '&#x2603');
-	Smilies::add($b, ':snowman without snow:', '&#x26C4');
-	Smilies::add($b, ':comet:', '&#x2604');
-	Smilies::add($b, ':fire:', '&#x1F525');
-	Smilies::add($b, ':droplet:', '&#x1F4A7');
-	Smilies::add($b, ':water wave:', '&#x1F30A');
+	Smilies::add($b, ':new moon:', '&#x1F311;');
+	Smilies::add($b, ':waxing crescent moon:', '&#x1F312;');
+	Smilies::add($b, ':first quarter moon:', '&#x1F313;');
+	Smilies::add($b, ':waxing gibbous moon:', '&#x1F314;');
+	Smilies::add($b, ':full moon:', '&#x1F315;');
+	Smilies::add($b, ':waning gibbous moon:', '&#x1F316;');
+	Smilies::add($b, ':last quarter moon:', '&#x1F317;');
+	Smilies::add($b, ':waning crescent moon:', '&#x1F318;');
+	Smilies::add($b, ':crescent moon:', '&#x1F319;');
+	Smilies::add($b, ':new moon face:', '&#x1F31A;');
+	Smilies::add($b, ':first quarter moon face:', '&#x1F31B;');
+	Smilies::add($b, ':last quarter moon face:', '&#x1F31C;');
+	Smilies::add($b, ':thermometer:', '&#x1F321;');
+	Smilies::add($b, ':sun:', '&#x2600;');
+	Smilies::add($b, ':full moon face:', '&#x1F31D;');
+	Smilies::add($b, ':sun with face:', '&#x1F31E;');
+	Smilies::add($b, ':ringed planet:', '&#x1FA90;');
+	Smilies::add($b, ':star:', '&#x2B50;');
+	Smilies::add($b, ':glowing star:', '&#x1F31F;');
+	Smilies::add($b, ':shooting star:', '&#x1F320;');
+	Smilies::add($b, ':milky way:', '&#x1F30C;');
+	Smilies::add($b, ':cloud:', '&#x2601;');
+	Smilies::add($b, ':sun behind cloud:', '&#x26C5;');
+	Smilies::add($b, ':cloud with lightning and rain:', '&#x26C8;');
+	Smilies::add($b, ':sun behind small cloud:', '&#x1F324;');
+	Smilies::add($b, ':sun behind large cloud:', '&#x1F325;');
+	Smilies::add($b, ':sun behind rain cloud:', '&#x1F326;');
+	Smilies::add($b, ':cloud with rain:', '&#x1F327;');
+	Smilies::add($b, ':cloud with snow:', '&#x1F328;');
+	Smilies::add($b, ':cloud with lightning:', '&#x1F329;');
+	Smilies::add($b, ':tornado:', '&#x1F32A;');
+	Smilies::add($b, ':fog:', '&#x1F32B;');
+	Smilies::add($b, ':wind face:', '&#x1F32C;');
+	Smilies::add($b, ':cyclone:', '&#x1F300;');
+	Smilies::add($b, ':rainbow:', '&#x1F308;');
+	Smilies::add($b, ':closed umbrella:', '&#x1F302;');
+	Smilies::add($b, ':umbrella:', '&#x2602;');
+	Smilies::add($b, ':umbrella with rain drops:', '&#x2614;');
+	Smilies::add($b, ':umbrella on ground:', '&#x26F1;');
+	Smilies::add($b, ':high voltage:', '&#x26A1;');
+	Smilies::add($b, ':snowflake:', '&#x2744;');
+	Smilies::add($b, ':snowman:', '&#x2603;');
+	Smilies::add($b, ':snowman without snow:', '&#x26C4;');
+	Smilies::add($b, ':comet:', '&#x2604;');
+	Smilies::add($b, ':fire:', '&#x1F525;');
+	Smilies::add($b, ':droplet:', '&#x1F4A7;');
+	Smilies::add($b, ':water wave:', '&#x1F30A;');
 
 // Activities
 // event
-	Smilies::add($b, ':jack-o-lantern:', '&#x1F383');
-	Smilies::add($b, ':Christmas tree:', '&#x1F384');
-	Smilies::add($b, ':fireworks:', '&#x1F386');
-	Smilies::add($b, ':sparkler:', '&#x1F387');
-	Smilies::add($b, ':firecracker:', '&#x1F9E8');
-	Smilies::add($b, ':sparkles:', '&#x2728');
-	Smilies::add($b, ':balloon:', '&#x1F388');
-	Smilies::add($b, ':party popper:', '&#x1F389');
-	Smilies::add($b, ':confetti ball:', '&#x1F38A');
-	Smilies::add($b, ':tanabata tree:', '&#x1F38B');
-	Smilies::add($b, ':pine decoration:', '&#x1F38D');
-	Smilies::add($b, ':Japanese dolls:', '&#x1F38E');
-	Smilies::add($b, ':carp streamer:', '&#x1F38F');
-	Smilies::add($b, ':wind chime:', '&#x1F390');
-	Smilies::add($b, ':moon viewing ceremony:', '&#x1F391');
-	Smilies::add($b, ':red envelope:', '&#x1F9E7');
-	Smilies::add($b, ':ribbon:', '&#x1F380');
-	Smilies::add($b, ':wrapped gift:', '&#x1F381');
-	Smilies::add($b, ':reminder ribbon:', '&#x1F397');
-	Smilies::add($b, ':admission tickets:', '&#x1F39F');
-	Smilies::add($b, ':ticket:', '&#x1F3AB');
+	Smilies::add($b, ':jack-o-lantern:', '&#x1F383;');
+	Smilies::add($b, ':Christmas tree:', '&#x1F384;');
+	Smilies::add($b, ':fireworks:', '&#x1F386;');
+	Smilies::add($b, ':sparkler:', '&#x1F387;');
+	Smilies::add($b, ':firecracker:', '&#x1F9E8;');
+	Smilies::add($b, ':sparkles:', '&#x2728;');
+	Smilies::add($b, ':balloon:', '&#x1F388;');
+	Smilies::add($b, ':party popper:', '&#x1F389;');
+	Smilies::add($b, ':confetti ball:', '&#x1F38A;');
+	Smilies::add($b, ':tanabata tree:', '&#x1F38B;');
+	Smilies::add($b, ':pine decoration:', '&#x1F38D;');
+	Smilies::add($b, ':Japanese dolls:', '&#x1F38E;');
+	Smilies::add($b, ':carp streamer:', '&#x1F38F;');
+	Smilies::add($b, ':wind chime:', '&#x1F390;');
+	Smilies::add($b, ':moon viewing ceremony:', '&#x1F391;');
+	Smilies::add($b, ':red envelope:', '&#x1F9E7;');
+	Smilies::add($b, ':ribbon:', '&#x1F380;');
+	Smilies::add($b, ':wrapped gift:', '&#x1F381;');
+	Smilies::add($b, ':reminder ribbon:', '&#x1F397;');
+	Smilies::add($b, ':admission tickets:', '&#x1F39F;');
+	Smilies::add($b, ':ticket:', '&#x1F3AB;');
 
 // award-medal
-	Smilies::add($b, ':military medal:', '&#x1F396');
-	Smilies::add($b, ':trophy:', '&#x1F3C6');
-	Smilies::add($b, ':sports medal:', '&#x1F3C5');
-	Smilies::add($b, ':1st place medal:', '&#x1F947');
-	Smilies::add($b, ':2nd place medal:', '&#x1F948');
-	Smilies::add($b, ':3rd place medal:', '&#x1F949');
+	Smilies::add($b, ':military medal:', '&#x1F396;');
+	Smilies::add($b, ':trophy:', '&#x1F3C6;');
+	Smilies::add($b, ':sports medal:', '&#x1F3C5;');
+	Smilies::add($b, ':1st place medal:', '&#x1F947;');
+	Smilies::add($b, ':2nd place medal:', '&#x1F948;');
+	Smilies::add($b, ':3rd place medal:', '&#x1F949;');
 
 // sport
-	Smilies::add($b, ':soccer ball:', '&#x26BD');
-	Smilies::add($b, ':baseball:', '&#x26BE');
-	Smilies::add($b, ':softball:', '&#x1F94E');
-	Smilies::add($b, ':basketball:', '&#x1F3C0');
-	Smilies::add($b, ':volleyball:', '&#x1F3D0');
-	Smilies::add($b, ':american football:', '&#x1F3C8');
+	Smilies::add($b, ':soccer ball:', '&#x26BD;');
+	Smilies::add($b, ':baseball:', '&#x26BE;');
+	Smilies::add($b, ':softball:', '&#x1F94E;');
+	Smilies::add($b, ':basketball:', '&#x1F3C0;');
+	Smilies::add($b, ':volleyball:', '&#x1F3D0;');
+	Smilies::add($b, ':american football:', '&#x1F3C8;');
 	Smilies::add($b, ':football:', '&#x1F3C8;');
-	Smilies::add($b, ':rugby football:', '&#x1F3C9');
-	Smilies::add($b, ':tennis:', '&#x1F3BE');
-	Smilies::add($b, ':flying disc:', '&#x1F94F');
-	Smilies::add($b, ':bowling:', '&#x1F3B3');
-	Smilies::add($b, ':cricket game:', '&#x1F3CF');
-	Smilies::add($b, ':field hockey:', '&#x1F3D1');
-	Smilies::add($b, ':ice hockey:', '&#x1F3D2');
-	Smilies::add($b, ':lacrosse:', '&#x1F94D');
-	Smilies::add($b, ':ping pong:', '&#x1F3D3');
-	Smilies::add($b, ':badminton:', '&#x1F3F8');
-	Smilies::add($b, ':boxing glove:', '&#x1F94A');
-	Smilies::add($b, ':martial arts uniform:', '&#x1F94B');
-	Smilies::add($b, ':goal net:', '&#x1F945');
-	Smilies::add($b, ':flag in hole:', '&#x26F3');
-	Smilies::add($b, ':ice skate:', '&#x26F8');
-	Smilies::add($b, ':fishing pole:', '&#x1F3A3');
-//	Smilies::add($b, ':diving mask:', '&#x1F93F');
-	Smilies::add($b, ':running shirt:', '&#x1F3BD');
-	Smilies::add($b, ':skis:', '&#x1F3BF');
-	Smilies::add($b, ':sled:', '&#x1F6F7');
-	Smilies::add($b, ':curling stone:', '&#x1F94C');
+	Smilies::add($b, ':rugby football:', '&#x1F3C9;');
+	Smilies::add($b, ':tennis:', '&#x1F3BE;');
+	Smilies::add($b, ':flying disc:', '&#x1F94F;');
+	Smilies::add($b, ':bowling:', '&#x1F3B3;');
+	Smilies::add($b, ':cricket game:', '&#x1F3CF;');
+	Smilies::add($b, ':field hockey:', '&#x1F3D1;');
+	Smilies::add($b, ':ice hockey:', '&#x1F3D2;');
+	Smilies::add($b, ':lacrosse:', '&#x1F94D;');
+	Smilies::add($b, ':ping pong:', '&#x1F3D3;');
+	Smilies::add($b, ':badminton:', '&#x1F3F8;');
+	Smilies::add($b, ':boxing glove:', '&#x1F94A;');
+	Smilies::add($b, ':martial arts uniform:', '&#x1F94B;');
+	Smilies::add($b, ':goal net:', '&#x1F945;');
+	Smilies::add($b, ':flag in hole:', '&#x26F3;');
+	Smilies::add($b, ':ice skate:', '&#x26F8;');
+	Smilies::add($b, ':fishing pole:', '&#x1F3A3;');
+//  Smilies::add($b, ':diving mask:', '&#x1F93F;');
+	Smilies::add($b, ':running shirt:', '&#x1F3BD;');
+	Smilies::add($b, ':skis:', '&#x1F3BF;');
+	Smilies::add($b, ':sled:', '&#x1F6F7;');
+	Smilies::add($b, ':curling stone:', '&#x1F94C;');
 	Smilies::add($b, ':cycling:', '&#x1F6B4;');
 	Smilies::add($b, ':darts:', '&#x1F3AF;');
 	Smilies::add($b, ':fencing:', '&#x1F93A;');
 	Smilies::add($b, ':juggling:', '&#x1F939;');
-//	Smilies::add($b, ':skipping:', '&#x;');
-//	Smilies::add($b, ':archery:', '&#x;');
+//  Smilies::add($b, ':skipping:', '&#x;');
+//  Smilies::add($b, ':archery:', '&#x;');
 	Smilies::add($b, ':surfing:', '&#x1F3C4;');
 	Smilies::add($b, ':snooker:', '&#x1F3B1;');
 	Smilies::add($b, ':horseriding:', '&#x1F3C7;');
 
 // game
-	Smilies::add($b, ':direct hit:', '&#x1F3AF');
-	Smilies::add($b, ':yo-yo:', '&#x1FA80');
-	Smilies::add($b, ':kite:', '&#x1FA81');
-	Smilies::add($b, ':pool 8 ball:', '&#x1F3B1');
-	Smilies::add($b, ':crystal ball:', '&#x1F52E');
-	Smilies::add($b, ':nazar amulet:', '&#x1F9FF');
-	Smilies::add($b, ':video game:', '&#x1F3AE');
-	Smilies::add($b, ':joystick:', '&#x1F579');
-	Smilies::add($b, ':slot machine:', '&#x1F3B0');
-	Smilies::add($b, ':game die:', '&#x1F3B2');
-	Smilies::add($b, ':puzzle piece:', '&#x1F9E9');
-	Smilies::add($b, ':teddy bear:', '&#x1F9F8');
-	Smilies::add($b, ':spade suit:', '&#x2660');
-	Smilies::add($b, ':heart suit:', '&#x2665');
-	Smilies::add($b, ':diamond suit:', '&#x2666');
-	Smilies::add($b, ':club suit:', '&#x2663');
-	Smilies::add($b, ':chess pawn:', '&#x265F');
-	Smilies::add($b, ':joker:', '&#x1F0CF');
-	Smilies::add($b, ':mahjong red dragon:', '&#x1F004');
-	Smilies::add($b, ':flower playing cards:', '&#x1F3B4');
+	Smilies::add($b, ':direct hit:', '&#x1F3AF;');
+	Smilies::add($b, ':yo-yo:', '&#x1FA80;');
+	Smilies::add($b, ':kite:', '&#x1FA81;');
+	Smilies::add($b, ':pool 8 ball:', '&#x1F3B1;');
+	Smilies::add($b, ':crystal ball:', '&#x1F52E;');
+	Smilies::add($b, ':nazar amulet:', '&#x1F9FF;');
+	Smilies::add($b, ':video game:', '&#x1F3AE;');
+	Smilies::add($b, ':joystick:', '&#x1F579;');
+	Smilies::add($b, ':slot machine:', '&#x1F3B0;');
+	Smilies::add($b, ':game die:', '&#x1F3B2;');
+	Smilies::add($b, ':puzzle piece:', '&#x1F9E9;');
+	Smilies::add($b, ':teddy bear:', '&#x1F9F8;');
+	Smilies::add($b, ':spade suit:', '&#x2660;');
+	Smilies::add($b, ':heart suit:', '&#x2665;');
+	Smilies::add($b, ':diamond suit:', '&#x2666;');
+	Smilies::add($b, ':club suit:', '&#x2663;');
+	Smilies::add($b, ':chess pawn:', '&#x265F;');
+	Smilies::add($b, ':joker:', '&#x1F0CF;');
+	Smilies::add($b, ':mahjong red dragon:', '&#x1F004;');
+	Smilies::add($b, ':flower playing cards:', '&#x1F3B4;');
 
 // arts & crafts
-	Smilies::add($b, ':performing arts:', '&#x1F3AD');
-	Smilies::add($b, ':framed picture:', '&#x1F5BC');
-	Smilies::add($b, ':artist palette:', '&#x1F3A8');
-	Smilies::add($b, ':thread:', '&#x1F9F5');
-	Smilies::add($b, ':yarn:', '&#x1F9F6');
+	Smilies::add($b, ':performing arts:', '&#x1F3AD;');
+	Smilies::add($b, ':framed picture:', '&#x1F5BC;');
+	Smilies::add($b, ':artist palette:', '&#x1F3A8;');
+	Smilies::add($b, ':thread:', '&#x1F9F5;');
+	Smilies::add($b, ':yarn:', '&#x1F9F6;');
 
 // Objects
 // clothing
-	Smilies::add($b, ':glasses:', '&#x1F453');
-	Smilies::add($b, ':sunglasses:', '&#x1F576');
-	Smilies::add($b, ':goggles:', '&#x1F97D');
-	Smilies::add($b, ':lab coat:', '&#x1F97C');
-	Smilies::add($b, ':safety vest:', '&#x1F9BA');
-	Smilies::add($b, ':necktie:', '&#x1F454');
-	Smilies::add($b, ':t-shirt:', '&#x1F455');
-	Smilies::add($b, ':jeans:', '&#x1F456');
-	Smilies::add($b, ':scarf:', '&#x1F9E3');
-	Smilies::add($b, ':gloves:', '&#x1F9E4');
-	Smilies::add($b, ':coat:', '&#x1F9E5');
-	Smilies::add($b, ':socks:', '&#x1F9E6');
-	Smilies::add($b, ':dress:', '&#x1F457');
-	Smilies::add($b, ':kimono:', '&#x1F458');
-	Smilies::add($b, ':sari:', '&#x1F97B');
-	Smilies::add($b, ':one-piece swimsuit:', '&#x1FA71');
-	Smilies::add($b, ':briefs:', '&#x1FA72');
-	Smilies::add($b, ':shorts:', '&#x1FA73');
-	Smilies::add($b, ':bikini:', '&#x1F459');
-	Smilies::add($b, ':woman’s clothes:', '&#x1F45A');
-	Smilies::add($b, ':purse:', '&#x1F45B');
-	Smilies::add($b, ':handbag:', '&#x1F45C');
-	Smilies::add($b, ':clutch bag:', '&#x1F45D');
-	Smilies::add($b, ':shopping bags:', '&#x1F6CD');
-	Smilies::add($b, ':backpack:', '&#x1F392');
-	Smilies::add($b, ':man’s shoe:', '&#x1F45E');
-	Smilies::add($b, ':running shoe:', '&#x1F45F');
-	Smilies::add($b, ':hiking boot:', '&#x1F97E');
-	Smilies::add($b, ':flat shoe:', '&#x1F97F');
-	Smilies::add($b, ':high-heeled shoe:', '&#x1F460');
-	Smilies::add($b, ':woman’s sandal:', '&#x1F461');
-//	Smilies::add($b, ':ballet shoes:', '&#x1FA70');
-	Smilies::add($b, ':woman’s boot:', '&#x1F462');
-	Smilies::add($b, ':crown:', '&#x1F451');
-	Smilies::add($b, ':woman’s hat:', '&#x1F452');
-	Smilies::add($b, ':top hat:', '&#x1F3A9');
-	Smilies::add($b, ':graduation cap:', '&#x1F393');
-	Smilies::add($b, ':billed cap:', '&#x1F9E2');
-	Smilies::add($b, ':rescue worker’s helmet:', '&#x26D1');
-	Smilies::add($b, ':prayer beads:', '&#x1F4FF');
-	Smilies::add($b, ':lipstick:', '&#x1F484');
-	Smilies::add($b, ':ring:', '&#x1F48D');
-	Smilies::add($b, ':gem stone:', '&#x1F48E');
+	Smilies::add($b, ':glasses:', '&#x1F453;');
+	Smilies::add($b, ':sunglasses:', '&#x1F576;');
+	Smilies::add($b, ':goggles:', '&#x1F97D;');
+	Smilies::add($b, ':lab coat:', '&#x1F97C;');
+	Smilies::add($b, ':safety vest:', '&#x1F9BA;');
+	Smilies::add($b, ':necktie:', '&#x1F454;');
+	Smilies::add($b, ':t-shirt:', '&#x1F455;');
+	Smilies::add($b, ':jeans:', '&#x1F456;');
+	Smilies::add($b, ':scarf:', '&#x1F9E3;');
+	Smilies::add($b, ':gloves:', '&#x1F9E4;');
+	Smilies::add($b, ':coat:', '&#x1F9E5;');
+	Smilies::add($b, ':socks:', '&#x1F9E6;');
+	Smilies::add($b, ':dress:', '&#x1F457;');
+	Smilies::add($b, ':kimono:', '&#x1F458;');
+	Smilies::add($b, ':sari:', '&#x1F97B;');
+	Smilies::add($b, ':one-piece swimsuit:', '&#x1FA71;');
+	Smilies::add($b, ':briefs:', '&#x1FA72;');
+	Smilies::add($b, ':shorts:', '&#x1FA73;');
+	Smilies::add($b, ':bikini:', '&#x1F459;');
+	Smilies::add($b, ':woman’s clothes:', '&#x1F45A;');
+	Smilies::add($b, ':purse:', '&#x1F45B;');
+	Smilies::add($b, ':handbag:', '&#x1F45C;');
+	Smilies::add($b, ':clutch bag:', '&#x1F45D;');
+	Smilies::add($b, ':shopping bags:', '&#x1F6CD;');
+	Smilies::add($b, ':backpack:', '&#x1F392;');
+	Smilies::add($b, ':man’s shoe:', '&#x1F45E;');
+	Smilies::add($b, ':running shoe:', '&#x1F45F;');
+	Smilies::add($b, ':hiking boot:', '&#x1F97E;');
+	Smilies::add($b, ':flat shoe:', '&#x1F97F;');
+	Smilies::add($b, ':high-heeled shoe:', '&#x1F460;');
+	Smilies::add($b, ':woman’s sandal:', '&#x1F461;');
+//	Smilies::add($b, ':ballet shoes:', '&#x1FA70;');
+	Smilies::add($b, ':woman’s boot:', '&#x1F462;');
+	Smilies::add($b, ':crown:', '&#x1F451;');
+	Smilies::add($b, ':woman’s hat:', '&#x1F452;');
+	Smilies::add($b, ':top hat:', '&#x1F3A9;');
+	Smilies::add($b, ':graduation cap:', '&#x1F393;');
+	Smilies::add($b, ':billed cap:', '&#x1F9E2;');
+	Smilies::add($b, ':rescue worker’s helmet:', '&#x26D1;');
+	Smilies::add($b, ':prayer beads:', '&#x1F4FF;');
+	Smilies::add($b, ':lipstick:', '&#x1F484;');
+	Smilies::add($b, ':ring:', '&#x1F48D;');
+	Smilies::add($b, ':gem stone:', '&#x1F48E;');
 
 // sound
-	Smilies::add($b, ':muted speaker:', '&#x1F507');
-	Smilies::add($b, ':speaker low volume:', '&#x1F508');
-	Smilies::add($b, ':speaker medium volume:', '&#x1F509');
-	Smilies::add($b, ':speaker high volume:', '&#x1F50A');
-	Smilies::add($b, ':loudspeaker:', '&#x1F4E2');
-	Smilies::add($b, ':megaphone:', '&#x1F4E3');
-	Smilies::add($b, ':postal horn:', '&#x1F4EF');
-	Smilies::add($b, ':bell:', '&#x1F514');
-	Smilies::add($b, ':bell with slash:', '&#x1F515');
+	Smilies::add($b, ':muted speaker:', '&#x1F507;');
+	Smilies::add($b, ':speaker low volume:', '&#x1F508;');
+	Smilies::add($b, ':speaker medium volume:', '&#x1F509;');
+	Smilies::add($b, ':speaker high volume:', '&#x1F50A;');
+	Smilies::add($b, ':loudspeaker:', '&#x1F4E2;');
+	Smilies::add($b, ':megaphone:', '&#x1F4E3;');
+	Smilies::add($b, ':postal horn:', '&#x1F4EF;');
+	Smilies::add($b, ':bell:', '&#x1F514;');
+	Smilies::add($b, ':bell with slash:', '&#x1F515;');
 
 // musik
-	Smilies::add($b, ':musical score:', '&#x1F3BC');
-	Smilies::add($b, ':musical note:', '&#x1F3B5');
-	Smilies::add($b, ':musical notes:', '&#x1F3B6');
-	Smilies::add($b, ':studio microphone:', '&#x1F399');
-	Smilies::add($b, ':level slider:', '&#x1F39A');
-	Smilies::add($b, ':control knobs:', '&#x1F39B');
-	Smilies::add($b, ':microphone:', '&#x1F3A4');
-	Smilies::add($b, ':headphone:', '&#x1F3A7');
-	Smilies::add($b, ':radio:', '&#x1F4FB');    
+	Smilies::add($b, ':musical score:', '&#x1F3BC;');
+	Smilies::add($b, ':musical note:', '&#x1F3B5;');
+	Smilies::add($b, ':musical notes:', '&#x1F3B6;');
+	Smilies::add($b, ':studio microphone:', '&#x1F399;');
+	Smilies::add($b, ':level slider:', '&#x1F39A;');
+	Smilies::add($b, ':control knobs:', '&#x1F39B;');
+	Smilies::add($b, ':microphone:', '&#x1F3A4;');
+	Smilies::add($b, ':headphone:', '&#x1F3A7;');
+	Smilies::add($b, ':radio:', '&#x1F4FB;');
 
 // musical-instrument
-	Smilies::add($b, ':saxophone:', '&#x1F3B7');
-	Smilies::add($b, ':guitar:', '&#x1F3B8');
-	Smilies::add($b, ':musical keyboard:', '&#x1F3B9');
-	Smilies::add($b, ':trumpet:', '&#x1F3BA');
-	Smilies::add($b, ':violin:', '&#x1F3BB');
-//  Smilies::add($b, ':banjo:', '&#x1FA95');
-	Smilies::add($b, ':drum:', '&#x1F941');
+    Smilies::add($b, ':saxophone:', '&#x1F3B7;');
+    Smilies::add($b, ':guitar:', '&#x1F3B8;');
+    Smilies::add($b, ':musical keyboard:', '&#x1F3B9;');
+    Smilies::add($b, ':trumpet:', '&#x1F3BA;');
+    Smilies::add($b, ':violin:', '&#x1F3BB;');
+//  Smilies::add($b, ':banjo:', '&#x1FA95;');
+    Smilies::add($b, ':drum:', '&#x1F941;');
 
 // phone
-	Smilies::add($b, ':mobile phone:', '&#x1F4F1');
-	Smilies::add($b, ':mobile phone with arrow:', '&#x1F4F2');
-	Smilies::add($b, ':telephone:', '&#x260E');
-	Smilies::add($b, ':telephone receiver:', '&#x1F4DE');
-	Smilies::add($b, ':pager:', '&#x1F4DF');
-	Smilies::add($b, ':fax machine:', '&#x1F4E0');
+    Smilies::add($b, ':mobile phone:', '&#x1F4F1;');
+    Smilies::add($b, ':mobile phone with arrow:', '&#x1F4F2;');
+    Smilies::add($b, ':telephone:', '&#x260E;');
+    Smilies::add($b, ':telephone receiver:', '&#x1F4DE;');
+    Smilies::add($b, ':pager:', '&#x1F4DF;');
+    Smilies::add($b, ':fax machine:', '&#x1F4E0;');
 
 // computer
-	Smilies::add($b, ':battery:', '&#x1F50B');
-	Smilies::add($b, ':electric plug:', '&#x1F50C');
-	Smilies::add($b, ':laptop:', '&#x1F4BB');
-	Smilies::add($b, ':desktop computer:', '&#x1F5A5');
-	Smilies::add($b, ':printer:', '&#x1F5A8');
-	Smilies::add($b, ':keyboard:', '&#x2328');
-	Smilies::add($b, ':computer mouse:', '&#x1F5B1');
-	Smilies::add($b, ':trackball:', '&#x1F5B2');
-	Smilies::add($b, ':computer disk:', '&#x1F4BD');
-	Smilies::add($b, ':floppy disk:', '&#x1F4BE');
-	Smilies::add($b, ':optical disk:', '&#x1F4BF');
-	Smilies::add($b, ':dvd:', '&#x1F4C0');
-	Smilies::add($b, ':abacus:', '&#x1F9EE');
+    Smilies::add($b, ':battery:', '&#x1F50B;');
+    Smilies::add($b, ':electric plug:', '&#x1F50C;');
+    Smilies::add($b, ':laptop:', '&#x1F4BB;');
+    Smilies::add($b, ':desktop computer:', '&#x1F5A5;');
+    Smilies::add($b, ':printer:', '&#x1F5A8;');
+    Smilies::add($b, ':keyboard:', '&#x2328;');
+    Smilies::add($b, ':computer mouse:', '&#x1F5B1;');
+    Smilies::add($b, ':trackball:', '&#x1F5B2;');
+    Smilies::add($b, ':computer disk:', '&#x1F4BD;');
+    Smilies::add($b, ':floppy disk:', '&#x1F4BE;');
+    Smilies::add($b, ':optical disk:', '&#x1F4BF;');
+    Smilies::add($b, ':dvd:', '&#x1F4C0;');
+    Smilies::add($b, ':abacus:', '&#x1F9EE;');
 
 // light & video
-	Smilies::add($b, ':movie camera:', '&#x1F3A5');
-	Smilies::add($b, ':film frames:', '&#x1F39E');
-	Smilies::add($b, ':film projector:', '&#x1F4FD');
-	Smilies::add($b, ':clapper board:', '&#x1F3AC');
-	Smilies::add($b, ':television:', '&#x1F4FA');
-	Smilies::add($b, ':camera:', '&#x1F4F7');
-	Smilies::add($b, ':camera with flash:', '&#x1F4F8');
-	Smilies::add($b, ':video camera:', '&#x1F4F9');
-	Smilies::add($b, ':videocassette:', '&#x1F4FC');
-	Smilies::add($b, ':magnifying glass tilted left:', '&#x1F50D');
-	Smilies::add($b, ':magnifying glass tilted right:', '&#x1F50E');
-	Smilies::add($b, ':candle:', '&#x1F56F');
-	Smilies::add($b, ':light bulb:', '&#x1F4A1');
-	Smilies::add($b, ':flashlight:', '&#x1F526');
-	Smilies::add($b, ':red paper lantern:', '&#x1F3EE');
-//	Smilies::add($b, ':diya lamp:', '&#x1FA94');
+	Smilies::add($b, ':movie camera:', '&#x1F3A5;');
+	Smilies::add($b, ':film frames:', '&#x1F39E;');
+	Smilies::add($b, ':film projector:', '&#x1F4FD;');
+	Smilies::add($b, ':clapper board:', '&#x1F3AC;');
+	Smilies::add($b, ':television:', '&#x1F4FA;');
+	Smilies::add($b, ':camera:', '&#x1F4F7;');
+	Smilies::add($b, ':camera with flash:', '&#x1F4F8;');
+	Smilies::add($b, ':video camera:', '&#x1F4F9;');
+	Smilies::add($b, ':videocassette:', '&#x1F4FC;');
+	Smilies::add($b, ':magnifying glass tilted left:', '&#x1F50D;');
+	Smilies::add($b, ':magnifying glass tilted right:', '&#x1F50E;');
+	Smilies::add($b, ':candle:', '&#x1F56F;');
+	Smilies::add($b, ':light bulb:', '&#x1F4A1;');
+	Smilies::add($b, ':flashlight:', '&#x1F526;');
+	Smilies::add($b, ':red paper lantern:', '&#x1F3EE;');
+//  Smilies::add($b, ':diya lamp:', '&#x1FA94;');
 
 // book-paper
-	Smilies::add($b, ':notebook with decorative cover:', '&#x1F4D4');
-	Smilies::add($b, ':closed book:', '&#x1F4D5');
-	Smilies::add($b, ':open book:', '&#x1F4D6');
-	Smilies::add($b, ':green book:', '&#x1F4D7');
-	Smilies::add($b, ':blue book:', '&#x1F4D8');
-	Smilies::add($b, ':orange book:', '&#x1F4D9');
-	Smilies::add($b, ':books:', '&#x1F4DA');
-	Smilies::add($b, ':notebook:', '&#x1F4D3');
-	Smilies::add($b, ':ledger:', '&#x1F4D2');
-	Smilies::add($b, ':page with curl:', '&#x1F4C3');
-	Smilies::add($b, ':scroll:', '&#x1F4DC');
-	Smilies::add($b, ':page facing up:', '&#x1F4C4');
-	Smilies::add($b, ':newspaper:', '&#x1F4F0');
-	Smilies::add($b, ':rolled-up newspaper:', '&#x1F5DE');
-	Smilies::add($b, ':bookmark tabs:', '&#x1F4D1');
-	Smilies::add($b, ':bookmark:', '&#x1F516');
-	Smilies::add($b, ':label:', '&#x1F3F7');
+	Smilies::add($b, ':notebook with decorative cover:', '&#x1F4D4;');
+	Smilies::add($b, ':closed book:', '&#x1F4D5;');
+	Smilies::add($b, ':open book:', '&#x1F4D6;');
+	Smilies::add($b, ':green book:', '&#x1F4D7;');
+	Smilies::add($b, ':blue book:', '&#x1F4D8;');
+	Smilies::add($b, ':orange book:', '&#x1F4D9;');
+	Smilies::add($b, ':books:', '&#x1F4DA;');
+	Smilies::add($b, ':notebook:', '&#x1F4D3;');
+	Smilies::add($b, ':ledger:', '&#x1F4D2;');
+	Smilies::add($b, ':page with curl:', '&#x1F4C3;');
+	Smilies::add($b, ':scroll:', '&#x1F4DC;');
+	Smilies::add($b, ':page facing up:', '&#x1F4C4;');
+	Smilies::add($b, ':newspaper:', '&#x1F4F0;');
+	Smilies::add($b, ':rolled-up newspaper:', '&#x1F5DE;');
+	Smilies::add($b, ':bookmark tabs:', '&#x1F4D1;');
+	Smilies::add($b, ':bookmark:', '&#x1F516;');
+	Smilies::add($b, ':label:', '&#x1F3F7;');
 
 // money
-	Smilies::add($b, ':money bag:', '&#x1F4B0');
-	Smilies::add($b, ':yen banknote:', '&#x1F4B4');
-	Smilies::add($b, ':dollar banknote:', '&#x1F4B5');
-	Smilies::add($b, ':euro banknote:', '&#x1F4B6');
-	Smilies::add($b, ':pound banknote:', '&#x1F4B7');
-	Smilies::add($b, ':money with wings:', '&#x1F4B8');
-	Smilies::add($b, ':credit card:', '&#x1F4B3');
-	Smilies::add($b, ':receipt:', '&#x1F9FE');
-	Smilies::add($b, ':chart increasing with yen:', '&#x1F4B9');
+	Smilies::add($b, ':money bag:', '&#x1F4B0;');
+	Smilies::add($b, ':yen banknote:', '&#x1F4B4;');
+	Smilies::add($b, ':dollar banknote:', '&#x1F4B5;');
+	Smilies::add($b, ':euro banknote:', '&#x1F4B6;');
+	Smilies::add($b, ':pound banknote:', '&#x1F4B7;');
+	Smilies::add($b, ':money with wings:', '&#x1F4B8;');
+	Smilies::add($b, ':credit card:', '&#x1F4B3;');
+	Smilies::add($b, ':receipt:', '&#x1F9FE;');
+	Smilies::add($b, ':chart increasing with yen:', '&#x1F4B9;');
 
 // mail
-	Smilies::add($b, ':envelope:', '&#x2709');
-	Smilies::add($b, ':e-mail:', '&#x1F4E7');
-	Smilies::add($b, ':incoming envelope:', '&#x1F4E8');
-	Smilies::add($b, ':envelope with arrow:', '&#x1F4E9');
-	Smilies::add($b, ':outbox tray:', '&#x1F4E4');
-	Smilies::add($b, ':inbox tray:', '&#x1F4E5');
-	Smilies::add($b, ':package:', '&#x1F4E6');
-	Smilies::add($b, ':closed mailbox with raised flag:', '&#x1F4EB');
-	Smilies::add($b, ':closed mailbox with lowered flag:', '&#x1F4EA');
-	Smilies::add($b, ':open mailbox with raised flag:', '&#x1F4EC');
-	Smilies::add($b, ':open mailbox with lowered flag:', '&#x1F4ED');
-	Smilies::add($b, ':postbox:', '&#x1F4EE');
-	Smilies::add($b, ':ballot box with ballot:', '&#x1F5F3');
+	Smilies::add($b, ':envelope:', '&#x2709;');
+	Smilies::add($b, ':e-mail:', '&#x1F4E7;');
+	Smilies::add($b, ':incoming envelope:', '&#x1F4E8;');
+	Smilies::add($b, ':envelope with arrow:', '&#x1F4E9;');
+	Smilies::add($b, ':outbox tray:', '&#x1F4E4;');
+	Smilies::add($b, ':inbox tray:', '&#x1F4E5;');
+	Smilies::add($b, ':package:', '&#x1F4E6;');
+	Smilies::add($b, ':closed mailbox with raised flag:', '&#x1F4EB;');
+	Smilies::add($b, ':closed mailbox with lowered flag:', '&#x1F4EA;');
+	Smilies::add($b, ':open mailbox with raised flag:', '&#x1F4EC;');
+	Smilies::add($b, ':open mailbox with lowered flag:', '&#x1F4ED;');
+	Smilies::add($b, ':postbox:', '&#x1F4EE;');
+	Smilies::add($b, ':ballot box with ballot:', '&#x1F5F3;');
 
 // writing
-	Smilies::add($b, ':pencil:', '&#x270F');
-	Smilies::add($b, ':black nib:', '&#x2712');
-	Smilies::add($b, ':fountain pen:', '&#x1F58B');
-	Smilies::add($b, ':pen:', '&#x1F58A');
-	Smilies::add($b, ':paintbrush:', '&#x1F58C');
-	Smilies::add($b, ':crayon:', '&#x1F58D');
-	Smilies::add($b, ':memo:', '&#x1F4DD');
+	Smilies::add($b, ':pencil:', '&#x270F;');
+	Smilies::add($b, ':black nib:', '&#x2712;');
+	Smilies::add($b, ':fountain pen:', '&#x1F58B;');
+	Smilies::add($b, ':pen:', '&#x1F58A;');
+	Smilies::add($b, ':paintbrush:', '&#x1F58C;');
+	Smilies::add($b, ':crayon:', '&#x1F58D;');
+	Smilies::add($b, ':memo:', '&#x1F4DD;');
 
 // office
-	Smilies::add($b, ':briefcase:', '&#x1F4BC');
-	Smilies::add($b, ':file folder:', '&#x1F4C1');
-	Smilies::add($b, ':open file folder:', '&#x1F4C2');
-	Smilies::add($b, ':card index dividers:', '&#x1F5C2');
-	Smilies::add($b, ':calendar:', '&#x1F4C5');
-	Smilies::add($b, ':tear-off calendar:', '&#x1F4C6');
-	Smilies::add($b, ':spiral notepad:', '&#x1F5D2');
-	Smilies::add($b, ':spiral calendar:', '&#x1F5D3');
-	Smilies::add($b, ':card index:', '&#x1F4C7');
-	Smilies::add($b, ':chart increasing:', '&#x1F4C8');
-	Smilies::add($b, ':chart decreasing:', '&#x1F4C9');
-	Smilies::add($b, ':bar chart:', '&#x1F4CA');
-	Smilies::add($b, ':clipboard:', '&#x1F4CB');
-	Smilies::add($b, ':pushpin:', '&#x1F4CC');
-	Smilies::add($b, ':round pushpin:', '&#x1F4CD');
-	Smilies::add($b, ':paperclip:', '&#x1F4CE');
-	Smilies::add($b, ':linked paperclips:', '&#x1F587');
-	Smilies::add($b, ':straight ruler:', '&#x1F4CF');
-	Smilies::add($b, ':triangular ruler:', '&#x1F4D0');
-	Smilies::add($b, ':scissors:', '&#x2702');
-	Smilies::add($b, ':card file box:', '&#x1F5C3');
-	Smilies::add($b, ':file cabinet:', '&#x1F5C4');
-	Smilies::add($b, ':wastebasket:', '&#x1F5D1');
+	Smilies::add($b, ':briefcase:', '&#x1F4BC;');
+	Smilies::add($b, ':file folder:', '&#x1F4C1;');
+	Smilies::add($b, ':open file folder:', '&#x1F4C2;');
+	Smilies::add($b, ':card index dividers:', '&#x1F5C2;');
+	Smilies::add($b, ':calendar:', '&#x1F4C5;');
+	Smilies::add($b, ':tear-off calendar:', '&#x1F4C6;');
+	Smilies::add($b, ':spiral notepad:', '&#x1F5D2;');
+	Smilies::add($b, ':spiral calendar:', '&#x1F5D3;');
+	Smilies::add($b, ':card index:', '&#x1F4C7;');
+	Smilies::add($b, ':chart increasing:', '&#x1F4C8;');
+	Smilies::add($b, ':chart decreasing:', '&#x1F4C9;');
+	Smilies::add($b, ':bar chart:', '&#x1F4CA;');
+	Smilies::add($b, ':clipboard:', '&#x1F4CB;');
+	Smilies::add($b, ':pushpin:', '&#x1F4CC;');
+	Smilies::add($b, ':round pushpin:', '&#x1F4CD;');
+	Smilies::add($b, ':paperclip:', '&#x1F4CE;');
+	Smilies::add($b, ':linked paperclips:', '&#x1F587;');
+	Smilies::add($b, ':straight ruler:', '&#x1F4CF;');
+	Smilies::add($b, ':triangular ruler:', '&#x1F4D0;');
+	Smilies::add($b, ':scissors:', '&#x2702;');
+	Smilies::add($b, ':card file box:', '&#x1F5C3;');
+	Smilies::add($b, ':file cabinet:', '&#x1F5C4;');
+	Smilies::add($b, ':wastebasket:', '&#x1F5D1;');
 
 // lock
-	Smilies::add($b, ':locked:', '&#x1F512');
-	Smilies::add($b, ':unlocked:', '&#x1F513');
-	Smilies::add($b, ':locked with pen:', '&#x1F50F');
-	Smilies::add($b, ':locked with key:', '&#x1F510');
-	Smilies::add($b, ':key:', '&#x1F511');
-	Smilies::add($b, ':old key:', '&#x1F5DD');
+	Smilies::add($b, ':locked:', '&#x1F512;');
+	Smilies::add($b, ':unlocked:', '&#x1F513;');
+	Smilies::add($b, ':locked with pen:', '&#x1F50F;');
+	Smilies::add($b, ':locked with key:', '&#x1F510;');
+	Smilies::add($b, ':key:', '&#x1F511;');
+	Smilies::add($b, ':old key:', '&#x1F5DD;');
 
 // tool
-	Smilies::add($b, ':hammer:', '&#x1F528');
-//	Smilies::add($b, ':axe:', '&#x1FA93');
-	Smilies::add($b, ':pick:', '&#x26CF');
-	Smilies::add($b, ':hammer and pick:', '&#x2692');
-	Smilies::add($b, ':hammer and wrench:', '&#x1F6E0');
-	Smilies::add($b, ':dagger:', '&#x1F5E1');
+	Smilies::add($b, ':hammer:', '&#x1F528;');
+//	Smilies::add($b, ':axe:', '&#x1FA93;');
+	Smilies::add($b, ':pick:', '&#x26CF;');
+	Smilies::add($b, ':hammer and pick:', '&#x2692;');
+	Smilies::add($b, ':hammer and wrench:', '&#x1F6E0;');
+	Smilies::add($b, ':dagger:', '&#x1F5E1;');
 	Smilies::add($b, ':sabre:', '&#x1F5E1;');
-	Smilies::add($b, ':crossed swords:', '&#x2694');
-	Smilies::add($b, ':pistol:', '&#x1F52B');
-	Smilies::add($b, ':bow and arrow:', '&#x1F3F9');
-	Smilies::add($b, ':shield:', '&#x1F6E1');
-	Smilies::add($b, ':wrench:', '&#x1F527');
-	Smilies::add($b, ':nut and bolt:', '&#x1F529');
-	Smilies::add($b, ':gear:', '&#x2699');
-	Smilies::add($b, ':clamp:', '&#x1F5DC');
-	Smilies::add($b, ':balance scale:', '&#x2696');
-	Smilies::add($b, ':white cane:', '&#x1F9AF');
-	Smilies::add($b, ':link:', '&#x1F517');
-	Smilies::add($b, ':chains:', '&#x26D3');
-	Smilies::add($b, ':toolbox:', '&#x1F9F0');
-	Smilies::add($b, ':magnet:', '&#x1F9F2');
+	Smilies::add($b, ':crossed swords:', '&#x2694;');
+	Smilies::add($b, ':pistol:', '&#x1F52B;');
+	Smilies::add($b, ':bow and arrow:', '&#x1F3F9;');
+	Smilies::add($b, ':shield:', '&#x1F6E1;');
+	Smilies::add($b, ':wrench:', '&#x1F527;');
+	Smilies::add($b, ':nut and bolt:', '&#x1F529;');
+	Smilies::add($b, ':gear:', '&#x2699;');
+	Smilies::add($b, ':clamp:', '&#x1F5DC;');
+	Smilies::add($b, ':balance scale:', '&#x2696;');
+	Smilies::add($b, ':white cane:', '&#x1F9AF;');
+	Smilies::add($b, ':link:', '&#x1F517;');
+	Smilies::add($b, ':chains:', '&#x26D3;');
+	Smilies::add($b, ':toolbox:', '&#x1F9F0;');
+	Smilies::add($b, ':magnet:', '&#x1F9F2;');
 
 // science
-	Smilies::add($b, ':alembic:', '&#x2697');
-	Smilies::add($b, ':test tube:', '&#x1F9EA');
-	Smilies::add($b, ':petri dish:', '&#x1F9EB');
-	Smilies::add($b, ':dna:', '&#x1F9EC');
-	Smilies::add($b, ':microscope:', '&#x1F52C');
-	Smilies::add($b, ':telescope:', '&#x1F52D');
-	Smilies::add($b, ':satellite antenna:', '&#x1F4E1');
-	Smilies::add($b, ':asterism:', '&#8258');
-	Smilies::add($b, ':outlines white star:', '&#9885');
+	Smilies::add($b, ':alembic:', '&#x2697;');
+	Smilies::add($b, ':test tube:', '&#x1F9EA;');
+	Smilies::add($b, ':petri dish:', '&#x1F9EB;');
+	Smilies::add($b, ':dna:', '&#x1F9EC;');
+	Smilies::add($b, ':microscope:', '&#x1F52C;');
+	Smilies::add($b, ':telescope:', '&#x1F52D;');
+	Smilies::add($b, ':satellite antenna:', '&#x1F4E1;');
+	Smilies::add($b, ':asterism:', '&#x2042;');
+	Smilies::add($b, ':outlines white star:', '&#x9885;');
 
 // medical
-	Smilies::add($b, ':syringe:', '&#x1F489');
-	Smilies::add($b, ':drop of blood:', '&#x1FA78');
-	Smilies::add($b, ':pill:', '&#x1F48A');
-	Smilies::add($b, ':adhesive bandage:', '&#x1FA79');
-	Smilies::add($b, ':stethoscope:', '&#x1FA7A');
+	Smilies::add($b, ':syringe:', '&#x1F489;');
+	Smilies::add($b, ':drop of blood:', '&#x1FA78;');
+	Smilies::add($b, ':pill:', '&#x1F48A;');
+	Smilies::add($b, ':adhesive bandage:', '&#x1FA79;');
+	Smilies::add($b, ':stethoscope:', '&#x1FA7A;');
 
 // household
-	Smilies::add($b, ':door:', '&#x1F6AA');
-	Smilies::add($b, ':bed:', '&#x1F6CF');
-	Smilies::add($b, ':couch and lamp:', '&#x1F6CB');
-//	Smilies::add($b, ':chair:', '&#x1FA91');
-	Smilies::add($b, ':toilet:', '&#x1F6BD');
-	Smilies::add($b, ':shower:', '&#x1F6BF');
-	Smilies::add($b, ':bathtub:', '&#x1F6C1');
-	Smilies::add($b, ':razor:', '&#x1FA92');
-	Smilies::add($b, ':lotion bottle:', '&#x1F9F4');
-	Smilies::add($b, ':safety pin:', '&#x1F9F7');
-	Smilies::add($b, ':broom:', '&#x1F9F9');
-	Smilies::add($b, ':basket:', '&#x1F9FA');
-	Smilies::add($b, ':roll of paper:', '&#x1F9FB');
-	Smilies::add($b, ':soap:', '&#x1F9FC');
-	Smilies::add($b, ':sponge:', '&#x1F9FD');
-	Smilies::add($b, ':fire extinguisher:', '&#x1F9EF');
-	Smilies::add($b, ':shopping cart:', '&#x1F6D2');
+	Smilies::add($b, ':door:', '&#x1F6AA;');
+	Smilies::add($b, ':bed:', '&#x1F6CF;');
+	Smilies::add($b, ':couch and lamp:', '&#x1F6CB;');
+//	Smilies::add($b, ':chair:', '&#x1FA91;');
+	Smilies::add($b, ':toilet:', '&#x1F6BD;');
+	Smilies::add($b, ':shower:', '&#x1F6BF;');
+	Smilies::add($b, ':bathtub:', '&#x1F6C1;');
+	Smilies::add($b, ':razor:', '&#x1FA92;');
+	Smilies::add($b, ':lotion bottle:', '&#x1F9F4;');
+	Smilies::add($b, ':safety pin:', '&#x1F9F7;');
+	Smilies::add($b, ':broom:', '&#x1F9F9;');
+	Smilies::add($b, ':basket:', '&#x1F9FA;');
+	Smilies::add($b, ':roll of paper:', '&#x1F9FB;');
+	Smilies::add($b, ':soap:', '&#x1F9FC;');
+	Smilies::add($b, ':sponge:', '&#x1F9FD;');
+	Smilies::add($b, ':fire extinguisher:', '&#x1F9EF;');
+	Smilies::add($b, ':shopping cart:', '&#x1F6D2;');
 
 // other-object
-	Smilies::add($b, ':cigarette:', '&#x1F6AC');
-	Smilies::add($b, ':coffin:', '&#x26B0');
-	Smilies::add($b, ':funeral urn:', '&#x26B1');
-	Smilies::add($b, ':moai:', '&#x1F5FF');
+	Smilies::add($b, ':cigarette:', '&#x1F6AC;');
+	Smilies::add($b, ':coffin:', '&#x26B0;');
+	Smilies::add($b, ':funeral urn:', '&#x26B1;');
+	Smilies::add($b, ':moai:', '&#x1F5FF;');
 
 // Symbols
 // transport-sign
-	Smilies::add($b, ':atm sign:', '&#x1F3E7');
-	Smilies::add($b, ':litter in bin sign:', '&#x1F6AE');
-	Smilies::add($b, ':potable water:', '&#x1F6B0');
-	Smilies::add($b, ':wheelchair symbol:', '&#x267F');
-	Smilies::add($b, ':men’s room:', '&#x1F6B9');
-	Smilies::add($b, ':women’s room:', '&#x1F6BA');
-	Smilies::add($b, ':restroom:', '&#x1F6BB');
-	Smilies::add($b, ':baby symbol:', '&#x1F6BC');
-	Smilies::add($b, ':water closet:', '&#x1F6BE');
-	Smilies::add($b, ':passport control:', '&#x1F6C2');
-	Smilies::add($b, ':customs:', '&#x1F6C3');
-	Smilies::add($b, ':baggage claim:', '&#x1F6C4');
-	Smilies::add($b, ':left luggage:', '&#x1F6C5');
+	Smilies::add($b, ':atm sign:', '&#x1F3E7;');
+	Smilies::add($b, ':litter in bin sign:', '&#x1F6AE;');
+	Smilies::add($b, ':potable water:', '&#x1F6B0;');
+	Smilies::add($b, ':wheelchair symbol:', '&#x267F;');
+	Smilies::add($b, ':men’s room:', '&#x1F6B9;');
+	Smilies::add($b, ':women’s room:', '&#x1F6BA;');
+	Smilies::add($b, ':restroom:', '&#x1F6BB;');
+	Smilies::add($b, ':baby symbol:', '&#x1F6BC;');
+	Smilies::add($b, ':water closet:', '&#x1F6BE;');
+	Smilies::add($b, ':passport control:', '&#x1F6C2;');
+	Smilies::add($b, ':customs:', '&#x1F6C3;');
+	Smilies::add($b, ':baggage claim:', '&#x1F6C4;');
+	Smilies::add($b, ':left luggage:', '&#x1F6C5;');
 
 // warning
-	Smilies::add($b, ':warning:', '&#x26A0');
-	Smilies::add($b, ':children crossing:', '&#x1F6B8');
-	Smilies::add($b, ':no entry:', '&#x26D4');
-	Smilies::add($b, ':prohibited:', '&#x1F6AB');
-	Smilies::add($b, ':no bicycles:', '&#x1F6B3');
-	Smilies::add($b, ':no smoking:', '&#x1F6AD');
-	Smilies::add($b, ':no littering:', '&#x1F6AF');
-	Smilies::add($b, ':non-potable water:', '&#x1F6B1');
-	Smilies::add($b, ':no pedestrians:', '&#x1F6B7');
-	Smilies::add($b, ':no mobile phones:', '&#x1F4F5');
-	Smilies::add($b, ':no one under eighteen:', '&#x1F51E');
-	Smilies::add($b, ':radioactive:', '&#x2622');
-	Smilies::add($b, ':biohazard:', '&#x2623');
+	Smilies::add($b, ':warning:', '&#x26A0;');
+	Smilies::add($b, ':children crossing:', '&#x1F6B8;');
+	Smilies::add($b, ':no entry:', '&#x26D4;');
+	Smilies::add($b, ':prohibited:', '&#x1F6AB;');
+	Smilies::add($b, ':no bicycles:', '&#x1F6B3;');
+	Smilies::add($b, ':no smoking:', '&#x1F6AD;');
+	Smilies::add($b, ':no littering:', '&#x1F6AF;');
+	Smilies::add($b, ':non-potable water:', '&#x1F6B1;');
+	Smilies::add($b, ':no pedestrians:', '&#x1F6B7;');
+	Smilies::add($b, ':no mobile phones:', '&#x1F4F5;');
+	Smilies::add($b, ':no one under eighteen:', '&#x1F51E;');
+	Smilies::add($b, ':radioactive:', '&#x2622;');
+	Smilies::add($b, ':biohazard:', '&#x2623;');
 	Smilies::add($b, ':army:', '&#x1FA96;');
 
 // arrow
-	Smilies::add($b, ':up arrow:', '&#x2B06');
-	Smilies::add($b, ':up-right arrow:', '&#x2197');
-	Smilies::add($b, ':right arrow:', '&#x27A1');
-	Smilies::add($b, ':down-right arrow:', '&#x2198');
-	Smilies::add($b, ':down arrow:', '&#x2B07');
-	Smilies::add($b, ':down-left arrow:', '&#x2199');
-	Smilies::add($b, ':left arrow:', '&#x2B05');
-	Smilies::add($b, ':up-left arrow:', '&#x2196');
-	Smilies::add($b, ':up-down arrow:', '&#x2195');
-	Smilies::add($b, ':left-right arrow:', '&#x2194');
-	Smilies::add($b, ':right arrow curving left:', '&#x21A9');
-	Smilies::add($b, ':left arrow curving right:', '&#x21AA');
-	Smilies::add($b, ':right arrow curving up:', '&#x2934');
-	Smilies::add($b, ':right arrow curving down:', '&#x2935');
-	Smilies::add($b, ':clockwise vertical arrows:', '&#x1F503');
-	Smilies::add($b, ':counterclockwise arrows button:', '&#x1F504');
-	Smilies::add($b, ':BACK arrow:', '&#x1F519');
-	Smilies::add($b, ':END arrow:', '&#x1F51A');
-	Smilies::add($b, ':ON! arrow:', '&#x1F51B');
-	Smilies::add($b, ':SOON arrow:', '&#x1F51C');
-	Smilies::add($b, ':TOP arrow:', '&#x1F51D');
+	Smilies::add($b, ':up arrow:', '&#x2B06;');
+	Smilies::add($b, ':up-right arrow:', '&#x2197;');
+	Smilies::add($b, ':right arrow:', '&#x27A1;');
+	Smilies::add($b, ':down-right arrow:', '&#x2198;');
+	Smilies::add($b, ':down arrow:', '&#x2B07;');
+	Smilies::add($b, ':down-left arrow:', '&#x2199;');
+	Smilies::add($b, ':left arrow:', '&#x2B05;');
+	Smilies::add($b, ':up-left arrow:', '&#x2196;');
+	Smilies::add($b, ':up-down arrow:', '&#x2195;');
+	Smilies::add($b, ':left-right arrow:', '&#x2194;');
+	Smilies::add($b, ':right arrow curving left:', '&#x21A9;');
+	Smilies::add($b, ':left arrow curving right:', '&#x21AA;');
+	Smilies::add($b, ':right arrow curving up:', '&#x2934;');
+	Smilies::add($b, ':right arrow curving down:', '&#x2935;');
+	Smilies::add($b, ':clockwise vertical arrows:', '&#x1F503;');
+	Smilies::add($b, ':counterclockwise arrows button:', '&#x1F504;');
+	Smilies::add($b, ':BACK arrow:', '&#x1F519;');
+	Smilies::add($b, ':END arrow:', '&#x1F51A;');
+	Smilies::add($b, ':ON! arrow:', '&#x1F51B;');
+	Smilies::add($b, ':SOON arrow:', '&#x1F51C;');
+	Smilies::add($b, ':TOP arrow:', '&#x1F51D;');
 
 // religion
-	Smilies::add($b, ':place of worship:', '&#x1F6D0');
-	Smilies::add($b, ':atom symbol:', '&#x269B');
-	Smilies::add($b, ':om:', '&#x1F549');
-	Smilies::add($b, ':star of David:', '&#x2721');
-	Smilies::add($b, ':wheel of dharma:', '&#x2638');
-	Smilies::add($b, ':yin yang:', '&#x262F');
-	Smilies::add($b, ':latin cross:', '&#x271D');
-	Smilies::add($b, ':orthodox cross:', '&#x2626');
-	Smilies::add($b, ':star and crescent:', '&#x262A');
-	Smilies::add($b, ':peace symbol:', '&#x262E');
-	Smilies::add($b, ':menorah:', '&#x1F54E');
-	Smilies::add($b, ':dotted six-pointed star:', '&#x1F52F');
+	Smilies::add($b, ':place of worship:', '&#x1F6D0;');
+	Smilies::add($b, ':atom symbol:', '&#x269B;');
+	Smilies::add($b, ':om:', '&#x1F549;');
+	Smilies::add($b, ':star of David:', '&#x2721;');
+	Smilies::add($b, ':wheel of dharma:', '&#x2638;');
+	Smilies::add($b, ':yin yang:', '&#x262F;');
+	Smilies::add($b, ':latin cross:', '&#x271D;');
+	Smilies::add($b, ':orthodox cross:', '&#x2626;');
+	Smilies::add($b, ':star and crescent:', '&#x262A;');
+	Smilies::add($b, ':peace symbol:', '&#x262E;');
+	Smilies::add($b, ':menorah:', '&#x1F54E;');
+	Smilies::add($b, ':dotted six-pointed star:', '&#x1F52F;');
 
 // zodiac
-	Smilies::add($b, ':Aries:', '&#x2648');
-	Smilies::add($b, ':Taurus:', '&#x2649');
-	Smilies::add($b, ':Gemini:', '&#x264A');
-	Smilies::add($b, ':Cancer:', '&#x264B');
-	Smilies::add($b, ':Leo:', '&#x264C');
-	Smilies::add($b, ':Virgo:', '&#x264D');
-	Smilies::add($b, ':Libra:', '&#x264E');
-	Smilies::add($b, ':Scorpio:', '&#x264F');
-	Smilies::add($b, ':Sagittarius:', '&#x2650');
-	Smilies::add($b, ':Capricorn:', '&#x2651');
-	Smilies::add($b, ':Aquarius:', '&#x2652');
-	Smilies::add($b, ':Pisces:', '&#x2653');
-	Smilies::add($b, ':Ophiuchus:', '&#x26CE');
+	Smilies::add($b, ':Aries:', '&#x2648;');
+	Smilies::add($b, ':Taurus:', '&#x2649;');
+	Smilies::add($b, ':Gemini:', '&#x264A;');
+	Smilies::add($b, ':Cancer:', '&#x264B;');
+	Smilies::add($b, ':Leo:', '&#x264C;');
+	Smilies::add($b, ':Virgo:', '&#x264D;');
+	Smilies::add($b, ':Libra:', '&#x264E;');
+	Smilies::add($b, ':Scorpio:', '&#x264F;');
+	Smilies::add($b, ':Sagittarius:', '&#x2650;');
+	Smilies::add($b, ':Capricorn:', '&#x2651;');
+	Smilies::add($b, ':Aquarius:', '&#x2652;');
+	Smilies::add($b, ':Pisces:', '&#x2653;');
+	Smilies::add($b, ':Ophiuchus:', '&#x26CE;');
 
 // av-symbol
-	Smilies::add($b, ':shuffle tracks button:', '&#x1F500');
-	Smilies::add($b, ':repeat button:', '&#x1F501');
-	Smilies::add($b, ':repeat single button:', '&#x1F502');
-	Smilies::add($b, ':play button:', '&#x25B6');
-	Smilies::add($b, ':fast-forward button:', '&#x23E9');
-	Smilies::add($b, ':next track button:', '&#x23ED');
-	Smilies::add($b, ':play or pause button:', '&#x23EF');
-	Smilies::add($b, ':reverse button:', '&#x25C0');
-	Smilies::add($b, ':fast reverse button:', '&#x23EA');
-	Smilies::add($b, ':last track button:', '&#x23EE');
-	Smilies::add($b, ':upwards button:', '&#x1F53C');
-	Smilies::add($b, ':fast up button:', '&#x23EB');
-	Smilies::add($b, ':downwards button:', '&#x1F53D');
-	Smilies::add($b, ':fast down button:', '&#x23EC');
-	Smilies::add($b, ':pause button:', '&#x23F8');
-	Smilies::add($b, ':stop button:', '&#x23F9');
-	Smilies::add($b, ':record button:', '&#x23FA');
-	Smilies::add($b, ':eject button:', '&#x23CF');
-	Smilies::add($b, ':cinema:', '&#x1F3A6');
-	Smilies::add($b, ':dim button:', '&#x1F505');
-	Smilies::add($b, ':bright button:', '&#x1F506');
-	Smilies::add($b, ':antenna bars:', '&#x1F4F6');
-	Smilies::add($b, ':vibration mode:', '&#x1F4F3');
-	Smilies::add($b, ':mobile phone off:', '&#x1F4F4');
+	Smilies::add($b, ':shuffle tracks button:', '&#x1F500;');
+	Smilies::add($b, ':repeat button:', '&#x1F501;');
+	Smilies::add($b, ':repeat single button:', '&#x1F502;');
+	Smilies::add($b, ':play button:', '&#x25B6;');
+	Smilies::add($b, ':fast-forward button:', '&#x23E9;');
+	Smilies::add($b, ':next track button:', '&#x23ED;');
+	Smilies::add($b, ':play or pause button:', '&#x23EF;');
+	Smilies::add($b, ':reverse button:', '&#x25C0;');
+	Smilies::add($b, ':fast reverse button:', '&#x23EA;');
+	Smilies::add($b, ':last track button:', '&#x23EE;');
+	Smilies::add($b, ':upwards button:', '&#x1F53C;');
+	Smilies::add($b, ':fast up button:', '&#x23EB;');
+	Smilies::add($b, ':downwards button:', '&#x1F53D;');
+	Smilies::add($b, ':fast down button:', '&#x23EC;');
+	Smilies::add($b, ':pause button:', '&#x23F8;');
+	Smilies::add($b, ':stop button:', '&#x23F9;');
+	Smilies::add($b, ':record button:', '&#x23FA;');
+	Smilies::add($b, ':eject button:', '&#x23CF;');
+	Smilies::add($b, ':cinema:', '&#x1F3A6;');
+	Smilies::add($b, ':dim button:', '&#x1F505;');
+	Smilies::add($b, ':bright button:', '&#x1F506;');
+	Smilies::add($b, ':antenna bars:', '&#x1F4F6;');
+	Smilies::add($b, ':vibration mode:', '&#x1F4F3;');
+	Smilies::add($b, ':mobile phone off:', '&#x1F4F4;');
 
 // gender
-	Smilies::add($b, ':female sign:', '&#x2640');
-	Smilies::add($b, ':male sign:', '&#x2642');
+	Smilies::add($b, ':female sign:', '&#x2640;');
+	Smilies::add($b, ':male sign:', '&#x2642;');
 
 // math
-	Smilies::add($b, ':multiply:', '&#x2716');
-	Smilies::add($b, ':plus:', '&#x2795');
-	Smilies::add($b, ':minus:', '&#x2796');
-	Smilies::add($b, ':divide:', '&#x2797');
-	Smilies::add($b, ':infinity:', '&#x267E');
+	Smilies::add($b, ':multiply:', '&#x2716;');
+	Smilies::add($b, ':plus:', '&#x2795;');
+	Smilies::add($b, ':minus:', '&#x2796;');
+	Smilies::add($b, ':divide:', '&#x2797;');
+	Smilies::add($b, ':infinity:', '&#x267E;');
 	Smilies::add($b, ':kreisoperator:', '&#x2218;');
 	Smilies::add($b, ':leere menge:', '&#x2205;');
 	Smilies::add($b, ':rundung:', '&#x2248;');
@@ -1458,407 +1454,408 @@ function unicode_smilies_smilies(array &$b)
 	Smilies::add($b, ':prozent:', '&#x0025;');
 
 // punctuation
-	Smilies::add($b, ':double exclamation mark:', '&#x203C');
-	Smilies::add($b, ':exclamation question mark:', '&#x2049');
-	Smilies::add($b, ':question mark:', '&#x2753');
-	Smilies::add($b, ':white question mark:', '&#x2754');
-	Smilies::add($b, ':white exclamation mark:', '&#x2755');
-	Smilies::add($b, ':exclamation mark:', '&#x2757');
-	Smilies::add($b, ':wavy dash:', '&#x3030');
+	Smilies::add($b, ':double exclamation mark:', '&#x203C;');
+	Smilies::add($b, ':exclamation question mark:', '&#x2049;');
+	Smilies::add($b, ':question mark:', '&#x2753;');
+	Smilies::add($b, ':white question mark:', '&#x2754;');
+	Smilies::add($b, ':white exclamation mark:', '&#x2755;');
+	Smilies::add($b, ':exclamation mark:', '&#x2757;');
+	Smilies::add($b, ':wavy dash:', '&#x3030;');
 
 // currency
-	Smilies::add($b, ':currency exchange:', '&#x1F4B1');
-	Smilies::add($b, ':heavy dollar sign:', '&#x1F4B2');
+	Smilies::add($b, ':currency exchange:', '&#x1F4B1;');
+	Smilies::add($b, ':heavy dollar sign:', '&#x1F4B2;');
 
 // other-symbol
-	Smilies::add($b, ':medical symbol:', '&#x2695');
-	Smilies::add($b, ':recycling symbol:', '&#x267B');
-	Smilies::add($b, ':fleur-de-lis:', '&#x269C');
-	Smilies::add($b, ':trident emblem:', '&#x1F531');
-	Smilies::add($b, ':name badge:', '&#x1F4DB');
-	Smilies::add($b, ':Japanese symbol for beginner:', '&#x1F530');
-	Smilies::add($b, ':hollow red circle:', '&#x2B55');
-	Smilies::add($b, ':check mark button:', '&#x2705');
-	Smilies::add($b, ':check box with check:', '&#x2611');
-	Smilies::add($b, ':check mark:', '&#x2714');
-	Smilies::add($b, ':cross mark:', '&#x274C');
-	Smilies::add($b, ':cross mark button:', '&#x274E');
-	Smilies::add($b, ':curly loop:', '&#x27B0');
-	Smilies::add($b, ':double curly loop:', '&#x27BF');
-	Smilies::add($b, ':part alternation mark:', '&#x303D');
-	Smilies::add($b, ':eight-spoked asterisk:', '&#x2733');
-	Smilies::add($b, ':eight-pointed star:', '&#x2734');
-	Smilies::add($b, ':sparkle:', '&#x2747');
-	Smilies::add($b, ':copyright:', '&#x00A9');
-	Smilies::add($b, ':registered:', '&#x00AE');
-	Smilies::add($b, ':trade mark:', '&#x2122');
+	Smilies::add($b, ':medical symbol:', '&#x2695;');
+	Smilies::add($b, ':recycling symbol:', '&#x267B;');
+	Smilies::add($b, ':fleur-de-lis:', '&#x269C;');
+	Smilies::add($b, ':trident emblem:', '&#x1F531;');
+	Smilies::add($b, ':name badge:', '&#x1F4DB;');
+	Smilies::add($b, ':Japanese symbol for beginner:', '&#x1F530;');
+	Smilies::add($b, ':hollow red circle:', '&#x2B55;');
+	Smilies::add($b, ':check mark button:', '&#x2705;');
+	Smilies::add($b, ':check box with check:', '&#x2611;');
+	Smilies::add($b, ':check mark:', '&#x2714;');
+	Smilies::add($b, ':cross mark:', '&#x274C;');
+	Smilies::add($b, ':cross mark button:', '&#x274E;');
+	Smilies::add($b, ':curly loop:', '&#x27B0;');
+	Smilies::add($b, ':double curly loop:', '&#x27BF;');
+	Smilies::add($b, ':part alternation mark:', '&#x303D;');
+	Smilies::add($b, ':eight-spoked asterisk:', '&#x2733;');
+	Smilies::add($b, ':eight-pointed star:', '&#x2734;');
+	Smilies::add($b, ':sparkle:', '&#x2747;');
+	Smilies::add($b, ':copyright:', '&#x00A9;');
+	Smilies::add($b, ':registered:', '&#x00AE;');
+	Smilies::add($b, ':trade mark:', '&#x2122;');
 
 // keycap
-	Smilies::add($b, ':keycap: #:', '&#x0023&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: *:', '&#x002A&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 0:', '&#x0030&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 1:', '&#x0031&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 2:', '&#x0032&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 3:', '&#x0033&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 4:', '&#x0034&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 5:', '&#x0035&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 6:', '&#x0036&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 7:', '&#x0037&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 8:', '&#x0038&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 9:', '&#x0039&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 10:', '&#x1F51F');
+	Smilies::add($b, ':keycap: #:', '&#x0023;&#xFE0F;&#x20E3;');
+	Smilies::add($b, ':keycap: *:', '&#x002A;&#xFE0F;&#x20E3;');
+	Smilies::add($b, ':keycap: 0:', '&#x0030;&#xFE0F;&#x20E3;');
+	Smilies::add($b, ':keycap: 1:', '&#x0031;&#xFE0F;&#x20E3;');
+	Smilies::add($b, ':keycap: 2:', '&#x0032;&#xFE0F;&#x20E3;');
+	Smilies::add($b, ':keycap: 3:', '&#x0033;&#xFE0F;&#x20E3;');
+	Smilies::add($b, ':keycap: 4:', '&#x0034;&#xFE0F;&#x20E3;');
+	Smilies::add($b, ':keycap: 5:', '&#x0035;&#xFE0F;&#x20E3;');
+	Smilies::add($b, ':keycap: 6:', '&#x0036;&#xFE0F;&#x20E3;');
+	Smilies::add($b, ':keycap: 7:', '&#x0037;&#xFE0F;&#x20E3;');
+	Smilies::add($b, ':keycap: 8:', '&#x0038;&#xFE0F;&#x20E3;');
+	Smilies::add($b, ':keycap: 9:', '&#x0039;&#xFE0F;&#x20E3;');
+	Smilies::add($b, ':keycap: 10:', '&#x1F51F;');
 
 // alphanum
-	Smilies::add($b, ':input latin uppercase:', '&#x1F520');
-	Smilies::add($b, ':input latin lowercase:', '&#x1F521');
-	Smilies::add($b, ':input numbers:', '&#x1F522');
-	Smilies::add($b, ':input symbols:', '&#x1F523');
-	Smilies::add($b, ':input latin letters:', '&#x1F524');
-	Smilies::add($b, ':A button (blood type):', '&#x1F170');
-	Smilies::add($b, ':AB button (blood type):', '&#x1F18E');
-	Smilies::add($b, ':B button (blood type):', '&#x1F171');
-	Smilies::add($b, ':CL button:', '&#x1F191');
-	Smilies::add($b, ':COOL button:', '&#x1F192');
+	Smilies::add($b, ':input latin uppercase:', '&#x1F520;');
+	Smilies::add($b, ':input latin lowercase:', '&#x1F521;');
+	Smilies::add($b, ':input numbers:', '&#x1F522;');
+	Smilies::add($b, ':input symbols:', '&#x1F523;');
+	Smilies::add($b, ':input latin letters:', '&#x1F524;');
+	Smilies::add($b, ':A button (blood type):', '&#x1F170;');
+	Smilies::add($b, ':AB button (blood type):', '&#x1F18E;');
+	Smilies::add($b, ':B button (blood type):', '&#x1F171;');
+	Smilies::add($b, ':CL button:', '&#x1F191;');
+	Smilies::add($b, ':COOL button:', '&#x1F192;');
 	Smilies::add($b, ':cool:', '&#x1F192;');
-	Smilies::add($b, ':FREE button:', '&#x1F193');
-	Smilies::add($b, ':information:', '&#x2139');
-	Smilies::add($b, ':ID button:', '&#x1F194');
-	Smilies::add($b, ':circled M:', '&#x24C2');
-	Smilies::add($b, ':NEW button:', '&#x1F195');
-	Smilies::add($b, ':NG button:', '&#x1F196');
-	Smilies::add($b, ':O button (blood type):', '&#x1F17E');
-	Smilies::add($b, ':OK button:', '&#x1F197');
-	Smilies::add($b, ':P button:', '&#x1F17F');
-	Smilies::add($b, ':SOS button:', '&#x1F198');  
-	Smilies::add($b, ':UP! button:', '&#x1F199');
-	Smilies::add($b, ':VS button:', '&#x1F19A');
-	Smilies::add($b, ':Japanese “here” button:', '&#x1F201');
-	Smilies::add($b, ':Japanese “service charge” button:', '&#x1F202');
-	Smilies::add($b, ':Japanese “monthly amount” button:', '&#x1F237');
-	Smilies::add($b, ':Japanese “not free of charge” button:', '&#x1F236');
-	Smilies::add($b, ':Japanese “reserved” button:', '&#x1F22F');
-	Smilies::add($b, ':Japanese “bargain” button:', '&#x1F250');
-	Smilies::add($b, ':Japanese “discount” button:', '&#x1F239');
-	Smilies::add($b, ':Japanese “free of charge” button:', '&#x1F21A');
-	Smilies::add($b, ':Japanese “prohibited” button:', '&#x1F232');
-	Smilies::add($b, ':Japanese “acceptable” button:', '&#x1F251');
-	Smilies::add($b, ':Japanese “application” button:', '&#x1F238');
-	Smilies::add($b, ':Japanese “passing grade” button:', '&#x1F234');
-	Smilies::add($b, ':Japanese “vacancy” button:', '&#x1F233');
-	Smilies::add($b, ':Japanese “congratulations” button:', '&#x3297');
-	Smilies::add($b, ':Japanese “secret” button:', '&#x3299');
-	Smilies::add($b, ':Japanese “open for business” button:', '&#x1F23A');
-	Smilies::add($b, ':Japanese “no vacancy” button:', '&#x1F235');
+	Smilies::add($b, ':FREE button:', '&#x1F193;');
+	Smilies::add($b, ':information:', '&#x2139;');
+	Smilies::add($b, ':ID button:', '&#x1F194;');
+	Smilies::add($b, ':circled M:', '&#x24C2;');
+	Smilies::add($b, ':NEW button:', '&#x1F195;');
+	Smilies::add($b, ':NG button:', '&#x1F196;');
+	Smilies::add($b, ':O button (blood type):', '&#x1F17E;');
+	Smilies::add($b, ':OK button:', '&#x1F197;');
+	Smilies::add($b, ':P button:', '&#x1F17F;');
+	Smilies::add($b, ':SOS button:', '&#x1F198;');
+	Smilies::add($b, ':UP! button:', '&#x1F199;');
+	Smilies::add($b, ':VS button:', '&#x1F19A;');
+	Smilies::add($b, ':Japanese “here” button:', '&#x1F201;');
+	Smilies::add($b, ':Japanese “service charge” button:', '&#x1F202;');
+	Smilies::add($b, ':Japanese “monthly amount” button:', '&#x1F237;');
+	Smilies::add($b, ':Japanese “not free of charge” button:', '&#x1F236;');
+	Smilies::add($b, ':Japanese “reserved” button:', '&#x1F22F;');
+	Smilies::add($b, ':Japanese “bargain” button:', '&#x1F250;');
+	Smilies::add($b, ':Japanese “discount” button:', '&#x1F239;');
+	Smilies::add($b, ':Japanese “free of charge” button:', '&#x1F21A;');
+	Smilies::add($b, ':Japanese “prohibited” button:', '&#x1F232;');
+	Smilies::add($b, ':Japanese “acceptable” button:', '&#x1F251;');
+	Smilies::add($b, ':Japanese “application” button:', '&#x1F238;');
+	Smilies::add($b, ':Japanese “passing grade” button:', '&#x1F234;');
+	Smilies::add($b, ':Japanese “vacancy” button:', '&#x1F233;');
+	Smilies::add($b, ':Japanese “congratulations” button:', '&#x3297;');
+	Smilies::add($b, ':Japanese “secret” button:', '&#x3299;');
+	Smilies::add($b, ':Japanese “open for business” button:', '&#x1F23A;');
+	Smilies::add($b, ':Japanese “no vacancy” button:', '&#x1F235;');
 
 // geometric
-	Smilies::add($b, ':red circle:', '&#x1F534');
-//	Smilies::add($b, ':orange circle:', '&#x1F7E0');
-//	Smilies::add($b, ':yellow circle:', '&#x1F7E1');
-//	Smilies::add($b, ':green circle:', '&#x1F7E2');
-	Smilies::add($b, ':blue circle:', '&#x1F535');
-//	Smilies::add($b, ':purple circle:', '&#x1F7E3');
-//	Smilies::add($b, ':brown circle:', '&#x1F7E4');
-	Smilies::add($b, ':black circle:', '&#x26AB');
-	Smilies::add($b, ':white circle:', '&#x26AA');
-//	Smilies::add($b, ':red square:', '&#x1F7E5');
-//	Smilies::add($b, ':orange square:', '&#x1F7E7');
-//	Smilies::add($b, ':yellow square:', '&#x1F7E8');
-//	Smilies::add($b, ':green square:', '&#x1F7E9');
-//	Smilies::add($b, ':blue square:', '&#x1F7E6');
-//	Smilies::add($b, ':purple square:', '&#x1F7EA');
-//	Smilies::add($b, ':brown square:', '&#x1F7EB');
-	Smilies::add($b, ':black large square:', '&#x2B1B');
-	Smilies::add($b, ':white large square:', '&#x2B1C');
-	Smilies::add($b, ':black medium square:', '&#x25FC');
-	Smilies::add($b, ':white medium square:', '&#x25FB');
-	Smilies::add($b, ':black medium-small square:', '&#x25FE');
-	Smilies::add($b, ':white medium-small square:', '&#x25FD');
-	Smilies::add($b, ':black small square:', '&#x25AA');
-	Smilies::add($b, ':white small square:', '&#x25AB');
-	Smilies::add($b, ':large orange diamond:', '&#x1F536');
-	Smilies::add($b, ':large blue diamond:', '&#x1F537');
-	Smilies::add($b, ':small orange diamond:', '&#x1F538');
-	Smilies::add($b, ':small blue diamond:', '&#x1F539');
-	Smilies::add($b, ':red triangle pointed up:', '&#x1F53A');
-	Smilies::add($b, ':red triangle pointed down:', '&#x1F53B');
-	Smilies::add($b, ':diamond with a dot:', '&#x1F4A0');
-	Smilies::add($b, ':radio button:', '&#x1F518');
-	Smilies::add($b, ':white square button:', '&#x1F533');
-	Smilies::add($b, ':black square button:', '&#x1F532');
+	Smilies::add($b, ':red circle:', '&#x1F534;');
+//	Smilies::add($b, ':orange circle:', '&#x1F7E0;');
+//	Smilies::add($b, ':yellow circle:', '&#x1F7E1;');
+//	Smilies::add($b, ':green circle:', '&#x1F7E2;');
+	Smilies::add($b, ':blue circle:', '&#x1F535;');
+//	Smilies::add($b, ':purple circle:', '&#x1F7E3;');
+//	Smilies::add($b, ':brown circle:', '&#x1F7E4;');
+	Smilies::add($b, ':black circle:', '&#x26AB;');
+	Smilies::add($b, ':white circle:', '&#x26AA;');
+//	Smilies::add($b, ':red square:', '&#x1F7E5;');
+//	Smilies::add($b, ':orange square:', '&#x1F7E7;');
+//	Smilies::add($b, ':yellow square:', '&#x1F7E8;');
+//	Smilies::add($b, ':green square:', '&#x1F7E9;');
+//	Smilies::add($b, ':blue square:', '&#x1F7E6;');
+//	Smilies::add($b, ':purple square:', '&#x1F7EA;');
+//	Smilies::add($b, ':brown square:', '&#x1F7EB;');
+	Smilies::add($b, ':black large square:', '&#x2B1B;');
+	Smilies::add($b, ':white large square:', '&#x2B1C;');
+	Smilies::add($b, ':black medium square:', '&#x25FC;');
+	Smilies::add($b, ':white medium square:', '&#x25FB;');
+	Smilies::add($b, ':black medium-small square:', '&#x25FE;');
+	Smilies::add($b, ':white medium-small square:', '&#x25FD;');
+	Smilies::add($b, ':black small square:', '&#x25AA;');
+	Smilies::add($b, ':white small square:', '&#x25AB;');
+	Smilies::add($b, ':large orange diamond:', '&#x1F536;');
+	Smilies::add($b, ':large blue diamond:', '&#x1F537;');
+	Smilies::add($b, ':small orange diamond:', '&#x1F538;');
+	Smilies::add($b, ':small blue diamond:', '&#x1F539;');
+	Smilies::add($b, ':red triangle pointed up:', '&#x1F53A;');
+	Smilies::add($b, ':red triangle pointed down:', '&#x1F53B;');
+	Smilies::add($b, ':diamond with a dot:', '&#x1F4A0;');
+	Smilies::add($b, ':radio button:', '&#x1F518;');
+	Smilies::add($b, ':white square button:', '&#x1F533;');
+	Smilies::add($b, ':black square button:', '&#x1F532;');
 
 // Flags
 // flag
-	Smilies::add($b, ':chequered flag:', '&#x1F3C1');
-	Smilies::add($b, ':triangular flag:', '&#x1F6A9');
-	Smilies::add($b, ':crossed flags:', '&#x1F38C');
-	Smilies::add($b, ':black flag:', '&#x1F3F4');
-	Smilies::add($b, ':white flag:', '&#x1F3F3');
-	Smilies::add($b, ':rainbow flag:', '&#x1F3F3&#xFE0F&#x200D&#x1F308');
-	Smilies::add($b, ':pirate flag:', '&#x1F3F4&#x200D&#x2620&#xFE0F');
+	Smilies::add($b, ':chequered flag:', '&#x1F3C1;');
+	Smilies::add($b, ':triangular flag:', '&#x1F6A9;');
+	Smilies::add($b, ':crossed flags:', '&#x1F38C;');
+	Smilies::add($b, ':black flag:', '&#x1F3F4;');
+	Smilies::add($b, ':white flag:', '&#x1F3F3;');
+	Smilies::add($b, ':rainbow flag:', '&#x1F3F3;&#xFE0F;&#x200D;&#x1F308;');
+	Smilies::add($b, ':pirate flag:', '&#x1F3F4;&#x200D;&#x2620;&#xFE0F;');
 
 // country-flag
-	Smilies::add($b, ':ascension island:', '&#x1F1E6&#x1F1E8');
-	Smilies::add($b, ':andorra:', '&#x1F1E6&#x1F1E9');
-	Smilies::add($b, ':united arab emirates:', '&#x1F1E6&#x1F1EA');
-	Smilies::add($b, ':afghanistan:', '&#x1F1E6&#x1F1EB');
-	Smilies::add($b, ':antigua & barbuda:', '&#x1F1E6&#x1F1EC');
-	Smilies::add($b, ':anguilla:', '&#x1F1E6&#x1F1EE');
-	Smilies::add($b, ':albania:', '&#x1F1E6&#x1F1F1');
-	Smilies::add($b, ':armenia:', '&#x1F1E6&#x1F1F2');
-	Smilies::add($b, ':angola:', '&#x1F1E6&#x1F1F4');
-	Smilies::add($b, ':antarctica:', '&#x1F1E6&#x1F1F6');
-	Smilies::add($b, ':argentina:', '&#x1F1E6&#x1F1F7');
-	Smilies::add($b, ':americansamoa:', '&#x1F1E6&#x1F1F8');
-	Smilies::add($b, ':austria:', '&#x1F1E6&#x1F1F9');
-	Smilies::add($b, ':australia:', '&#x1F1E6&#x1F1FA');
-	Smilies::add($b, ':aruba:', '&#x1F1E6&#x1F1FC');
-	Smilies::add($b, ':ålandislands:', '&#x1F1E6&#x1F1FD');
-	Smilies::add($b, ':azerbaijan:', '&#x1F1E6&#x1F1FF');
-	Smilies::add($b, ':bosnia&herzegovina:', '&#x1F1E7&#x1F1E6');
-	Smilies::add($b, ':barbados:', '&#x1F1E7&#x1F1E7');
-	Smilies::add($b, ':bangladesh:', '&#x1F1E7&#x1F1E9');
-	Smilies::add($b, ':belgium:', '&#x1F1E7&#x1F1EA');
-	Smilies::add($b, ':burkinafaso:', '&#x1F1E7&#x1F1EB');
-	Smilies::add($b, ':bulgaria:', '&#x1F1E7&#x1F1EC');
-	Smilies::add($b, ':bahrain:', '&#x1F1E7&#x1F1ED');
-	Smilies::add($b, ':burundi:', '&#x1F1E7&#x1F1EE');
-	Smilies::add($b, ':benin:', '&#x1F1E7&#x1F1EF');
-	Smilies::add($b, ':st.barthélemy:', '&#x1F1E7&#x1F1F1');
-	Smilies::add($b, ':bermuda:', '&#x1F1E7&#x1F1F2');
-	Smilies::add($b, ':brunei:', '&#x1F1E7&#x1F1F3');
-	Smilies::add($b, ':bolivia:', '&#x1F1E7&#x1F1F4');
-	Smilies::add($b, ':caribbeannetherlands:', '&#x1F1E7&#x1F1F6');
-	Smilies::add($b, ':brazil:', '&#x1F1E7&#x1F1F7');
-	Smilies::add($b, ':bahamas:', '&#x1F1E7&#x1F1F8');
-	Smilies::add($b, ':bhutan:', '&#x1F1E7&#x1F1F9');
-	Smilies::add($b, ':bouvetisland:', '&#x1F1E7&#x1F1FB');
-	Smilies::add($b, ':botswana:', '&#x1F1E7&#x1F1FC');
-	Smilies::add($b, ':belarus:', '&#x1F1E7&#x1F1FE');
-	Smilies::add($b, ':belize:', '&#x1F1E7&#x1F1FF');
-	Smilies::add($b, ':canada:', '&#x1F1E8&#x1F1E6');
-	Smilies::add($b, ':cocos(keeling)islands:', '&#x1F1E8&#x1F1E8');
-	Smilies::add($b, ':congo-kinshasa:', '&#x1F1E8&#x1F1E9');
-	Smilies::add($b, ':centralafricanrepublic:', '&#x1F1E8&#x1F1EB');
-	Smilies::add($b, ':congo-brazzaville:', '&#x1F1E8&#x1F1EC');
-	Smilies::add($b, ':switzerland:', '&#x1F1E8&#x1F1ED');
-	Smilies::add($b, ':côted’ivoire:', '&#x1F1E8&#x1F1EE');
-	Smilies::add($b, ':cookislands:', '&#x1F1E8&#x1F1F0');
-	Smilies::add($b, ':chile:', '&#x1F1E8&#x1F1F1');
-	Smilies::add($b, ':cameroon:', '&#x1F1E8&#x1F1F2');
-	Smilies::add($b, ':china:', '&#x1F1E8&#x1F1F3');
-	Smilies::add($b, ':colombia:', '&#x1F1E8&#x1F1F4');
-	Smilies::add($b, ':clippertonisland:', '&#x1F1E8&#x1F1F5');
-	Smilies::add($b, ':costarica:', '&#x1F1E8&#x1F1F7');
-	Smilies::add($b, ':cuba:', '&#x1F1E8&#x1F1FA');
-	Smilies::add($b, ':capeverde:', '&#x1F1E8&#x1F1FB');
-	Smilies::add($b, ':curaçao:', '&#x1F1E8&#x1F1FC');
-	Smilies::add($b, ':christmasisland:', '&#x1F1E8&#x1F1FD');
-	Smilies::add($b, ':cyprus:', '&#x1F1E8&#x1F1FE');
-	Smilies::add($b, ':czechia:', '&#x1F1E8&#x1F1FF');
-	Smilies::add($b, ':germany:', '&#x1F1E9&#x1F1EA');
-	Smilies::add($b, ':diegogarcia:', '&#x1F1E9&#x1F1EC');
-	Smilies::add($b, ':djibouti:', '&#x1F1E9&#x1F1EF');
-	Smilies::add($b, ':denmark:', '&#x1F1E9&#x1F1F0');
-	Smilies::add($b, ':dominica:', '&#x1F1E9&#x1F1F2');
-	Smilies::add($b, ':dominicanrepublic:', '&#x1F1E9&#x1F1F4');
-	Smilies::add($b, ':algeria:', '&#x1F1E9&#x1F1FF');
-	Smilies::add($b, ':ceuta&melilla:', '&#x1F1EA&#x1F1E6');
-	Smilies::add($b, ':ecuador:', '&#x1F1EA&#x1F1E8');
-	Smilies::add($b, ':estonia:', '&#x1F1EA&#x1F1EA');
-	Smilies::add($b, ':egypt:', '&#x1F1EA&#x1F1EC');
-	Smilies::add($b, ':westernsahara:', '&#x1F1EA&#x1F1ED');
-	Smilies::add($b, ':eritrea:', '&#x1F1EA&#x1F1F7');
-	Smilies::add($b, ':spain:', '&#x1F1EA&#x1F1F8');
-	Smilies::add($b, ':ethiopia:', '&#x1F1EA&#x1F1F9');
-	Smilies::add($b, ':europeanunion:', '&#x1F1EA&#x1F1FA');
-	Smilies::add($b, ':finland:', '&#x1F1EB&#x1F1EE');
-	Smilies::add($b, ':fiji:', '&#x1F1EB&#x1F1EF');
-	Smilies::add($b, ':falklandislands:', '&#x1F1EB&#x1F1F0');
-	Smilies::add($b, ':micronesia:', '&#x1F1EB&#x1F1F2');
-	Smilies::add($b, ':faroeislands:', '&#x1F1EB&#x1F1F4');
-	Smilies::add($b, ':france:', '&#x1F1EB&#x1F1F7');
-	Smilies::add($b, ':gabon:', '&#x1F1EC&#x1F1E6');
-	Smilies::add($b, ':unitedkingdom:', '&#x1F1EC&#x1F1E7');
-	Smilies::add($b, ':grenada:', '&#x1F1EC&#x1F1E9');
-	Smilies::add($b, ':georgia:', '&#x1F1EC&#x1F1EA');
-	Smilies::add($b, ':frenchguiana:', '&#x1F1EC&#x1F1EB');
-	Smilies::add($b, ':guernsey:', '&#x1F1EC&#x1F1EC');
-	Smilies::add($b, ':ghana:', '&#x1F1EC&#x1F1ED');
-	Smilies::add($b, ':gibraltar:', '&#x1F1EC&#x1F1EE');
-	Smilies::add($b, ':greenland:', '&#x1F1EC&#x1F1F1');
-	Smilies::add($b, ':gambia:', '&#x1F1EC&#x1F1F2');
-	Smilies::add($b, ':guinea:', '&#x1F1EC&#x1F1F3');
-	Smilies::add($b, ':guadeloupe:', '&#x1F1EC&#x1F1F5');
-	Smilies::add($b, ':equatorialguinea:', '&#x1F1EC&#x1F1F6');
-	Smilies::add($b, ':greece:', '&#x1F1EC&#x1F1F7');
-	Smilies::add($b, ':southgeorgia&southsandwichislands:', '&#x1F1EC&#x1F1F8');
-	Smilies::add($b, ':guatemala:', '&#x1F1EC&#x1F1F9');
-	Smilies::add($b, ':guam:', '&#x1F1EC&#x1F1FA');
-	Smilies::add($b, ':guinea-bissau:', '&#x1F1EC&#x1F1FC');
-	Smilies::add($b, ':guyana:', '&#x1F1EC&#x1F1FE');
-	Smilies::add($b, ':hongkongsarchina:', '&#x1F1ED&#x1F1F0');
-	Smilies::add($b, ':heard&mcdonaldislands:', '&#x1F1ED&#x1F1F2');
-	Smilies::add($b, ':honduras:', '&#x1F1ED&#x1F1F3');
-	Smilies::add($b, ':croatia:', '&#x1F1ED&#x1F1F7');
-	Smilies::add($b, ':haiti:', '&#x1F1ED&#x1F1F9');
-	Smilies::add($b, ':hungary:', '&#x1F1ED&#x1F1FA');
-	Smilies::add($b, ':canaryislands:', '&#x1F1EE&#x1F1E8');
-	Smilies::add($b, ':indonesia:', '&#x1F1EE&#x1F1E9');
-	Smilies::add($b, ':ireland:', '&#x1F1EE&#x1F1EA');
-	Smilies::add($b, ':israel:', '&#x1F1EE&#x1F1F1');
-	Smilies::add($b, ':isleofman:', '&#x1F1EE&#x1F1F2');
-	Smilies::add($b, ':india:', '&#x1F1EE&#x1F1F3');
-	Smilies::add($b, ':britishindianoceanterritory:', '&#x1F1EE&#x1F1F4');
-	Smilies::add($b, ':iraq:', '&#x1F1EE&#x1F1F6');
-	Smilies::add($b, ':iran:', '&#x1F1EE&#x1F1F7');
-	Smilies::add($b, ':iceland:', '&#x1F1EE&#x1F1F8');
-	Smilies::add($b, ':italy:', '&#x1F1EE&#x1F1F9');
-	Smilies::add($b, ':jersey:', '&#x1F1EF&#x1F1EA');
-	Smilies::add($b, ':jamaica:', '&#x1F1EF&#x1F1F2');
-	Smilies::add($b, ':jordan:', '&#x1F1EF&#x1F1F4');
-	Smilies::add($b, ':japan:', '&#x1F1EF&#x1F1F5');
-	Smilies::add($b, ':kenya:', '&#x1F1F0&#x1F1EA');
-	Smilies::add($b, ':kyrgyzstan:', '&#x1F1F0&#x1F1EC');
-	Smilies::add($b, ':cambodia:', '&#x1F1F0&#x1F1ED');
-	Smilies::add($b, ':kiribati:', '&#x1F1F0&#x1F1EE');
-	Smilies::add($b, ':comoros:', '&#x1F1F0&#x1F1F2');
-	Smilies::add($b, ':st.kitts&nevis:', '&#x1F1F0&#x1F1F3');
-	Smilies::add($b, ':northkorea:', '&#x1F1F0&#x1F1F5');
-	Smilies::add($b, ':southkorea:', '&#x1F1F0&#x1F1F7');
-	Smilies::add($b, ':kuwait:', '&#x1F1F0&#x1F1FC');
-	Smilies::add($b, ':caymanislands:', '&#x1F1F0&#x1F1FE');
-	Smilies::add($b, ':kazakhstan:', '&#x1F1F0&#x1F1FF');
-	Smilies::add($b, ':laos:', '&#x1F1F1&#x1F1E6');
-	Smilies::add($b, ':lebanon:', '&#x1F1F1&#x1F1E7');
-	Smilies::add($b, ':st.lucia:', '&#x1F1F1&#x1F1E8');
-	Smilies::add($b, ':liechtenstein:', '&#x1F1F1&#x1F1EE');
-	Smilies::add($b, ':srilanka:', '&#x1F1F1&#x1F1F0');
-	Smilies::add($b, ':liberia:', '&#x1F1F1&#x1F1F7');
-	Smilies::add($b, ':lesotho:', '&#x1F1F1&#x1F1F8');
-	Smilies::add($b, ':lithuania:', '&#x1F1F1&#x1F1F9');
-	Smilies::add($b, ':luxembourg:', '&#x1F1F1&#x1F1FA');
-	Smilies::add($b, ':latvia:', '&#x1F1F1&#x1F1FB');
-	Smilies::add($b, ':libya:', '&#x1F1F1&#x1F1FE');
-	Smilies::add($b, ':morocco:', '&#x1F1F2&#x1F1E6');
-	Smilies::add($b, ':monaco:', '&#x1F1F2&#x1F1E8');
-	Smilies::add($b, ':moldova:', '&#x1F1F2&#x1F1E9');
-	Smilies::add($b, ':montenegro:', '&#x1F1F2&#x1F1EA');
-	Smilies::add($b, ':st.martin:', '&#x1F1F2&#x1F1EB');
-	Smilies::add($b, ':madagascar:', '&#x1F1F2&#x1F1EC');
-	Smilies::add($b, ':marshallislands:', '&#x1F1F2&#x1F1ED');
-	Smilies::add($b, ':northmacedonia:', '&#x1F1F2&#x1F1F0');
-	Smilies::add($b, ':mali:', '&#x1F1F2&#x1F1F1');
-	Smilies::add($b, ':myanmar(burma):', '&#x1F1F2&#x1F1F2');
-	Smilies::add($b, ':mongolia:', '&#x1F1F2&#x1F1F3');
-	Smilies::add($b, ':macaosarchina:', '&#x1F1F2&#x1F1F4');
-	Smilies::add($b, ':northernmarianaislands:', '&#x1F1F2&#x1F1F5');
-	Smilies::add($b, ':martinique:', '&#x1F1F2&#x1F1F6');
-	Smilies::add($b, ':mauritania:', '&#x1F1F2&#x1F1F7');
-	Smilies::add($b, ':montserrat:', '&#x1F1F2&#x1F1F8');
-	Smilies::add($b, ':malta:', '&#x1F1F2&#x1F1F9');
-	Smilies::add($b, ':mauritius:', '&#x1F1F2&#x1F1FA');
-	Smilies::add($b, ':maldives:', '&#x1F1F2&#x1F1FB');
-	Smilies::add($b, ':malawi:', '&#x1F1F2&#x1F1FC');
-	Smilies::add($b, ':mexico:', '&#x1F1F2&#x1F1FD');
-	Smilies::add($b, ':malaysia:', '&#x1F1F2&#x1F1FE');
-	Smilies::add($b, ':mozambique:', '&#x1F1F2&#x1F1FF');
-	Smilies::add($b, ':namibia:', '&#x1F1F3&#x1F1E6');
-	Smilies::add($b, ':newcaledonia:', '&#x1F1F3&#x1F1E8');
-	Smilies::add($b, ':niger:', '&#x1F1F3&#x1F1EA');
-	Smilies::add($b, ':norfolkisland:', '&#x1F1F3&#x1F1EB');
-	Smilies::add($b, ':nigeria:', '&#x1F1F3&#x1F1EC');
-	Smilies::add($b, ':nicaragua:', '&#x1F1F3&#x1F1EE');
-	Smilies::add($b, ':netherlands:', '&#x1F1F3&#x1F1F1');
-	Smilies::add($b, ':norway:', '&#x1F1F3&#x1F1F4');
-	Smilies::add($b, ':nepal:', '&#x1F1F3&#x1F1F5');
-	Smilies::add($b, ':nauru:', '&#x1F1F3&#x1F1F7');
-	Smilies::add($b, ':niue:', '&#x1F1F3&#x1F1FA');
-	Smilies::add($b, ':newzealand:', '&#x1F1F3&#x1F1FF');
-	Smilies::add($b, ':oman:', '&#x1F1F4&#x1F1F2');
-	Smilies::add($b, ':panama:', '&#x1F1F5&#x1F1E6');
-	Smilies::add($b, ':peru:', '&#x1F1F5&#x1F1EA');
-	Smilies::add($b, ':frenchpolynesia:', '&#x1F1F5&#x1F1EB');
-	Smilies::add($b, ':papuanewguinea:', '&#x1F1F5&#x1F1EC');
-	Smilies::add($b, ':philippines:', '&#x1F1F5&#x1F1ED');
-	Smilies::add($b, ':pakistan:', '&#x1F1F5&#x1F1F0');
-	Smilies::add($b, ':poland:', '&#x1F1F5&#x1F1F1');
-	Smilies::add($b, ':st.pierre&miquelon:', '&#x1F1F5&#x1F1F2');
-	Smilies::add($b, ':pitcairnislands:', '&#x1F1F5&#x1F1F3');
-	Smilies::add($b, ':puertorico:', '&#x1F1F5&#x1F1F7');
-	Smilies::add($b, ':palestinianterritories:', '&#x1F1F5&#x1F1F8');
-	Smilies::add($b, ':portugal:', '&#x1F1F5&#x1F1F9');
-	Smilies::add($b, ':palau:', '&#x1F1F5&#x1F1FC');
-	Smilies::add($b, ':paraguay:', '&#x1F1F5&#x1F1FE');
-	Smilies::add($b, ':qatar:', '&#x1F1F6&#x1F1E6');
-	Smilies::add($b, ':réunion:', '&#x1F1F7&#x1F1EA');
-	Smilies::add($b, ':romania:', '&#x1F1F7&#x1F1F4');
-	Smilies::add($b, ':serbia:', '&#x1F1F7&#x1F1F8');
-	Smilies::add($b, ':russia:', '&#x1F1F7&#x1F1FA');
-	Smilies::add($b, ':rwanda:', '&#x1F1F7&#x1F1FC');
-	Smilies::add($b, ':saudiarabia:', '&#x1F1F8&#x1F1E6');
-	Smilies::add($b, ':solomonislands:', '&#x1F1F8&#x1F1E7');
-	Smilies::add($b, ':seychelles:', '&#x1F1F8&#x1F1E8');
-	Smilies::add($b, ':sudan:', '&#x1F1F8&#x1F1E9');
-	Smilies::add($b, ':sweden:', '&#x1F1F8&#x1F1EA');
-	Smilies::add($b, ':singapore:', '&#x1F1F8&#x1F1EC');
-	Smilies::add($b, ':st.helena:', '&#x1F1F8&#x1F1ED');
-	Smilies::add($b, ':slovenia:', '&#x1F1F8&#x1F1EE');
-	Smilies::add($b, ':svalbard&janmayen:', '&#x1F1F8&#x1F1EF');
-	Smilies::add($b, ':slovakia:', '&#x1F1F8&#x1F1F0');
-	Smilies::add($b, ':sierraleone:', '&#x1F1F8&#x1F1F1');
-	Smilies::add($b, ':sanmarino:', '&#x1F1F8&#x1F1F2');
-	Smilies::add($b, ':senegal:', '&#x1F1F8&#x1F1F3');
-	Smilies::add($b, ':somalia:', '&#x1F1F8&#x1F1F4');
-	Smilies::add($b, ':suriname:', '&#x1F1F8&#x1F1F7');
-	Smilies::add($b, ':southsudan:', '&#x1F1F8&#x1F1F8');
-	Smilies::add($b, ':sãotomé&príncipe:', '&#x1F1F8&#x1F1F9');
-	Smilies::add($b, ':elsalvador:', '&#x1F1F8&#x1F1FB');
-	Smilies::add($b, ':sintmaarten:', '&#x1F1F8&#x1F1FD');
-	Smilies::add($b, ':syria:', '&#x1F1F8&#x1F1FE');
-	Smilies::add($b, ':eswatini:', '&#x1F1F8&#x1F1FF');
-	Smilies::add($b, ':tristandacunha:', '&#x1F1F9&#x1F1E6');
-	Smilies::add($b, ':turks&caicosislands:', '&#x1F1F9&#x1F1E8');
-	Smilies::add($b, ':chad:', '&#x1F1F9&#x1F1E9');
-	Smilies::add($b, ':frenchsouthernterritories:', '&#x1F1F9&#x1F1EB');
-	Smilies::add($b, ':togo:', '&#x1F1F9&#x1F1EC');
-	Smilies::add($b, ':thailand:', '&#x1F1F9&#x1F1ED');
-	Smilies::add($b, ':tajikistan:', '&#x1F1F9&#x1F1EF');
-	Smilies::add($b, ':tokelau:', '&#x1F1F9&#x1F1F0');
-	Smilies::add($b, ':timor-leste:', '&#x1F1F9&#x1F1F1');
-	Smilies::add($b, ':turkmenistan:', '&#x1F1F9&#x1F1F2');
-	Smilies::add($b, ':tunisia:', '&#x1F1F9&#x1F1F3');
-	Smilies::add($b, ':tonga:', '&#x1F1F9&#x1F1F4');
-	Smilies::add($b, ':turkey:', '&#x1F1F9&#x1F1F7');
-	Smilies::add($b, ':trinidad&tobago:', '&#x1F1F9&#x1F1F9');
-	Smilies::add($b, ':tuvalu:', '&#x1F1F9&#x1F1FB');
-	Smilies::add($b, ':taiwan:', '&#x1F1F9&#x1F1FC');
-	Smilies::add($b, ':tanzania:', '&#x1F1F9&#x1F1FF');
-	Smilies::add($b, ':ukraine:', '&#x1F1FA&#x1F1E6');
-	Smilies::add($b, ':uganda:', '&#x1F1FA&#x1F1EC');
-	Smilies::add($b, ':u.s.outlyingislands:', '&#x1F1FA&#x1F1F2');
-	Smilies::add($b, ':unitednations:', '&#x1F1FA&#x1F1F3');
-	Smilies::add($b, ':unitedstates:', '&#x1F1FA&#x1F1F8');
-	Smilies::add($b, ':uruguay:', '&#x1F1FA&#x1F1FE');
-	Smilies::add($b, ':uzbekistan:', '&#x1F1FA&#x1F1FF');
-	Smilies::add($b, ':vaticancity:', '&#x1F1FB&#x1F1E6');
-	Smilies::add($b, ':st.vincent&grenadines:', '&#x1F1FB&#x1F1E8');
-	Smilies::add($b, ':venezuela:', '&#x1F1FB&#x1F1EA');
-	Smilies::add($b, ':britishvirginislands:', '&#x1F1FB&#x1F1EC');
-	Smilies::add($b, ':u.s.virginislands:', '&#x1F1FB&#x1F1EE');
-	Smilies::add($b, ':vietnam:', '&#x1F1FB&#x1F1F3');
-	Smilies::add($b, ':vanuatu:', '&#x1F1FB&#x1F1FA');
-	Smilies::add($b, ':wallis&futuna:', '&#x1F1FC&#x1F1EB');
-	Smilies::add($b, ':samoa:', '&#x1F1FC&#x1F1F8');
-	Smilies::add($b, ':kosovo:', '&#x1F1FD&#x1F1F0');
-	Smilies::add($b, ':yemen:', '&#x1F1FE&#x1F1EA');
-	Smilies::add($b, ':mayotte:', '&#x1F1FE&#x1F1F9');
-	Smilies::add($b, ':southafrica:', '&#x1F1FF&#x1F1E6');
-	Smilies::add($b, ':zambia:', '&#x1F1FF&#x1F1F2');
-	Smilies::add($b, ':zimbabwe:', '&#x1F1FF&#x1F1FC');
+	Smilies::add($b, ':ascension island:', '&#x1F1E6;&#x1F1E8;');
+	Smilies::add($b, ':andorra:', '&#x1F1E6;&#x1F1E9;');
+	Smilies::add($b, ':united arab emirates:', '&#x1F1E6;&#x1F1EA;');
+	Smilies::add($b, ':afghanistan:', '&#x1F1E6;&#x1F1EB;');
+	Smilies::add($b, ':antigua & barbuda:', '&#x1F1E6;&#x1F1EC;');
+	Smilies::add($b, ':anguilla:', '&#x1F1E6;&#x1F1EE;');
+	Smilies::add($b, ':albania:', '&#x1F1E6;&#x1F1F1;');
+	Smilies::add($b, ':armenia:', '&#x1F1E6;&#x1F1F2;');
+	Smilies::add($b, ':angola:', '&#x1F1E6;&#x1F1F4;');
+	Smilies::add($b, ':antarctica:', '&#x1F1E6;&#x1F1F6;');
+	Smilies::add($b, ':argentina:', '&#x1F1E6;&#x1F1F7;');
+	Smilies::add($b, ':americansamoa:', '&#x1F1E6;&#x1F1F8;');
+	Smilies::add($b, ':austria:', '&#x1F1E6;&#x1F1F9;');
+	Smilies::add($b, ':australia:', '&#x1F1E6;&#x1F1FA;');
+	Smilies::add($b, ':aruba:', '&#x1F1E6;&#x1F1FC;');
+	Smilies::add($b, ':ålandislands:', '&#x1F1E6;&#x1F1FD;');
+	Smilies::add($b, ':azerbaijan:', '&#x1F1E6;&#x1F1FF;');
+	Smilies::add($b, ':bosnia&herzegovina:', '&#x1F1E7;&#x1F1E6;');
+	Smilies::add($b, ':barbados:', '&#x1F1E7;&#x1F1E7;');
+	Smilies::add($b, ':bangladesh:', '&#x1F1E7;&#x1F1E9;');
+	Smilies::add($b, ':belgium:', '&#x1F1E7;&#x1F1EA;');
+	Smilies::add($b, ':burkinafaso:', '&#x1F1E7;&#x1F1EB;');
+	Smilies::add($b, ':bulgaria:', '&#x1F1E7;&#x1F1EC;');
+	Smilies::add($b, ':bahrain:', '&#x1F1E7;&#x1F1ED;');
+	Smilies::add($b, ':burundi:', '&#x1F1E7;&#x1F1EE;');
+	Smilies::add($b, ':benin:', '&#x1F1E7;&#x1F1EF;');
+	Smilies::add($b, ':st.barthélemy:', '&#x1F1E7;&#x1F1F1;');
+	Smilies::add($b, ':bermuda:', '&#x1F1E7;&#x1F1F2;');
+	Smilies::add($b, ':brunei:', '&#x1F1E7;&#x1F1F3;');
+	Smilies::add($b, ':bolivia:', '&#x1F1E7;&#x1F1F4;');
+	Smilies::add($b, ':caribbeannetherlands:', '&#x1F1E7;&#x1F1F6;');
+	Smilies::add($b, ':brazil:', '&#x1F1E7;&#x1F1F7;');
+	Smilies::add($b, ':bahamas:', '&#x1F1E7;&#x1F1F8;');
+	Smilies::add($b, ':bhutan:', '&#x1F1E7;&#x1F1F9;');
+	Smilies::add($b, ':bouvetisland:', '&#x1F1E7;&#x1F1FB;');
+	Smilies::add($b, ':botswana:', '&#x1F1E7;&#x1F1FC;');
+	Smilies::add($b, ':belarus:', '&#x1F1E7;&#x1F1FE;');
+	Smilies::add($b, ':belize:', '&#x1F1E7;&#x1F1FF;');
+	Smilies::add($b, ':canada:', '&#x1F1E8;&#x1F1E6;');
+	Smilies::add($b, ':cocos(keeling)islands:', '&#x1F1E8;&#x1F1E8;');
+	Smilies::add($b, ':congo-kinshasa:', '&#x1F1E8;&#x1F1E9;');
+	Smilies::add($b, ':centralafricanrepublic:', '&#x1F1E8;&#x1F1EB;');
+	Smilies::add($b, ':congo-brazzaville:', '&#x1F1E8;&#x1F1EC;');
+	Smilies::add($b, ':switzerland:', '&#x1F1E8;&#x1F1ED;');
+	Smilies::add($b, ':côted’ivoire:', '&#x1F1E8;&#x1F1EE;');
+	Smilies::add($b, ':cookislands:', '&#x1F1E8;&#x1F1F0;');
+	Smilies::add($b, ':chile:', '&#x1F1E8;&#x1F1F1;');
+	Smilies::add($b, ':cameroon:', '&#x1F1E8;&#x1F1F2;');
+	Smilies::add($b, ':china:', '&#x1F1E8;&#x1F1F3;');
+	Smilies::add($b, ':colombia:', '&#x1F1E8;&#x1F1F4;');
+	Smilies::add($b, ':clippertonisland:', '&#x1F1E8;&#x1F1F5;');
+	Smilies::add($b, ':costarica:', '&#x1F1E8;&#x1F1F7;');
+	Smilies::add($b, ':cuba:', '&#x1F1E8;&#x1F1FA;');
+	Smilies::add($b, ':capeverde:', '&#x1F1E8;&#x1F1FB;');
+	Smilies::add($b, ':curaçao:', '&#x1F1E8;&#x1F1FC;');
+	Smilies::add($b, ':christmasisland:', '&#x1F1E8;&#x1F1FD;');
+	Smilies::add($b, ':cyprus:', '&#x1F1E8;&#x1F1FE;');
+	Smilies::add($b, ':czechia:', '&#x1F1E8;&#x1F1FF;');
+	Smilies::add($b, ':germany:', '&#x1F1E9;&#x1F1EA;');
+	Smilies::add($b, ':diegogarcia:', '&#x1F1E9;&#x1F1EC;');
+	Smilies::add($b, ':djibouti:', '&#x1F1E9;&#x1F1EF;');
+	Smilies::add($b, ':denmark:', '&#x1F1E9;&#x1F1F0;');
+	Smilies::add($b, ':dominica:', '&#x1F1E9;&#x1F1F2;');
+	Smilies::add($b, ':dominicanrepublic:', '&#x1F1E9;&#x1F1F4;');
+	Smilies::add($b, ':algeria:', '&#x1F1E9;&#x1F1FF;');
+	Smilies::add($b, ':ceuta&melilla:', '&#x1F1EA;&#x1F1E6;');
+	Smilies::add($b, ':ecuador:', '&#x1F1EA;&#x1F1E8;');
+	Smilies::add($b, ':estonia:', '&#x1F1EA;&#x1F1EA;');
+	Smilies::add($b, ':egypt:', '&#x1F1EA;&#x1F1EC;');
+	Smilies::add($b, ':westernsahara:', '&#x1F1EA;&#x1F1ED;');
+	Smilies::add($b, ':eritrea:', '&#x1F1EA;&#x1F1F7;');
+	Smilies::add($b, ':spain:', '&#x1F1EA;&#x1F1F8;');
+	Smilies::add($b, ':ethiopia:', '&#x1F1EA;&#x1F1F9;');
+	Smilies::add($b, ':europeanunion:', '&#x1F1EA;&#x1F1FA;');
+	Smilies::add($b, ':finland:', '&#x1F1EB;&#x1F1EE;');
+	Smilies::add($b, ':fiji:', '&#x1F1EB;&#x1F1EF;');
+	Smilies::add($b, ':falklandislands:', '&#x1F1EB;&#x1F1F0;');
+	Smilies::add($b, ':micronesia:', '&#x1F1EB;&#x1F1F2;');
+	Smilies::add($b, ':faroeislands:', '&#x1F1EB;&#x1F1F4;');
+	Smilies::add($b, ':france:', '&#x1F1EB;&#x1F1F7;');
+	Smilies::add($b, ':gabon:', '&#x1F1EC;&#x1F1E6;');
+	Smilies::add($b, ':unitedkingdom:', '&#x1F1EC;&#x1F1E7;');
+	Smilies::add($b, ':grenada:', '&#x1F1EC;&#x1F1E9;');
+	Smilies::add($b, ':georgia:', '&#x1F1EC;&#x1F1EA;');
+	Smilies::add($b, ':frenchguiana:', '&#x1F1EC;&#x1F1EB;');
+	Smilies::add($b, ':guernsey:', '&#x1F1EC;&#x1F1EC;');
+	Smilies::add($b, ':ghana:', '&#x1F1EC;&#x1F1ED;');
+	Smilies::add($b, ':gibraltar:', '&#x1F1EC;&#x1F1EE;');
+	Smilies::add($b, ':greenland:', '&#x1F1EC;&#x1F1F1;');
+	Smilies::add($b, ':gambia:', '&#x1F1EC;&#x1F1F2;');
+	Smilies::add($b, ':guinea:', '&#x1F1EC;&#x1F1F3;');
+	Smilies::add($b, ':guadeloupe:', '&#x1F1EC;&#x1F1F5;');
+	Smilies::add($b, ':equatorialguinea:', '&#x1F1EC;&#x1F1F6;');
+	Smilies::add($b, ':greece:', '&#x1F1EC,;&#x1F1F7;');
+	Smilies::add($b, ':southgeorgia&southsandwichislands:', '&#x1F1EC;&#x1F1F8;');
+	Smilies::add($b, ':guatemala:', '&#x1F1EC;&#x1F1F9;');
+	Smilies::add($b, ':guam:', '&#x1F1EC;&#x1F1FA;');
+	Smilies::add($b, ':guinea-bissau:', '&#x1F1EC;&#x1F1FC;');
+	Smilies::add($b, ':guyana:', '&#x1F1EC&#x1F1FE;');
+	Smilies::add($b, ':hongkongsarchina:', '&#x1F1ED&#x1F1F0;');
+	Smilies::add($b, ':heard&mcdonaldislands:', '&#x1F1ED;&#x1F1F2;');
+	Smilies::add($b, ':honduras:', '&#x1F1ED;&#x1F1F3;');
+	Smilies::add($b, ':croatia:', '&#x1F1ED;&#x1F1F7;');
+	Smilies::add($b, ':haiti:', '&#x1F1ED;&#x1F1F9;');
+	Smilies::add($b, ':hungary:', '&#x1F1ED;&#x1F1FA;');
+	Smilies::add($b, ':canaryislands:', '&#x1F1EE;&#x1F1E8;');
+	Smilies::add($b, ':indonesia:', '&#x1F1EE;&#x1F1E9;');
+	Smilies::add($b, ':ireland:', '&#x1F1EE;&#x1F1EA;');
+	Smilies::add($b, ':israel:', '&#x1F1EE;&#x1F1F1;');
+	Smilies::add($b, ':isleofman:', '&#x1F1EE;&#x1F1F2;');
+	Smilies::add($b, ':india:', '&#x1F1EE;&#x1F1F3;');
+	Smilies::add($b, ':britishindianoceanterritory:', '&#x1F1EE;&#x1F1F4;');
+	Smilies::add($b, ':iraq:', '&#x1F1EE;&#x1F1F6;');
+	Smilies::add($b, ':iran:', '&#x1F1EE;&#x1F1F7;');
+	Smilies::add($b, ':iceland:', '&#x1F1EE;&#x1F1F8;');
+	Smilies::add($b, ':italy:', '&#x1F1EE;&#x1F1F9;');
+	Smilies::add($b, ':jersey:', '&#x1F1EF;&#x1F1EA;');
+	Smilies::add($b, ':jamaica:', '&#x1F1EF;&#x1F1F2;');
+	Smilies::add($b, ':jordan:', '&#x1F1EF;&#x1F1F4;');
+	Smilies::add($b, ':japan:', '&#x1F1EF;&#x1F1F5;');
+	Smilies::add($b, ':kenya:', '&#x1F1F0;&#x1F1EA;');
+	Smilies::add($b, ':kyrgyzstan:', '&#x1F1F0;&#x1F1EC;');
+	Smilies::add($b, ':cambodia:', '&#x1F1F0;&#x1F1ED;');
+	Smilies::add($b, ':kiribati:', '&#x1F1F0;&#x1F1EE;');
+	Smilies::add($b, ':comoros:', '&#x1F1F0;&#x1F1F2;');
+	Smilies::add($b, ':st.kitts&nevis:', '&#x1F1F0;&#x1F1F3;');
+	Smilies::add($b, ':northkorea:', '&#x1F1F0;&#x1F1F5;');
+	Smilies::add($b, ':southkorea:', '&#x1F1F0;&#x1F1F7;');
+	Smilies::add($b, ':kuwait:', '&#x1F1F0;&#x1F1FC;');
+	Smilies::add($b, ':caymanislands:', '&#x1F1F0;&#x1F1FE;');
+	Smilies::add($b, ':kazakhstan:', '&#x1F1F0;&#x1F1FF;');
+	Smilies::add($b, ':laos:', '&#x1F1F1;&#x1F1E6;');
+	Smilies::add($b, ':lebanon:', '&#x1F1F1;&#x1F1E7;');
+	Smilies::add($b, ':st.lucia:', '&#x1F1F1;&#x1F1E8;');
+	Smilies::add($b, ':liechtenstein:', '&#x1F1F1;&#x1F1EE;');
+	Smilies::add($b, ':srilanka:', '&#x1F1F1;&#x1F1F0;');
+	Smilies::add($b, ':liberia:', '&#x1F1F1;&#x1F1F7;');
+	Smilies::add($b, ':lesotho:', '&#x1F1F1;&#x1F1F8;');
+	Smilies::add($b, ':lithuania:', '&#x1F1F1;&#x1F1F9;');
+	Smilies::add($b, ':luxembourg:', '&#x1F1F1;&#x1F1FA;');
+	Smilies::add($b, ':latvia:', '&#x1F1F1;&#x1F1FB;');
+	Smilies::add($b, ':libya:', '&#x1F1F1;&#x1F1FE;');
+	Smilies::add($b, ':morocco:', '&#x1F1F2;&#x1F1E6;');
+	Smilies::add($b, ':monaco:', '&#x1F1F2;&#x1F1E8;');
+	Smilies::add($b, ':moldova:', '&#x1F1F2;&#x1F1E9;');
+	Smilies::add($b, ':montenegro:', '&#x1F1F2;&#x1F1EA;');
+	Smilies::add($b, ':st.martin:', '&#x1F1F2;&#x1F1EB;');
+	Smilies::add($b, ':madagascar:', '&#x1F1F2;&#x1F1EC;');
+	Smilies::add($b, ':marshallislands:', '&#x1F1F2;&#x1F1ED;');
+	Smilies::add($b, ':northmacedonia:', '&#x1F1F2;&#x1F1F0;');
+	Smilies::add($b, ':mali:', '&#x1F1F2;&#x1F1F1;');
+	Smilies::add($b, ':myanmar(burma):', '&#x1F1F2;&#x1F1F2;');
+	Smilies::add($b, ':mongolia:', '&#x1F1F2;&#x1F1F3;');
+	Smilies::add($b, ':macaosarchina:', '&#x1F1F2;&#x1F1F4;');
+	Smilies::add($b, ':northernmarianaislands:', '&#x1F1F2;&#x1F1F5;');
+	Smilies::add($b, ':martinique:', '&#x1F1F2;&#x1F1F6;');
+	Smilies::add($b, ':mauritania:', '&#x1F1F2;&#x1F1F7;');
+	Smilies::add($b, ':montserrat:', '&#x1F1F2;&#x1F1F8;');
+	Smilies::add($b, ':malta:', '&#x1F1F2;&#x1F1F9;');
+	Smilies::add($b, ':mauritius:', '&#x1F1F2;&#x1F1FA;');
+	Smilies::add($b, ':maldives:', '&#x1F1F2;&#x1F1FB;');
+	Smilies::add($b, ':malawi:', '&#x1F1F2;&#x1F1FC;');
+	Smilies::add($b, ':mexico:', '&#x1F1F2;&#x1F1FD;');
+	Smilies::add($b, ':malaysia:', '&#x1F1F2;&#x1F1FE;');
+	Smilies::add($b, ':mozambique:', '&#x1F1F2;&#x1F1FF;');
+	Smilies::add($b, ':namibia:', '&#x1F1F3;&#x1F1E6;');
+	Smilies::add($b, ':newcaledonia:', '&#x1F1F3;&#x1F1E8;');
+	Smilies::add($b, ':niger:', '&#x1F1F3;&#x1F1EA;');
+	Smilies::add($b, ':norfolkisland:', '&#x1F1F3;&#x1F1EB;');
+	Smilies::add($b, ':nigeria:', '&#x1F1F3;&#x1F1EC;');
+	Smilies::add($b, ':nicaragua:', '&#x1F1F3;&#x1F1EE;');
+	Smilies::add($b, ':netherlands:', '&#x1F1F3;&#x1F1F1;');
+	Smilies::add($b, ':norway:', '&#x1F1F3;&#x1F1F4;');
+	Smilies::add($b, ':nepal:', '&#x1F1F3;&#x1F1F5;');
+	Smilies::add($b, ':nauru:', '&#x1F1F3;&#x1F1F7;');
+	Smilies::add($b, ':niue:', '&#x1F1F3;&#x1F1FA;');
+	Smilies::add($b, ':newzealand:', '&#x1F1F3;&#x1F1FF;');
+	Smilies::add($b, ':oman:', '&#x1F1F4;&#x1F1F2;');
+	Smilies::add($b, ':panama:', '&#x1F1F5;&#x1F1E6;');
+	Smilies::add($b, ':peru:', '&#x1F1F5;&#x1F1EA;');
+	Smilies::add($b, ':frenchpolynesia:', '&#x1F1F5;&#x1F1EB;');
+	Smilies::add($b, ':papuanewguinea:', '&#x1F1F5;&#x1F1EC;');
+	Smilies::add($b, ':philippines:', '&#x1F1F5;&#x1F1ED;');
+	Smilies::add($b, ':pakistan:', '&#x1F1F5;&#x1F1F0;');
+	Smilies::add($b, ':poland:', '&#x1F1F5;&#x1F1F1;');
+	Smilies::add($b, ':st.pierre&miquelon:', '&#x1F1F5;&#x1F1F2;');
+	Smilies::add($b, ':pitcairnislands:', '&#x1F1F5;&#x1F1F3;');
+	Smilies::add($b, ':puertorico:', '&#x1F1F5;&#x1F1F7;');
+	Smilies::add($b, ':palestinianterritories:', '&#x1F1F5;&#x1F1F8;');
+	Smilies::add($b, ':portugal:', '&#x1F1F5;&#x1F1F9;');
+	Smilies::add($b, ':palau:', '&#x1F1F5;&#x1F1FC;');
+	Smilies::add($b, ':paraguay:', '&#x1F1F5;&#x1F1FE;');
+	Smilies::add($b, ':qatar:', '&#x1F1F6;&#x1F1E6;');
+	Smilies::add($b, ':réunion:', '&#x1F1F7;&#x1F1EA;');
+	Smilies::add($b, ':romania:', '&#x1F1F7;&#x1F1F4;');
+	Smilies::add($b, ':serbia:', '&#x1F1F7;&#x1F1F8;');
+	Smilies::add($b, ':russia:', '&#x1F1F7;&#x1F1FA;');
+	Smilies::add($b, ':rwanda:', '&#x1F1F7;&#x1F1FC;');
+	Smilies::add($b, ':saudiarabia:', '&#x1F1F8;&#x1F1E6;');
+	Smilies::add($b, ':solomonislands:', '&#x1F1F8;&#x1F1E7;');
+	Smilies::add($b, ':seychelles:', '&#x1F1F8;&#x1F1E8;');
+	Smilies::add($b, ':sudan:', '&#x1F1F8;&#x1F1E9;');
+	Smilies::add($b, ':sweden:', '&#x1F1F8;&#x1F1EA;');
+	Smilies::add($b, ':singapore:', '&#x1F1F8;&#x1F1EC;');
+	Smilies::add($b, ':st.helena:', '&#x1F1F8;&#x1F1ED;');
+	Smilies::add($b, ':slovenia:', '&#x1F1F8;&#x1F1EE;');
+	Smilies::add($b, ':svalbard&janmayen:', '&#x1F1F8;&#x1F1EF;');
+	Smilies::add($b, ':slovakia:', '&#x1F1F8;&#x1F1F0;');
+	Smilies::add($b, ':sierraleone:', '&#x1F1F8;&#x1F1F1;');
+	Smilies::add($b, ':sanmarino:', '&#x1F1F8;&#x1F1F2;');
+	Smilies::add($b, ':senegal:', '&#x1F1F8;&#x1F1F3;');
+	Smilies::add($b, ':somalia:', '&#x1F1F8;&#x1F1F4;');
+	Smilies::add($b, ':suriname:', '&#x1F1F8;&#x1F1F7;');
+	Smilies::add($b, ':southsudan:', '&#x1F1F8;&#x1F1F8;');
+	Smilies::add($b, ':sãotomé&príncipe:', '&#x1F1F8;&#x1F1F9;');
+	Smilies::add($b, ':elsalvador:', '&#x1F1F8;&#x1F1FB;');
+	Smilies::add($b, ':sintmaarten:', '&#x1F1F8;&#x1F1FD;');
+	Smilies::add($b, ':syria:', '&#x1F1F8;&#x1F1FE;');
+	Smilies::add($b, ':eswatini:', '&#x1F1F8;&#x1F1FF;');
+	Smilies::add($b, ':tristandacunha:', '&#x1F1F9;&#x1F1E6;');
+	Smilies::add($b, ':turks&caicosislands:', '&#x1F1F9;&#x1F1E8;');
+	Smilies::add($b, ':chad:', '&#x1F1F9;&#x1F1E9;');
+	Smilies::add($b, ':frenchsouthernterritories:', '&#x1F1F9;&#x1F1EB;');
+	Smilies::add($b, ':togo:', '&#x1F1F9;&#x1F1EC;');
+	Smilies::add($b, ':thailand:', '&#x1F1F9;&#x1F1ED;');
+	Smilies::add($b, ':tajikistan:', '&#x1F1F9;&#x1F1EF;');
+	Smilies::add($b, ':tokelau:', '&#x1F1F9;&#x1F1F0;');
+	Smilies::add($b, ':timor-leste:', '&#x1F1F9&#x1F1F1;');
+	Smilies::add($b, ':turkmenistan:', '&#x1F1F9&#x1F1F2;');
+	Smilies::add($b, ':tunisia:', '&#x1F1F9&#x1F1F3;');
+	Smilies::add($b, ':tonga:', '&#x1F1F9;&#x1F1F4;');
+	Smilies::add($b, ':turkey:', '&#x1F1F9;&#x1F1F7;');
+	Smilies::add($b, ':trinidad&tobago:', '&#x1F1F9;&#x1F1F9;');
+	Smilies::add($b, ':tuvalu:', '&#x1F1F9;&#x1F1FB;');
+	Smilies::add($b, ':taiwan:', '&#x1F1F9;&#x1F1FC;');
+	Smilies::add($b, ':tanzania:', '&#x1F1F9;&#x1F1FF;');
+	Smilies::add($b, ':ukraine:', '&#x1F1FA;&#x1F1E6;');
+	Smilies::add($b, ':uganda:', '&#x1F1FA;&#x1F1EC;');
+	Smilies::add($b, ':u.s.outlyingislands:', '&#x1F1FA;&#x1F1F2;');
+	Smilies::add($b, ':unitednations:', '&#x1F1FA;&#x1F1F3;');
+	Smilies::add($b, ':unitedstates:', '&#x1F1FA;&#x1F1F8;');
+	Smilies::add($b, ':uruguay:', '&#x1F1FA;&#x1F1FE;');
+	Smilies::add($b, ':uzbekistan:', '&#x1F1FA;&#x1F1FF;');
+	Smilies::add($b, ':vaticancity:', '&#x1F1FB;&#x1F1E6;');
+	Smilies::add($b, ':st.vincent&grenadines:', '&#x1F1FB;&#x1F1E8;');
+	Smilies::add($b, ':venezuela:', '&#x1F1FB;&#x1F1EA;');
+	Smilies::add($b, ':britishvirginislands:', '&#x1F1FB;&#x1F1EC;');
+	Smilies::add($b, ':u.s.virginislands:', '&#x1F1FB;&#x1F1EE;');
+	Smilies::add($b, ':vietnam:', '&#x1F1FB;&#x1F1F3;');
+	Smilies::add($b, ':vanuatu:', '&#x1F1FB;&#x1F1FA;');
+	Smilies::add($b, ':wallis&futuna:', '&#x1F1FC;&#x1F1EB;');
+	Smilies::add($b, ':samoa:', '&#x1F1FC;&#x1F1F8;');
+	Smilies::add($b, ':kosovo:', '&#x1F1FD;&#x1F1F0;');
+	Smilies::add($b, ':yemen:', '&#x1F1FE;&#x1F1EA;');
+	Smilies::add($b, ':mayotte:', '&#x1F1FE;&#x1F1F9;');
+	Smilies::add($b, ':southafrica:', '&#x1F1FF;&#x1F1E6;');
+	Smilies::add($b, ':zambia:', '&#x1F1FF;&#x1F1F2;');
+	Smilies::add($b, ':zimbabwe:', '&#x1F1FF;&#x1F1FC;');
 
 // subdivision-flag
- 	Smilies::add($b, ':england:', '&#x1F3F4&#xE0067&#xE0062&#xE0065&#xE006E&#xE0067&#xE007F');
-	Smilies::add($b, ':scotland:', '&#x1F3F4&#xE0067&#xE0062&#xE0073&#xE0074&#xE007F');
-	Smilies::add($b, ':wales:', '&#x1F3F4&#xE0067&#xE0062&#xE0077&#xE006C&#xE0073&#xE007F');
+	Smilies::add($b, ':england:', '&#x1F3F4;&#xE0067;&#xE0062;&#xE0065;&#xE006E;&#xE0067;&#xE007F;');
+	Smilies::add($b, ':scotland:', '&#x1F3F4;&#xE0067;&#xE0062;&#xE0073;&#xE0074;&#xE007F;');
+	Smilies::add($b, ':wales:', '&#x1F3F4;&#xE0067;&#xE0062;&#xE0077;&#xE006C;&#xE0073;&#xE007F;');
 
 	}
+

From 0697f078f11af094ec8455d1ec9e59ec63cd66d0 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Sun, 22 Dec 2024 08:38:17 +0100
Subject: [PATCH 206/294] [CI] Fix codecov

---
 .woodpecker/.phpunit.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml
index 887e897e..3f713d19 100644
--- a/.woodpecker/.phpunit.yml
+++ b/.woodpecker/.phpunit.yml
@@ -98,9 +98,9 @@ pipeline:
         - friendica/friendica-addons
     commands:
       - codecov -R '.' -Z -f 'clover.xml'
-    secrets:
-      - source: codecov-token
-        target: codecov_token
+    environment:
+      codecov_token:
+        from_secret: codecov-token
 
 services:
   mariadb:

From 5f50fd2498b58787f8671c3e6cff6658d9dd38dd Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Sun, 22 Dec 2024 08:54:51 +0100
Subject: [PATCH 207/294] Fix codecov token env

---
 .woodpecker/.phpunit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml
index 3f713d19..6acbf787 100644
--- a/.woodpecker/.phpunit.yml
+++ b/.woodpecker/.phpunit.yml
@@ -99,7 +99,7 @@ pipeline:
     commands:
       - codecov -R '.' -Z -f 'clover.xml'
     environment:
-      codecov_token:
+      CODECOV_TOKEN:
         from_secret: codecov-token
 
 services:

From 9e1f7dc468b3e615e2345b691b89ecfc80364f87 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 27 Dec 2024 10:26:20 +0000
Subject: [PATCH 208/294] Bluesky: Preparation to be able to fetch AT links

---
 bluesky/bluesky.php | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index d6b7624b..1355f000 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -97,27 +97,25 @@ function bluesky_item_by_link(array &$hookData)
 		return;
 	}
 
-	$token = DI::atProtocol()->getUserToken($hookData['uid']);
-	if (empty($token)) {
-		return;
+	if (substr($hookData['uri'], 0, 5) != 'at://') {
+		if (!preg_match('#^' . ATProtocol::WEB . '/profile/(.+)/post/(.+)#', $hookData['uri'], $matches)) {
+			return;
+		}
+
+		$did = DI::atProtocol()->getDid($matches[1]);
+		if (empty($did)) {
+			return;
+		}
+	
+		Logger::debug('Found bluesky post', ['uri' => $hookData['uri'], 'did' => $did, 'cid' => $matches[2]]);
+	
+		$uri = 'at://' . $did . '/app.bsky.feed.post/' . $matches[2];
+	} else {
+		$uri = $hookData['uri'];
 	}
 
-	// @todo also support the URI format (at://did/app.bsky.feed.post/cid)
-	if (!preg_match('#^' . ATProtocol::WEB . '/profile/(.+)/post/(.+)#', $hookData['uri'], $matches)) {
-		return;
-	}
-
-	$did = DI::atProtocol()->getDid($matches[1]);
-	if (empty($did)) {
-		return;
-	}
-
-	Logger::debug('Found bluesky post', ['url' => $hookData['uri'], 'did' => $did, 'cid' => $matches[2]]);
-
-	$uri = 'at://' . $did . '/app.bsky.feed.post/' . $matches[2];
-
 	$uri = DI::atpProcessor()->fetchMissingPost($uri, $hookData['uid'], Item::PR_FETCHED, 0, 0);
-	Logger::debug('Got post', ['did' => $did, 'cid' => $matches[2], 'result' => $uri]);
+	Logger::debug('Got post', ['uri' => $uri]);
 	if (!empty($uri)) {
 		$item = Post::selectFirst(['id'], ['uri' => $uri, 'uid' => $hookData['uid']]);
 		if (!empty($item['id'])) {

From 995e81e951a7525f4aa9bbceb661dd0fc8e548ae Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Wed, 1 Jan 2025 20:06:43 +0100
Subject: [PATCH 209/294] [CI] Fix releaser

---
 .woodpecker/.code_standards_check.yml  | 2 +-
 .woodpecker/.continuous-deployment.yml | 2 +-
 .woodpecker/.messages.po_check.yml     | 2 +-
 .woodpecker/.phpunit.yml               | 2 +-
 .woodpecker/.releaser.yml              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.woodpecker/.code_standards_check.yml b/.woodpecker/.code_standards_check.yml
index fb5be33c..50872d4c 100644
--- a/.woodpecker/.code_standards_check.yml
+++ b/.woodpecker/.code_standards_check.yml
@@ -1,6 +1,6 @@
 skip_clone: true
 
-pipeline:
+steps:
   clone_friendica_base:
     image: alpine/git
     commands:
diff --git a/.woodpecker/.continuous-deployment.yml b/.woodpecker/.continuous-deployment.yml
index 4d3bc5b7..6b41deae 100644
--- a/.woodpecker/.continuous-deployment.yml
+++ b/.woodpecker/.continuous-deployment.yml
@@ -5,7 +5,7 @@ labels:
 
 skip_clone: true
 
-pipeline:
+steps:
   clone_friendica_base:
     image: alpine/git
     commands:
diff --git a/.woodpecker/.messages.po_check.yml b/.woodpecker/.messages.po_check.yml
index aa40ab4e..e0239dcd 100644
--- a/.woodpecker/.messages.po_check.yml
+++ b/.woodpecker/.messages.po_check.yml
@@ -1,6 +1,6 @@
 skip_clone: true
 
-pipeline:
+steps:
   clone_friendica_base:
     image: alpine/git
     commands:
diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml
index 6acbf787..8b840f80 100644
--- a/.woodpecker/.phpunit.yml
+++ b/.woodpecker/.phpunit.yml
@@ -17,7 +17,7 @@ labels:
 
 skip_clone: true
 
-pipeline:
+steps:
   clone_friendica_base:
     image: alpine/git
     commands:
diff --git a/.woodpecker/.releaser.yml b/.woodpecker/.releaser.yml
index f12697b9..2d880a6b 100644
--- a/.woodpecker/.releaser.yml
+++ b/.woodpecker/.releaser.yml
@@ -5,7 +5,7 @@ labels:
 
 skip_clone: true
 
-pipeline:
+steps:
   clone_friendica_base:
     image: alpine/git
     commands:

From d034e311cbe5c45f808baf0c88efd88c484acd76 Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sun, 5 Jan 2025 21:51:37 +0100
Subject: [PATCH 210/294] Ratioed: add help link

---
 ratioed/templates/ratioed.tpl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ratioed/templates/ratioed.tpl b/ratioed/templates/ratioed.tpl
index 0d81b0d7..5d92bff2 100644
--- a/ratioed/templates/ratioed.tpl
+++ b/ratioed/templates/ratioed.tpl
@@ -2,7 +2,10 @@
 <link rel="stylesheet" href="view/theme/frio/css/mod_admin.css?v={{constant('\Friendica\App::VERSION')}}" type="text/css" media="screen"/>
 
 <div id="admin-users" class="adminpage generic-page-wrapper">
-	<h1>{{$title}} - {{$page}} ({{$count}})</h1>
+	<h1>
+		{{$title}} - {{$page}} ({{$count}})
+		<a href="{{$base_url}}/ratioed/help"><i style="float: right; font-size: 60%" class="fa fa-question-circle fa-fw" aria-hidden="true"></i></a>
+	</h1>
 	<p>
 		<a href="{{$base_url}}/moderation/users/create" class="btn btn-primary"><i class="fa fa-user-plus"></i> {{$h_newuser}}</a>
 	</p>

From 8e65141cb5e04be141ee0489d28aa8be62155553 Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sun, 5 Jan 2025 21:57:18 +0100
Subject: [PATCH 211/294] Ratioed: bump version number

---
 ratioed/ratioed.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ratioed/ratioed.php b/ratioed/ratioed.php
index 8ae0d48c..581ef89b 100644
--- a/ratioed/ratioed.php
+++ b/ratioed/ratioed.php
@@ -2,7 +2,7 @@
 /**
  * Name: Ratioed
  * Description: Additional moderation user table with statistics about user behaviour
- * Version: 0.1
+ * Version: 0.2
  * Author: Matthew Exon <http://mat.exon.name>
  */
 

From 2ef9cb8add8bc28a5d6dea9f40276abea2814d97 Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sat, 11 Jan 2025 19:36:06 +0100
Subject: [PATCH 212/294] Ratioed: fill in zeroes for empty values

---
 ratioed/RatioedPanel.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ratioed/RatioedPanel.php b/ratioed/RatioedPanel.php
index bd9b44dc..dac71752 100644
--- a/ratioed/RatioedPanel.php
+++ b/ratioed/RatioedPanel.php
@@ -175,8 +175,10 @@ class RatioedPanel extends Active
 						$user['ratioed'] = (float)($user['ratio']) >= 2.0;
 					}
 					else {
+						$user['reactions'] = 0;
 						if ($user['comments'] == 0) {
-							$user['ratio'] = '0';
+							$user['comments'] = 0;
+							$user['ratio'] = 0;
 							$user['ratioed'] = false;
 						}
 						else {

From d495810b2daf9e278cf317df9a12702b136d131c Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sat, 11 Jan 2025 19:36:38 +0100
Subject: [PATCH 213/294] Ratioed: allow both sorting directions

---
 ratioed/RatioedPanel.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ratioed/RatioedPanel.php b/ratioed/RatioedPanel.php
index dac71752..08d94167 100644
--- a/ratioed/RatioedPanel.php
+++ b/ratioed/RatioedPanel.php
@@ -70,10 +70,10 @@ class RatioedPanel extends Active
 
 		$order		   = 'last-item';
 		$order_direction = '-';
-		if (!empty($request['o'])) {
-			$new_order = $request['o'];
-			if ($new_order[0] === '-') {
-				$order_direction = '-';
+		if (!empty($_REQUEST['o'])) {
+			$new_order = $_REQUEST['o'];
+			if ($new_order[0] === '+') {
+				$order_direction = '+';
 				$new_order	   = substr($new_order, 1);
 			}
 

From 81639ff61574c38769c3693bec6054b1b27bfefc Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sat, 11 Jan 2025 19:38:29 +0100
Subject: [PATCH 214/294] Ratioed: fix sorting by columns

---
 ratioed/templates/ratioed.tpl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ratioed/templates/ratioed.tpl b/ratioed/templates/ratioed.tpl
index 5d92bff2..d634993e 100644
--- a/ratioed/templates/ratioed.tpl
+++ b/ratioed/templates/ratioed.tpl
@@ -22,9 +22,9 @@
 					</th>
 					<th></th>
 					{{foreach $th_users as $k=>$th}}
-						{{if $k < 2 || $order_users == $th.1 || ($k==5 && !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1])) }}
+						{{if $k < 2 || $order_users == $th.1 || ($k==4 && !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.5.1])) }}
 						<th class="th-{{$k}}">
-							<a href="{{$baseurl}}/moderation/users/active?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}" class="table-order">
+							<a href="{{$baseurl}}/ratioed?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}" class="table-order">
 								{{if $order_users == $th.1}}
 									{{if $order_direction_users == "+"}}
 									&#8595;
@@ -66,11 +66,7 @@
 					<td>{{$u.login_date}}</td>
 				{{/if}}
 
-				{{if $order_users == $th_users.4.1}}
-					<td>{{$u.lastitem_date}}</td>
-				{{/if}}
-
-				{{if !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1]) }}
+				{{if $order_users == $th_users.5.1}}
 					<td>
 						<i class="fa
 							{{if $u.page_flags_raw==0}}fa-user{{/if}}		{{* PAGE_NORMAL *}}
@@ -94,6 +90,10 @@
 					</td>
 				{{/if}}
 
+				{{if !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.5.1]) }}
+					<td>{{$u.lastitem_date}}</td>
+				{{/if}}
+
 					<td class="text-right">
 						<button type="button" class="btn-link admin-settings-action-link" onclick="return details({{$u.uid}})"><span class="caret"></span></button>
 					</td>

From 46b38367209b8c5c6f084454d5a9ea9eb322a8d9 Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sat, 11 Jan 2025 19:39:20 +0100
Subject: [PATCH 215/294] Ratioed: remove create user button

---
 ratioed/templates/ratioed.tpl | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ratioed/templates/ratioed.tpl b/ratioed/templates/ratioed.tpl
index d634993e..c64cb1dc 100644
--- a/ratioed/templates/ratioed.tpl
+++ b/ratioed/templates/ratioed.tpl
@@ -6,9 +6,6 @@
 		{{$title}} - {{$page}} ({{$count}})
 		<a href="{{$base_url}}/ratioed/help"><i style="float: right; font-size: 60%" class="fa fa-question-circle fa-fw" aria-hidden="true"></i></a>
 	</h1>
-	<p>
-		<a href="{{$base_url}}/moderation/users/create" class="btn btn-primary"><i class="fa fa-user-plus"></i> {{$h_newuser}}</a>
-	</p>
 	<form action="{{$baseurl}}/{{$query_string}}" method="post">
 		<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
 		<table id="users" class="table table-hover">

From b360b553eddf3a7ad01c06f7b050b1a69734cdc7 Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sat, 11 Jan 2025 20:07:18 +0100
Subject: [PATCH 216/294] Ratioed: remove actions

---
 ratioed/RatioedPanel.php      | 30 ++++--------------------------
 ratioed/templates/ratioed.tpl | 26 ++------------------------
 2 files changed, 6 insertions(+), 50 deletions(-)

diff --git a/ratioed/RatioedPanel.php b/ratioed/RatioedPanel.php
index 08d94167..19f6dd44 100644
--- a/ratioed/RatioedPanel.php
+++ b/ratioed/RatioedPanel.php
@@ -24,7 +24,6 @@ class RatioedPanel extends Active
 			return Renderer::replaceMacros($template, array('$config' => DI::baseUrl() . '/settings/addon'));
 		}
 
-		$action = $this->parameters['action'] ?? '';
 		$uid	= $this->parameters['uid']	?? 0;
 		$user   = [];
 
@@ -32,31 +31,10 @@ class RatioedPanel extends Active
 			$user = User::getById($uid, ['username', 'blocked']);
 			if (!$user) {
 				$this->systemMessages->addNotice($this->t('User not found'));
-				$this->baseUrl->redirect('moderation/users');
+				$this->baseUrl->redirect('ratioed');
 			}
 		}
 
-		switch ($action) {
-			case 'delete':
-				if ($this->session->getLocalUserId() != $uid) {
-					self::checkFormSecurityTokenRedirectOnError('moderation/users/active', 'moderation_users_active', 't');
-					// delete user
-					User::remove($uid);
-
-					$this->systemMessages->addNotice($this->t('User "%s" deleted', $user['username']));
-				} else {
-					$this->systemMessages->addNotice($this->t('You can\'t remove yourself'));
-				}
-
-				$this->baseUrl->redirect('moderation/users/active');
-				break;
-			case 'block':
-				self::checkFormSecurityTokenRedirectOnError('moderation/users/active', 'moderation_users_active', 't');
-				User::block($uid);
-				$this->systemMessages->addNotice($this->t('User "%s" blocked', $user['username']));
-				$this->baseUrl->redirect('moderation/users/active');
-				break;
-		}
 		$pager = new Pager($this->l10n, $this->args->getQueryString(), 100);
 
 		$valid_orders = [
@@ -69,11 +47,11 @@ class RatioedPanel extends Active
 		];
 
 		$order		   = 'last-item';
-		$order_direction = '-';
+		$order_direction = '+';
 		if (!empty($_REQUEST['o'])) {
 			$new_order = $_REQUEST['o'];
-			if ($new_order[0] === '+') {
-				$order_direction = '+';
+			if ($new_order[0] === '-') {
+				$order_direction = '-';
 				$new_order	   = substr($new_order, 1);
 			}
 
diff --git a/ratioed/templates/ratioed.tpl b/ratioed/templates/ratioed.tpl
index c64cb1dc..24ae20b8 100644
--- a/ratioed/templates/ratioed.tpl
+++ b/ratioed/templates/ratioed.tpl
@@ -11,12 +11,7 @@
 		<table id="users" class="table table-hover">
 			<thead>
 				<tr>
-					<th>
-						<div class="checkbox">
-							<input type="checkbox" id="admin-settings-users-select" class="selecttoggle" data-select-class="users_ckbx"/>
-							<label for="admin-settings-users-select"></label>
-						</div>
-					</th>
+					<th></th>
 					<th></th>
 					{{foreach $th_users as $k=>$th}}
 						{{if $k < 2 || $order_users == $th.1 || ($k==4 && !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.5.1])) }}
@@ -42,16 +37,7 @@
 			<tbody>
 			{{foreach $users as $u}}
 				<tr id="user-{{$u.uid}}" class="{{if $u.ratioed}}blocked{{/if}}">
-					<td>
-						{{if $u.is_deletable}}
-						<div class="checkbox">
-							<input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/>
-							<label for="id_user_{{$u.uid}}"></label>
-						</div>
-						{{else}}
-						&nbsp;
-						{{/if}}
-					</td>
+					<td></td>
 					<td><img class="avatar-nano" src="{{$u.micro}}" title="{{$u.nickname}}"></td>
 					<td><a href="{{$u.url}}" title="{{$u.nickname}}"> {{$u.name}}</a></td>
 					<td>{{$u.email}}</td>
@@ -151,14 +137,6 @@
 			{{/foreach}}
 			</tbody>
 		</table>
-		<div class="panel-footer">
-			<button type="submit" name="page_users_block" value="1" class="btn btn-warning">
-				<i class="fa fa-ban" aria-hidden="true"></i> {{$block}}
-			</button>
-			<button type="submit" name="page_users_delete" value="1" class="btn btn-danger" onclick="return confirm_delete('{{$confirm_delete_multi}}')">
-				<i class="fa fa-trash" aria-hidden="true"></i> {{$delete}}
-			</button>
-		</div>
 		{{$pager nofilter}}
 	</form>
 </div>

From 3441c9bd0e7bcf713b5358a3d316c091af1c459a Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sun, 5 Jan 2025 00:23:51 +0100
Subject: [PATCH 217/294] Ratioed: add statistics about reply likes and reply
 guy score

---
 ratioed/RatioedPanel.php      | 137 ++++++++++++++++++++++++++++++++++
 ratioed/templates/help.tpl    |  57 +++++++++++++-
 ratioed/templates/ratioed.tpl |   2 +-
 3 files changed, 192 insertions(+), 4 deletions(-)

diff --git a/ratioed/RatioedPanel.php b/ratioed/RatioedPanel.php
index 19f6dd44..33a009cd 100644
--- a/ratioed/RatioedPanel.php
+++ b/ratioed/RatioedPanel.php
@@ -8,7 +8,9 @@ use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\User;
+use Friendica\Model\Verb;
 use Friendica\Module\Moderation\Users\Active;
+use Friendica\Protocol\Activity;
 
 /**
  * This class implements the "Behaviour" panel in Moderation/Users
@@ -75,6 +77,11 @@ class RatioedPanel extends Active
 			$this->t('Comments last 24h'),
 			$this->t('Reactions last 24h'),
 			$this->t('Ratio last 24h'),
+			$this->t('Replies last month'),
+			$this->t('Reply likes'),
+			$this->t('Respondee likes'),
+			$this->t('OP likes'),
+			$this->t('Reply guy score'),
 		];
 		$field_names = [
 			'name',
@@ -87,6 +94,11 @@ class RatioedPanel extends Active
 			'comments',
 			'reactions',
 			'ratio',
+			'reply_count',
+			'reply_likes',
+			'reply_respondee_likes',
+			'reply_op_likes',
+			'reply_guy_score',
 		];
 		$th_users = array_map(null, $header_titles, $valid_orders, $field_names);
 
@@ -125,6 +137,129 @@ class RatioedPanel extends Active
 		]);
 	}
 
+	protected function getReplyGuyRow($contact_uid)
+	{
+		$like_vid = Verb::getID(Activity::LIKE);
+		$post_vid = Verb::getID(Activity::POST);
+
+		/*
+		 * This is a complicated query.
+		 *
+		 * The innermost select retrieves a chain of four posts: an
+		 * original post, a target comment (possibly deep down in the
+		 * thread), a reply from our user, and a like for that reply.
+		 * If there's no like, we still want to count the reply, so we
+		 * use an outer join.
+		 *
+		 * The second select adds "points" for different kinds of
+		 * likes.  The outermost select then counts up these points,
+		 * and the number of distinct replies.
+		 */
+		$reply_guy_result = DBA::p('
+SELECT
+  COUNT(distinct reply_id) AS replies_total,
+  SUM(like_point) AS like_total,
+  SUM(target_like_point) AS target_like_total,
+  SUM(original_like_point) AS original_like_total
+FROM (
+  SELECT
+    reply_id,
+    like_date,
+    like_date IS NOT NULL AS like_point,
+    like_author = target_author AS target_like_point,
+    like_author = original_author AS original_like_point
+  FROM (
+    SELECT
+      original_post.`uri-id` AS original_id,
+      original_post.`author-id` AS original_author,
+      original_post.created AS original_date,
+      target_post.`uri-id` AS target_id,
+      target_post.`author-id` AS target_author,
+      target_post.created AS target_date,
+      reply_post.`uri-id` AS reply_id,
+      reply_post.`author-id` AS reply_author,
+      reply_post.created AS reply_date,
+      like_post.`uri-id` AS like_id,
+      like_post.`author-id` AS like_author,
+      like_post.created AS like_date
+    FROM
+      post AS original_post
+    JOIN
+      post AS target_post
+    ON
+      original_post.`uri-id` = target_post.`parent-uri-id`
+    JOIN
+      post AS reply_post
+    ON
+      target_post.`uri-id` = reply_post.`thr-parent-id` AND
+      reply_post.`author-id` = ? AND
+      reply_post.`author-id` != target_post.`author-id` AND
+      reply_post.`author-id` != original_post.`author-id` AND
+      reply_post.`uri-id` != reply_post.`thr-parent-id` AND
+      reply_post.vid = ? AND
+      reply_post.created > CURDATE() - INTERVAL 1 MONTH
+    LEFT OUTER JOIN
+      post AS like_post
+    ON
+      reply_post.`uri-id` = like_post.`thr-parent-id` AND
+      like_post.vid = ? AND
+      like_post.`author-id` != reply_post.`author-id`
+  ) AS post_meta
+) AS reply_counts
+', $contact_uid, $post_vid, $like_vid);
+		return $reply_guy_result;
+	}
+
+	// https://stackoverflow.com/a/48283297/235936
+	protected function sigFig($value, $digits)
+	{
+		if ($value == 0) {
+			$decimalPlaces = $digits - 1;
+		} elseif ($value < 0) {
+			$decimalPlaces = $digits - floor(log10($value * -1)) - 1;
+		} else {
+			$decimalPlaces = $digits - floor(log10($value)) - 1;
+		}
+
+		$answer = ($decimalPlaces > 0) ?
+			number_format($value, $decimalPlaces) : round($value, $decimalPlaces);
+		return $answer;
+	}
+
+	protected function fillReplyGuyData(&$user) {
+		$reply_guy_result = $this->getReplyGuyRow($user['user_contact_uid']);
+		if (DBA::isResult($reply_guy_result)) {
+			$reply_guy_result_row = DBA::fetch($reply_guy_result);
+			$user['reply_count'] = $reply_guy_result_row['replies_total'] ?? 0;
+			$user['reply_likes'] = $reply_guy_result_row['like_total'] ?? 0;
+			$user['reply_respondee_likes'] = $reply_guy_result_row['target_like_total'] ?? 0;
+			$user['reply_op_likes'] = $reply_guy_result_row['original_like_total'] ?? 0;
+
+			$denominator = $user['reply_likes'] + $user['reply_respondee_likes'] + $user['reply_op_likes'];
+			if ($user['reply_count'] == 0) {
+				$user['reply_guy'] = false;
+				$user['reply_guy_score'] = 0;
+			}
+			elseif ($denominator == 0) {
+				$user['reply_guy'] = true;
+				$user['reply_guy_score'] = '∞';
+			}
+			else {
+				$reply_guy_score = $user['reply_count'] / $denominator;
+				$user['reply_guy'] = $reply_guy_score >= 1.0;
+				$user['reply_guy_score'] = $this->sigFig($reply_guy_score, 2);
+			}
+		}
+		else {
+			$user['reply_count'] = "error";
+			$user['reply_likes'] = "error";
+			$user['reply_respondee_likes'] = "error";
+			$user['reply_op_likes'] = "error";
+			$user['reply_guy'] = false;
+			$user['reply_guy_score'] = 0;
+		}
+	}
+
 	protected function setupUserCallback(): \Closure
 	{
 		Logger::debug("ratioed: setupUserCallback");
@@ -179,6 +314,8 @@ class RatioedPanel extends Active
 				$user['ratioed'] = false;
 			}
 
+			$this->fillReplyGuyData($user);
+
 			$user = $parentCallback($user);
 			Logger::debug("ratioed: setupUserCallback", [
 				'uid' => $user['uid'],
diff --git a/ratioed/templates/help.tpl b/ratioed/templates/help.tpl
index fee47e34..db6480cf 100644
--- a/ratioed/templates/help.tpl
+++ b/ratioed/templates/help.tpl
@@ -2,7 +2,7 @@
   <div class="panel-body">
     <h2>Ratioed Plugin Help</h2>
     <p>
-      This plugin provides administrators with additional statistics about
+      This plugin provides moderators with additional statistics about
       the behaviour of users.  These may be useful as early warning signs
       that warrant more carefully watching the behaviour of a user.  They
       are <em>not</em> suitable as a trigger for instantly blocking,
@@ -28,7 +28,7 @@
     <p>
       This plugin allows viewing of an actual ratio, calculated over the
       last 24 hours.  This is a useful timeframe for sudden dogpiling
-      events that administrators might not otherwise notice.  The plugin
+      events that moderators might not otherwise notice.  The plugin
       also calculates other statistics.
     </p>
     <h3>Explanation of Statistics</h3>
@@ -68,10 +68,61 @@
       24h".  It is intended to approximate the traditional ratio as
       understood on Twitter.
     </p>
+    <h4>Replies last month</h4>
+    <p>
+      This is the number of times the user posted a reply to someone any time in the last month.
+    </p>
+    <h4>Reply likes</h4>
+    <p>
+      This is the number of likes received by the user on their
+      replies to other people's posts in the last month.  Replies that
+      receive likes can be assumed to be more of a valuable
+      contribution than replies that do not.
+    </p>
+    <h4>Respondee likes</h4>
+    <p>
+      The number of times in the last month the user replied to
+      someone else's comment and that person then liked the reply.
+      Likes to replies are not necessarily a positive thing, but if
+      the person you're replying to approves the reply, that's a very
+      good sign.  Of course it's also common in a debate for neither
+      side to like the other side's comments, but the debate still can
+      be valuable.
+    </p>
+    <h4>OP likes</h4>
+    <p>
+      The number of times in the last month the user replied on a
+      thread and the original poster that started the thread liked the
+      reply.  While there is no formal concept of "ownership" of a
+      thread, conventionally the original poster is assumed to have
+      started the thread for a reason, and making replies that do not
+      fulfil that purpose are bad etiquette.  Getting approval from
+      the original poster therefore is a good sign that the user is
+      posting replies that are wanted.
+    </p>
+    <h4>Reply guy score</h4>
+    <p>
+      A <a href="https://en.wikipedia.org/wiki/Reply_guy">"reply
+      guy"</a> is a common Internet phenomenon of people (disproportionately male)
+      posting unwanted comments on other (disproportionately female)
+      people's threads, derailing the
+      conversation.  This score loosely approximates this phenomenon,
+      as the ratio betwen the number of replies and the sum of likes,
+      respondee likes, and OP likes.  This formula gives extra weight
+      to particularly relevant likes: a reply to a top-level post that
+      is liked by the original poster scores the maximum of 3
+      "points".  A score above 1.0 might indicate cause for concern
+      for moderators.
+    </p>
+    <p>
+      Since this is indicative of long-term behaviour, the score is
+      calculated over a month instead of 24 hours.
+    </p>
+    </p>
     <h3>Performance</h3>
     <p>
       The statistics are computed from scratch each time the page loads.
-      It's possible that this might put a heavy load on the database. and
+      It's possible that this might put a heavy load on the database, and
       the page may take a long time to load.
     </p>
     <h3>Extending</h3>
diff --git a/ratioed/templates/ratioed.tpl b/ratioed/templates/ratioed.tpl
index 24ae20b8..6ee6b1d0 100644
--- a/ratioed/templates/ratioed.tpl
+++ b/ratioed/templates/ratioed.tpl
@@ -36,7 +36,7 @@
 			</thead>
 			<tbody>
 			{{foreach $users as $u}}
-				<tr id="user-{{$u.uid}}" class="{{if $u.ratioed}}blocked{{/if}}">
+				<tr id="user-{{$u.uid}}" class="{{if $u.ratioed || $u.reply_guy}}blocked{{/if}}">
 					<td></td>
 					<td><img class="avatar-nano" src="{{$u.micro}}" title="{{$u.nickname}}"></td>
 					<td><a href="{{$u.url}}" title="{{$u.nickname}}"> {{$u.name}}</a></td>

From 8ba4cd5f6140a1ad64ad5404e603ed76b8d535f3 Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Sat, 11 Jan 2025 19:42:03 +0100
Subject: [PATCH 218/294] Ratioed: bump version number

---
 ratioed/ratioed.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ratioed/ratioed.php b/ratioed/ratioed.php
index 581ef89b..443fdaa9 100644
--- a/ratioed/ratioed.php
+++ b/ratioed/ratioed.php
@@ -2,7 +2,7 @@
 /**
  * Name: Ratioed
  * Description: Additional moderation user table with statistics about user behaviour
- * Version: 0.2
+ * Version: 0.3
  * Author: Matthew Exon <http://mat.exon.name>
  */
 

From 807598dbd03b9dca3c3ac7d890fe0cb2f8a1bb9f Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Wed, 15 Jan 2025 19:32:55 +0100
Subject: [PATCH 219/294] Ratioed: wrap long lines

---
 ratioed/templates/help.tpl | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/ratioed/templates/help.tpl b/ratioed/templates/help.tpl
index db6480cf..0d012ca7 100644
--- a/ratioed/templates/help.tpl
+++ b/ratioed/templates/help.tpl
@@ -70,7 +70,9 @@
     </p>
     <h4>Replies last month</h4>
     <p>
-      This is the number of times the user posted a reply to someone any time in the last month.
+      This is the number of times the user posted a reply to someone
+      else, on a thread the user did not start, any time in the last
+      month.
     </p>
     <h4>Reply likes</h4>
     <p>
@@ -86,8 +88,8 @@
       Likes to replies are not necessarily a positive thing, but if
       the person you're replying to approves the reply, that's a very
       good sign.  Of course it's also common in a debate for neither
-      side to like the other side's comments, but the debate still can
-      be valuable.
+      side to like the other side's comments without that indicating
+      an unhealthy interaction, so interpret this statistic cautiously.
     </p>
     <h4>OP likes</h4>
     <p>
@@ -103,10 +105,10 @@
     <h4>Reply guy score</h4>
     <p>
       A <a href="https://en.wikipedia.org/wiki/Reply_guy">"reply
-      guy"</a> is a common Internet phenomenon of people (disproportionately male)
-      posting unwanted comments on other (disproportionately female)
-      people's threads, derailing the
-      conversation.  This score loosely approximates this phenomenon,
+      guy"</a> is a common Internet phenomenon of people
+      (disproportionately male) posting unwanted comments on other
+      (disproportionately female) people's threads, derailing the
+      conversation.  This score loosely quantifies this phenomenon,
       as the ratio betwen the number of replies and the sum of likes,
       respondee likes, and OP likes.  This formula gives extra weight
       to particularly relevant likes: a reply to a top-level post that

From ee8c852d38cd74ca770a8d2445c4975607260bfc Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Wed, 15 Jan 2025 19:33:11 +0100
Subject: [PATCH 220/294] Ratioed: remove action buttons

---
 ratioed/templates/ratioed.tpl | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/ratioed/templates/ratioed.tpl b/ratioed/templates/ratioed.tpl
index 6ee6b1d0..2413ed9d 100644
--- a/ratioed/templates/ratioed.tpl
+++ b/ratioed/templates/ratioed.tpl
@@ -121,18 +121,7 @@
 					{{/foreach}}
 
 					</td>
-					<td class="text-right">
-				{{if $u.is_deletable}}
-						<a href="{{$baseurl}}/moderation/users/active/block/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$block}}">
-							<i class="fa fa-ban" aria-hidden="true"></i>
-						</a>
-						<a href="{{$baseurl}}/moderation/users/active/delete/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$delete}}" onclick="return confirm_delete('{{$confirm_delete}}','{{$u.name}}')">
-							<i class="fa fa-trash" aria-hidden="true"></i>
-						</a>
-				{{else}}
-						&nbsp;
-				{{/if}}
-					</td>
+					<td class="text-right"></td>
 				</tr>
 			{{/foreach}}
 			</tbody>

From cb70a4eaffa1e603c5a910211118deab02e519e8 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 18 Jan 2025 15:25:50 +0000
Subject: [PATCH 221/294] Fix codestyle

---
 ratioed/RatioedPanel.php | 111 ++++++++++++++++++---------------------
 1 file changed, 52 insertions(+), 59 deletions(-)

diff --git a/ratioed/RatioedPanel.php b/ratioed/RatioedPanel.php
index 33a009cd..d0fac8ad 100644
--- a/ratioed/RatioedPanel.php
+++ b/ratioed/RatioedPanel.php
@@ -163,47 +163,47 @@ SELECT
   SUM(original_like_point) AS original_like_total
 FROM (
   SELECT
-    reply_id,
-    like_date,
-    like_date IS NOT NULL AS like_point,
-    like_author = target_author AS target_like_point,
-    like_author = original_author AS original_like_point
+	reply_id,
+	like_date,
+	like_date IS NOT NULL AS like_point,
+	like_author = target_author AS target_like_point,
+	like_author = original_author AS original_like_point
   FROM (
-    SELECT
-      original_post.`uri-id` AS original_id,
-      original_post.`author-id` AS original_author,
-      original_post.created AS original_date,
-      target_post.`uri-id` AS target_id,
-      target_post.`author-id` AS target_author,
-      target_post.created AS target_date,
-      reply_post.`uri-id` AS reply_id,
-      reply_post.`author-id` AS reply_author,
-      reply_post.created AS reply_date,
-      like_post.`uri-id` AS like_id,
-      like_post.`author-id` AS like_author,
-      like_post.created AS like_date
-    FROM
-      post AS original_post
-    JOIN
-      post AS target_post
-    ON
-      original_post.`uri-id` = target_post.`parent-uri-id`
-    JOIN
-      post AS reply_post
-    ON
-      target_post.`uri-id` = reply_post.`thr-parent-id` AND
-      reply_post.`author-id` = ? AND
-      reply_post.`author-id` != target_post.`author-id` AND
-      reply_post.`author-id` != original_post.`author-id` AND
-      reply_post.`uri-id` != reply_post.`thr-parent-id` AND
-      reply_post.vid = ? AND
-      reply_post.created > CURDATE() - INTERVAL 1 MONTH
-    LEFT OUTER JOIN
-      post AS like_post
-    ON
-      reply_post.`uri-id` = like_post.`thr-parent-id` AND
-      like_post.vid = ? AND
-      like_post.`author-id` != reply_post.`author-id`
+	SELECT
+	  original_post.`uri-id` AS original_id,
+	  original_post.`author-id` AS original_author,
+	  original_post.created AS original_date,
+	  target_post.`uri-id` AS target_id,
+	  target_post.`author-id` AS target_author,
+	  target_post.created AS target_date,
+	  reply_post.`uri-id` AS reply_id,
+	  reply_post.`author-id` AS reply_author,
+	  reply_post.created AS reply_date,
+	  like_post.`uri-id` AS like_id,
+	  like_post.`author-id` AS like_author,
+	  like_post.created AS like_date
+	FROM
+	  post AS original_post
+	JOIN
+	  post AS target_post
+	ON
+	  original_post.`uri-id` = target_post.`parent-uri-id`
+	JOIN
+	  post AS reply_post
+	ON
+	  target_post.`uri-id` = reply_post.`thr-parent-id` AND
+	  reply_post.`author-id` = ? AND
+	  reply_post.`author-id` != target_post.`author-id` AND
+	  reply_post.`author-id` != original_post.`author-id` AND
+	  reply_post.`uri-id` != reply_post.`thr-parent-id` AND
+	  reply_post.vid = ? AND
+	  reply_post.created > CURDATE() - INTERVAL 1 MONTH
+	LEFT OUTER JOIN
+	  post AS like_post
+	ON
+	  reply_post.`uri-id` = like_post.`thr-parent-id` AND
+	  like_post.vid = ? AND
+	  like_post.`author-id` != reply_post.`author-id`
   ) AS post_meta
 ) AS reply_counts
 ', $contact_uid, $post_vid, $like_vid);
@@ -226,7 +226,8 @@ FROM (
 		return $answer;
 	}
 
-	protected function fillReplyGuyData(&$user) {
+	protected function fillReplyGuyData(&$user)
+	{
 		$reply_guy_result = $this->getReplyGuyRow($user['user_contact_uid']);
 		if (DBA::isResult($reply_guy_result)) {
 			$reply_guy_result_row = DBA::fetch($reply_guy_result);
@@ -235,22 +236,19 @@ FROM (
 			$user['reply_respondee_likes'] = $reply_guy_result_row['target_like_total'] ?? 0;
 			$user['reply_op_likes'] = $reply_guy_result_row['original_like_total'] ?? 0;
 
-			$denominator = $user['reply_likes'] + $user['reply_respondee_likes'] + $user['reply_op_likes'];
+			$denominator = (int)($user['reply_likes'] + $user['reply_respondee_likes'] + $user['reply_op_likes']);
 			if ($user['reply_count'] == 0) {
 				$user['reply_guy'] = false;
 				$user['reply_guy_score'] = 0;
-			}
-			elseif ($denominator == 0) {
+			} elseif ($denominator == 0) {
 				$user['reply_guy'] = true;
 				$user['reply_guy_score'] = '∞';
-			}
-			else {
+			} else {
 				$reply_guy_score = $user['reply_count'] / $denominator;
 				$user['reply_guy'] = $reply_guy_score >= 1.0;
 				$user['reply_guy_score'] = $this->sigFig($reply_guy_score, 2);
 			}
-		}
-		else {
+		} else {
 			$user['reply_count'] = "error";
 			$user['reply_likes'] = "error";
 			$user['reply_respondee_likes'] = "error";
@@ -272,9 +270,8 @@ FROM (
 			if (DBA::isResult($self_contact_result)) {
 				$self_contact_result_row = DBA::fetch($self_contact_result);
 				$user['user_contact_uid'] = $self_contact_result_row['user_contact_uid'];
-			}
-			else {
-				$user['user_contact_uid'] = NULL;
+			} else {
+				$user['user_contact_uid'] = null;
 			}
 
 			if ($user['user_contact_uid']) {
@@ -286,28 +283,24 @@ FROM (
 					if ($user['reactions'] > 0) {
 						$user['ratio'] = number_format($user['comments'] / $user['reactions'], 1, '.', '');
 						$user['ratioed'] = (float)($user['ratio']) >= 2.0;
-					}
-					else {
+					} else {
 						$user['reactions'] = 0;
 						if ($user['comments'] == 0) {
 							$user['comments'] = 0;
 							$user['ratio'] = 0;
 							$user['ratioed'] = false;
-						}
-						else {
+						} else {
 							$user['ratio'] = '∞';
 							$user['ratioed'] = false;
 						}
 					}
-				}
-				else {
+				} else {
 					$user['comments'] = 'error';
 					$user['reactions'] = 'error';
 					$user['ratio'] = 'error';
 					$user['ratioed'] = false;
 				}
-			}
-			else {
+			} else {
 				$user['comments'] = 'error';
 				$user['reactions'] = 'error';
 				$user['ratio'] = 'error';

From 0d0aae36cd1a5a646ddbad15e1a4f548d6f14073 Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Wed, 22 Jan 2025 08:30:30 +0100
Subject: [PATCH 222/294] Clean up phpstan warning

---
 ratioed/RatioedPanel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ratioed/RatioedPanel.php b/ratioed/RatioedPanel.php
index d0fac8ad..b611b256 100644
--- a/ratioed/RatioedPanel.php
+++ b/ratioed/RatioedPanel.php
@@ -236,7 +236,7 @@ FROM (
 			$user['reply_respondee_likes'] = $reply_guy_result_row['target_like_total'] ?? 0;
 			$user['reply_op_likes'] = $reply_guy_result_row['original_like_total'] ?? 0;
 
-			$denominator = (int)($user['reply_likes'] + $user['reply_respondee_likes'] + $user['reply_op_likes']);
+			$denominator = intval($user['reply_likes']) + intval($user['reply_respondee_likes']) + intval($user['reply_op_likes']);
 			if ($user['reply_count'] == 0) {
 				$user['reply_guy'] = false;
 				$user['reply_guy_score'] = 0;

From 2741227bfa8bb174d29a69399403f72b94e00ba2 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 22 Jan 2025 08:42:18 +0000
Subject: [PATCH 223/294] Add phpstan in woodpacker

---
 .woodpecker/.code_standards_check.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.woodpecker/.code_standards_check.yml b/.woodpecker/.code_standards_check.yml
index 50872d4c..60a1bd2a 100644
--- a/.woodpecker/.code_standards_check.yml
+++ b/.woodpecker/.code_standards_check.yml
@@ -56,6 +56,10 @@ steps:
       - /tmp/drone-cache:/tmp/cache
     when:
       event: pull_request
+  phpstan:
+    image: friendicaci/php8.3:php8.3.3
+    commands:
+      - ./bin/composer.phar run phpstan;
   check:
     image: friendicaci/php-cs
     commands:

From 7a7940a8eddcd39279afc953ea136ff78f854f8a Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 22 Jan 2025 08:46:57 +0000
Subject: [PATCH 224/294] Fix PHPStan errors

---
 ratioed/RatioedPanel.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ratioed/RatioedPanel.php b/ratioed/RatioedPanel.php
index b611b256..91665640 100644
--- a/ratioed/RatioedPanel.php
+++ b/ratioed/RatioedPanel.php
@@ -231,13 +231,13 @@ FROM (
 		$reply_guy_result = $this->getReplyGuyRow($user['user_contact_uid']);
 		if (DBA::isResult($reply_guy_result)) {
 			$reply_guy_result_row = DBA::fetch($reply_guy_result);
-			$user['reply_count'] = $reply_guy_result_row['replies_total'] ?? 0;
-			$user['reply_likes'] = $reply_guy_result_row['like_total'] ?? 0;
-			$user['reply_respondee_likes'] = $reply_guy_result_row['target_like_total'] ?? 0;
-			$user['reply_op_likes'] = $reply_guy_result_row['original_like_total'] ?? 0;
+			$user['reply_count'] = (int) $reply_guy_result_row['replies_total'] ?? 0;
+			$user['reply_likes'] = (int) $reply_guy_result_row['like_total'] ?? 0;
+			$user['reply_respondee_likes'] = (int) $reply_guy_result_row['target_like_total'] ?? 0;
+			$user['reply_op_likes'] = (int) $reply_guy_result_row['original_like_total'] ?? 0;
 
-			$denominator = intval($user['reply_likes']) + intval($user['reply_respondee_likes']) + intval($user['reply_op_likes']);
-			if ($user['reply_count'] == 0) {
+			$denominator = $user['reply_likes'] + $user['reply_respondee_likes'] + $user['reply_op_likes'];
+			if ($user['reply_count'] === 0) {
 				$user['reply_guy'] = false;
 				$user['reply_guy_score'] = 0;
 			} elseif ($denominator == 0) {

From 2b5764c132bb02390d8a417bc80e0fb28f83df07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@home.arpa>
Date: Wed, 15 Jan 2025 10:42:08 +0100
Subject: [PATCH 225/294] rework saml addon

fix #1587
remove css-side hiding of elements, which was broken.
remove them or make them readonly via javascript
---
 saml/saml.css | 1 -
 saml/saml.php | 9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 saml/saml.css

diff --git a/saml/saml.css b/saml/saml.css
deleted file mode 100644
index 087633cd..00000000
--- a/saml/saml.css
+++ /dev/null
@@ -1 +0,0 @@
-#settings-form > div:first-of-type, #settings-form > h2:first-of-type, #wrapper_mpassword, #wrapper_email { display: none !important; }
diff --git a/saml/saml.php b/saml/saml.php
index 9f065355..f3dd1774 100755
--- a/saml/saml.php
+++ b/saml/saml.php
@@ -75,11 +75,6 @@ function saml_install()
 	Hook::register('footer', __FILE__, 'saml_footer');
 }
 
-function saml_head(string &$body)
-{
-	DI::page()->registerStylesheet(__DIR__ . '/saml.css');
-}
-
 function saml_footer(string &$body)
 {
 	$fragment = addslashes(BBCode::convertForUriId(User::getSystemUriId(), DI::config()->get('saml', 'settings_statement')));
@@ -87,6 +82,10 @@ function saml_footer(string &$body)
 <script>
 var target=$("#settings-nickname-desc");
 if (target.length) { target.append("<p>$fragment</p>"); }
+document.getElementById('id_email').setAttribute('readonly', 'readonly');
+document.getElementById('password-settings').remove();
+document.getElementById('password-settings-collapse').remove();
+document.getElementById('id_mpassword_wrapper').remove();
 </script>
 EOL;
 }

From 792f50f835ebb9181f7d627282e582a153373a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@home.arpa>
Date: Thu, 16 Jan 2025 18:53:05 +0100
Subject: [PATCH 226/294] fix view in vier and frio

---
 saml/saml.php | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/saml/saml.php b/saml/saml.php
index f3dd1774..7fdafc1e 100755
--- a/saml/saml.php
+++ b/saml/saml.php
@@ -83,9 +83,22 @@ function saml_footer(string &$body)
 var target=$("#settings-nickname-desc");
 if (target.length) { target.append("<p>$fragment</p>"); }
 document.getElementById('id_email').setAttribute('readonly', 'readonly');
-document.getElementById('password-settings').remove();
-document.getElementById('password-settings-collapse').remove();
-document.getElementById('id_mpassword_wrapper').remove();
+if ( document.getElementById('password-settings') != null ) {
+	document.getElementById('password-settings').remove();
+}
+if ( document.getElementById('password-settings-collapse') != null ) {
+	document.getElementById('password-settings-collapse').remove();
+}
+if ( document.getElementById('id_mpassword_wrapper') != null ) {
+	document.getElementById('id_mpassword_wrapper').remove();
+}
+if ( document.getElementById('wrapper_mpassword') != null ) {
+	document.getElementById('wrapper_mpassword').remove();
+}
+if ( document.getElementById('wrapper_password') != null ) {
+	document.getElementById('wrapper_password').parentNode.parentNode.children[0].remove();
+	document.getElementById('wrapper_password').parentNode.remove();
+}
 </script>
 EOL;
 }

From c50636727361a153b5ed5f445ab6afed9497e663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@home.arpa>
Date: Fri, 17 Jan 2025 03:04:31 +0100
Subject: [PATCH 227/294] replace password-handling with hint

also add hint to email-field
---
 saml/saml.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/saml/saml.php b/saml/saml.php
index 7fdafc1e..81a6bfcc 100755
--- a/saml/saml.php
+++ b/saml/saml.php
@@ -78,26 +78,32 @@ function saml_install()
 function saml_footer(string &$body)
 {
 	$fragment = addslashes(BBCode::convertForUriId(User::getSystemUriId(), DI::config()->get('saml', 'settings_statement')));
+	$samlhint = DI::l10n()->t('managed via SAML authentication');
 	$body .= <<<EOL
 <script>
 var target=$("#settings-nickname-desc");
 if (target.length) { target.append("<p>$fragment</p>"); }
 document.getElementById('id_email').setAttribute('readonly', 'readonly');
-if ( document.getElementById('password-settings') != null ) {
-	document.getElementById('password-settings').remove();
-}
+var saml_hint = document.createElement("span");
+var saml_hint_text = document.createTextNode('$samlhint');
+saml_hint.appendChild(saml_hint_text);
+document.getElementById('id_email').parentNode.insertBefore(saml_hint, document.getElementById('id_email').nextSibling);
+// Frio theme
 if ( document.getElementById('password-settings-collapse') != null ) {
-	document.getElementById('password-settings-collapse').remove();
+	document.getElementById('password-settings-collapse').replaceChildren(saml_hint.cloneNode(true));
 }
 if ( document.getElementById('id_mpassword_wrapper') != null ) {
+	document.getElementById('id_mpassword_wrapper').parentNode.appendChild(saml_hint.cloneNode(true));
 	document.getElementById('id_mpassword_wrapper').remove();
+	document.getElementById('id_email').nextElementSibling.classList.add('help-block');
 }
+// Vier theme
 if ( document.getElementById('wrapper_mpassword') != null ) {
 	document.getElementById('wrapper_mpassword').remove();
+	document.getElementById('id_email').nextElementSibling.classList.add('field_help');
 }
 if ( document.getElementById('wrapper_password') != null ) {
-	document.getElementById('wrapper_password').parentNode.parentNode.children[0].remove();
-	document.getElementById('wrapper_password').parentNode.remove();
+	document.getElementById('wrapper_password').parentNode.replaceChildren(saml_hint.cloneNode(true));
 }
 </script>
 EOL;

From 0b4aaac9fd16bc26511f226ed470fb4e18395e22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@home.arpa>
Date: Fri, 17 Jan 2025 03:24:17 +0100
Subject: [PATCH 228/294] translation for saml-hint

---
 saml/lang/C/messages.po | 82 ++++++++++++++++++++---------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/saml/lang/C/messages.po b/saml/lang/C/messages.po
index 05579568..b4a4c8ce 100644
--- a/saml/lang/C/messages.po
+++ b/saml/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-18 07:23+0200\n"
+"POT-Creation-Date: 2025-01-17 03:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,82 +17,82 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: saml.php:231
+#: saml.php:81
+msgid "managed via SAML authentication"
+msgstr ""
+
+#: saml.php:246
 msgid "Settings statement"
 msgstr ""
 
-#: saml.php:232
-msgid ""
-"A statement on the settings page explaining where the user should go to "
-"change their e-mail and password. BBCode allowed."
-msgstr ""
-
-#: saml.php:237
-msgid "IdP ID"
-msgstr ""
-
-#: saml.php:238
-msgid ""
-"Identity provider (IdP) entity URI (e.g., https://example.com/auth/realms/"
-"user)."
-msgstr ""
-
-#: saml.php:242
-msgid "Client ID"
-msgstr ""
-
-#: saml.php:243
-msgid "Identifier assigned to client by the identity provider (IdP)."
-msgstr ""
-
 #: saml.php:247
-msgid "IdP SSO URL"
-msgstr ""
-
-#: saml.php:248
-msgid "The URL for your identity provider's SSO endpoint."
+msgid "A statement on the settings page explaining where the user should go to change their e-mail and password. BBCode allowed."
 msgstr ""
 
 #: saml.php:252
-msgid "IdP SLO request URL"
+msgid "IdP ID"
 msgstr ""
 
 #: saml.php:253
-msgid "The URL for your identity provider's SLO request endpoint."
+msgid "Identity provider (IdP) entity URI (e.g., https://example.com/auth/realms/user)."
 msgstr ""
 
 #: saml.php:257
-msgid "IdP SLO response URL"
+msgid "Client ID"
 msgstr ""
 
 #: saml.php:258
-msgid "The URL for your identity provider's SLO response endpoint."
+msgid "Identifier assigned to client by the identity provider (IdP)."
 msgstr ""
 
 #: saml.php:262
-msgid "SP private key"
+msgid "IdP SSO URL"
 msgstr ""
 
 #: saml.php:263
-msgid "The private key the addon should use to authenticate."
+msgid "The URL for your identity provider's SSO endpoint."
 msgstr ""
 
 #: saml.php:267
-msgid "SP certificate"
+msgid "IdP SLO request URL"
 msgstr ""
 
 #: saml.php:268
-msgid "The certficate for the addon's private key."
+msgid "The URL for your identity provider's SLO request endpoint."
 msgstr ""
 
 #: saml.php:272
-msgid "IdP certificate"
+msgid "IdP SLO response URL"
 msgstr ""
 
 #: saml.php:273
+msgid "The URL for your identity provider's SLO response endpoint."
+msgstr ""
+
+#: saml.php:277
+msgid "SP private key"
+msgstr ""
+
+#: saml.php:278
+msgid "The private key the addon should use to authenticate."
+msgstr ""
+
+#: saml.php:282
+msgid "SP certificate"
+msgstr ""
+
+#: saml.php:283
+msgid "The certficate for the addon's private key."
+msgstr ""
+
+#: saml.php:287
+msgid "IdP certificate"
+msgstr ""
+
+#: saml.php:288
 msgid "The x509 certficate for your identity provider."
 msgstr ""
 
-#: saml.php:276
+#: saml.php:291
 msgid "Save Settings"
 msgstr ""

From 4310c1355d42e7d0c9f071866c06624afd324f3a Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 10:53:01 +0000
Subject: [PATCH 229/294] Replace call for Logger with DI::logger()

---
 advancedcontentfilter/advancedcontentfilter.php | 3 +--
 birdavatar/birdavatar.php                       | 3 +--
 blackout/blackout.php                           | 3 +--
 catavatar/catavatar.php                         | 3 +--
 fromapp/fromapp.php                             | 3 +--
 geonames/geonames.php                           | 3 +--
 gnot/gnot.php                                   | 3 +--
 googlemaps/googlemaps.php                       | 3 +--
 gravatar/gravatar.php                           | 3 +--
 impressum/impressum.php                         | 3 +--
 keycloakpassword/keycloakpassword.php           | 3 +--
 krynn/krynn.php                                 | 3 +--
 leistungsschutzrecht/leistungsschutzrecht.php   | 3 +--
 libravatar/libravatar.php                       | 3 +--
 newmemberwidget/newmemberwidget.php             | 3 +--
 numfriends/numfriends.php                       | 3 +--
 opmlexport/opmlexport.php                       | 3 +--
 piwik/piwik.php                                 | 3 +--
 pumpio/pumpio_sync.php                          | 4 ++--
 securemail/securemail.php                       | 3 +--
 20 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index c03034cd..aeeff77c 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -36,7 +36,6 @@
 use Friendica\BaseModule;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
@@ -62,7 +61,7 @@ function advancedcontentfilter_install()
 	Hook::add('dbstructure_definition'          , __FILE__, 'advancedcontentfilter_dbstructure_definition');
 	DBStructure::performUpdate();
 
-	Logger::notice('installed advancedcontentfilter');
+	DI::logger()->notice('installed advancedcontentfilter');
 }
 
 /*
diff --git a/birdavatar/birdavatar.php b/birdavatar/birdavatar.php
index 9a9dce0a..cd49b183 100644
--- a/birdavatar/birdavatar.php
+++ b/birdavatar/birdavatar.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -27,7 +26,7 @@ function birdavatar_install()
 	Hook::register('addon_settings', __FILE__, 'birdavatar_addon_settings');
 	Hook::register('addon_settings_post', __FILE__, 'birdavatar_addon_settings_post');
 
-	Logger::info('registered birdavatar');
+	DI::logger()->info('registered birdavatar');
 }
 
 /**
diff --git a/blackout/blackout.php b/blackout/blackout.php
index a3f806ff..ac1ee3e6 100644
--- a/blackout/blackout.php
+++ b/blackout/blackout.php
@@ -45,7 +45,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\DI;
@@ -77,7 +76,7 @@ function blackout_redirect ($b)
 	}
 
 	if (( $date1 <= $now ) && ( $now <= $date2 )) {
-		Logger::notice('redirecting user to blackout page');
+		DI::logger()->notice('redirecting user to blackout page');
 		System::externalRedirect($myurl);
 	}
 }
diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
index 2bdf0cca..7b5f05c0 100644
--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -27,7 +26,7 @@ function catavatar_install()
 	Hook::register('addon_settings', __FILE__, 'catavatar_addon_settings');
 	Hook::register('addon_settings_post', __FILE__, 'catavatar_addon_settings_post');
 
-	Logger::notice('registered catavatar');
+	DI::logger()->notice('registered catavatar');
 }
 
 /**
diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index 8bd27606..bb8a4fe6 100644
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -8,7 +8,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -17,7 +16,7 @@ function fromapp_install()
 	Hook::register('post_local', 'addon/fromapp/fromapp.php', 'fromapp_post_hook');
 	Hook::register('addon_settings', 'addon/fromapp/fromapp.php', 'fromapp_settings');
 	Hook::register('addon_settings_post', 'addon/fromapp/fromapp.php', 'fromapp_settings_post');
-	Logger::notice("installed fromapp");
+	DI::logger()->notice("installed fromapp");
 }
 
 function fromapp_settings_post($post)
diff --git a/geonames/geonames.php b/geonames/geonames.php
index d14b1e8f..4c5e54d8 100644
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
@@ -45,7 +44,7 @@ function geonames_post_hook(array &$item)
 	 *      - The profile owner must have allowed our addon
 	 */
 
-	Logger::notice('geonames invoked');
+	 DI::logger()->notice('geonames invoked');
 
 	if (!DI::userSession()->getLocalUserId()) {   /* non-zero if this is a logged in user of this system */
 		return;
diff --git a/gnot/gnot.php b/gnot/gnot.php
index 5d0919cb..3801a210 100644
--- a/gnot/gnot.php
+++ b/gnot/gnot.php
@@ -9,7 +9,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\Notification;
@@ -20,7 +19,7 @@ function gnot_install()
 	Hook::register('addon_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post');
 	Hook::register('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail');
 
-	Logger::notice("installed gnot");
+	DI::logger()->notice("installed gnot");
 }
 
 /**
diff --git a/googlemaps/googlemaps.php b/googlemaps/googlemaps.php
index b83a9cf9..a0bba8ad 100644
--- a/googlemaps/googlemaps.php
+++ b/googlemaps/googlemaps.php
@@ -8,13 +8,12 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 
 function googlemaps_install()
 {
 	Hook::register('render_location', 'addon/googlemaps/googlemaps.php', 'googlemaps_location');
 
-	Logger::notice('installed googlemaps');
+	DI::logger()->notice('installed googlemaps');
 }
 
 function googlemaps_location(&$item)
diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index 6007c433..7fe0d955 100644
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -8,7 +8,6 @@
 
 use Friendica\BaseModule;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
@@ -20,7 +19,7 @@ function gravatar_install() {
 	Hook::register('load_config',   'addon/gravatar/gravatar.php', 'gravatar_load_config');
 	Hook::register('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
 
-	Logger::notice("registered gravatar in avatar_lookup hook");
+	DI::logger()->notice("registered gravatar in avatar_lookup hook");
 }
 
 function gravatar_load_config(ConfigFileManager $loader)
diff --git a/impressum/impressum.php b/impressum/impressum.php
index f61d7182..0ad34e40 100644
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -9,7 +9,6 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
@@ -20,7 +19,7 @@ function impressum_install()
 	Hook::register('load_config', 'addon/impressum/impressum.php', 'impressum_load_config');
 	Hook::register('about_hook', 'addon/impressum/impressum.php', 'impressum_show');
 	Hook::register('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
-	Logger::notice("installed impressum Addon");
+	DI::logger()->notice("installed impressum Addon");
 }
 
 /**
diff --git a/keycloakpassword/keycloakpassword.php b/keycloakpassword/keycloakpassword.php
index e9809f86..11034ffe 100644
--- a/keycloakpassword/keycloakpassword.php
+++ b/keycloakpassword/keycloakpassword.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -37,7 +36,7 @@ function keycloakpassword_request($client_id, $secret, $url, $params = [])
 	$res = curl_exec($ch);
 
 	if (curl_errno($ch)) {
-		Logger::error(curl_error($ch));
+		DI::logger()->error(curl_error($ch));
 	}
 	curl_close($ch);
 
diff --git a/krynn/krynn.php b/krynn/krynn.php
index fa9db133..b57d827e 100644
--- a/krynn/krynn.php
+++ b/krynn/krynn.php
@@ -11,7 +11,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -31,7 +30,7 @@ function krynn_install()
 	Hook::register('addon_settings', 'addon/krynn/krynn.php', 'krynn_settings');
 	Hook::register('addon_settings_post', 'addon/krynn/krynn.php', 'krynn_settings_post');
 
-	Logger::notice("installed krynn");
+	DI::logger()->notice("installed krynn");
 }
 
 function krynn_post_hook(&$item)
diff --git a/leistungsschutzrecht/leistungsschutzrecht.php b/leistungsschutzrecht/leistungsschutzrecht.php
index ec8091ac..891cb6ca 100644
--- a/leistungsschutzrecht/leistungsschutzrecht.php
+++ b/leistungsschutzrecht/leistungsschutzrecht.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\DI;
 
 function leistungsschutzrecht_install()
@@ -168,7 +167,7 @@ function leistungsschutzrecht_cron($b)
 	if ($last) {
 		$next = $last + 86400;
 		if ($next > time()) {
-			Logger::notice('poll intervall not reached');
+			DI::logger()->notice('poll intervall not reached');
 			return;
 		}
 	}
diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index 4cd72c83..6cb35331 100644
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -8,7 +8,6 @@
 
 use Friendica\Core\Addon;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
@@ -20,7 +19,7 @@ function libravatar_install()
 {
 	Hook::register('load_config',   'addon/libravatar/libravatar.php', 'libravatar_load_config');
 	Hook::register('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup');
-	Logger::notice("registered libravatar in avatar_lookup hook");
+	DI::logger()->notice("registered libravatar in avatar_lookup hook");
 }
 
 function libravatar_load_config(ConfigFileManager $loader)
diff --git a/newmemberwidget/newmemberwidget.php b/newmemberwidget/newmemberwidget.php
index d3b68807..ba7dfb39 100644
--- a/newmemberwidget/newmemberwidget.php
+++ b/newmemberwidget/newmemberwidget.php
@@ -8,7 +8,6 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\User;
@@ -16,7 +15,7 @@ use Friendica\Model\User;
 function newmemberwidget_install()
 {
 	Hook::register( 'network_mod_init', 'addon/newmemberwidget/newmemberwidget.php', 'newmemberwidget_network_mod_init');
-	Logger::notice('newmemberwidget installed');
+	DI::logger()->notice('newmemberwidget installed');
 }
 
 function newmemberwidget_network_mod_init ($b)
diff --git a/numfriends/numfriends.php b/numfriends/numfriends.php
index 66c9b74a..5652c8f0 100644
--- a/numfriends/numfriends.php
+++ b/numfriends/numfriends.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -16,7 +15,7 @@ function numfriends_install() {
 	Hook::register('addon_settings', 'addon/numfriends/numfriends.php', 'numfriends_settings');
 	Hook::register('addon_settings_post', 'addon/numfriends/numfriends.php', 'numfriends_settings_post');
 
-	Logger::notice("installed numfriends");
+	DI::logger()->notice("installed numfriends");
 }
 
 /**
diff --git a/opmlexport/opmlexport.php b/opmlexport/opmlexport.php
index 3df71275..be1d335c 100644
--- a/opmlexport/opmlexport.php
+++ b/opmlexport/opmlexport.php
@@ -9,7 +9,6 @@
 
 use Friendica\DI;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Model\Contact;
 use Friendica\Model\User;
@@ -18,7 +17,7 @@ function opmlexport_install()
 {
 	Hook::register('addon_settings',        __FILE__, 'opmlexport_addon_settings');
 	Hook::register('addon_settings_post',   __FILE__, 'opmlexport_addon_settings_post');
-	Logger::notice('installed opmlexport Addon');
+	DI::logger()->notice('installed opmlexport Addon');
 }
 
 
diff --git a/piwik/piwik.php b/piwik/piwik.php
index fc459a87..b7e9e71c 100644
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -36,7 +36,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
@@ -45,7 +44,7 @@ function piwik_install() {
 	Hook::register('load_config', 'addon/piwik/piwik.php', 'piwik_load_config');
 	Hook::register('page_end', 'addon/piwik/piwik.php', 'piwik_analytics');
 
-	Logger::notice("installed piwik addon");
+	DI::logger()->notice("installed piwik addon");
 }
 
 function piwik_load_config(ConfigFileManager $loader)
diff --git a/pumpio/pumpio_sync.php b/pumpio/pumpio_sync.php
index beaf6e81..09548c6d 100644
--- a/pumpio/pumpio_sync.php
+++ b/pumpio/pumpio_sync.php
@@ -1,5 +1,5 @@
 <?php
-use Friendica\Core\Logger;
+
 use Friendica\DI;
 
 function pumpio_sync_run(array $argv, int $argc) {
@@ -8,7 +8,7 @@ function pumpio_sync_run(array $argv, int $argc) {
 	if (function_exists('sys_getloadavg')) {
 		$load = sys_getloadavg();
 		if (intval($load[0]) > DI::config()->get('system', 'maxloadavg', 50)) {
-			Logger::notice('system: load ' . $load[0] . ' too high. Pumpio sync deferred to next scheduled run.');
+			DI::logger()->notice('system: load ' . $load[0] . ' too high. Pumpio sync deferred to next scheduled run.');
 			return;
 		}
 	}
diff --git a/securemail/securemail.php b/securemail/securemail.php
index b56c0cbc..7b412395 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -8,7 +8,6 @@
 
 use Friendica\Addon\securemail\SecureTestEmail;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Object\EMail\IEmail;
@@ -22,7 +21,7 @@ function securemail_install()
 
 	Hook::register('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare', 10);
 
-	Logger::notice('installed securemail');
+	DI::logger()->notice('installed securemail');
 }
 
 /**

From 41f280f0c71f214e7d2c803363e83c4d5ca7dac6 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:34:33 +0000
Subject: [PATCH 230/294] Replace call for Logger with DI::logger() in blockbot
 addon

---
 blockbot/blockbot.php | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php
index 022f188d..163d0cbc 100644
--- a/blockbot/blockbot.php
+++ b/blockbot/blockbot.php
@@ -11,7 +11,6 @@
 use Friendica\Core\Hook;
 use Friendica\DI;
 use Jaybizzle\CrawlerDetect\CrawlerDetect;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Network\HTTPException\ForbiddenException;
@@ -70,7 +69,7 @@ function blockbot_init_1()
 	}
 
 	if (empty($parts)) {
-		Logger::debug('Known frontend found - accept', $logdata);
+		DI::logger()->debug('Known frontend found - accept', $logdata);
 		if ($isCrawler) {
 			blockbot_save('badly-parsed-agents', $_SERVER['HTTP_USER_AGENT']);
 		}
@@ -80,66 +79,66 @@ function blockbot_init_1()
 	blockbot_log_activitypub($_SERVER['REQUEST_URI'], $_SERVER['HTTP_USER_AGENT']);
 
 	if (blockbot_is_crawler($parts)) {
-		Logger::debug('Crawler found - reject', $logdata);
+		DI::logger()->debug('Crawler found - reject', $logdata);
 		blockbot_reject();
 	}
 
 	if (blockbot_is_searchbot($parts)) {
-		Logger::debug('Search bot found - reject', $logdata);
+		DI::logger()->debug('Search bot found - reject', $logdata);
 		blockbot_reject();
 	}
 
 	if (blockbot_is_unwanted($parts)) {
-		Logger::debug('Uncategorized unwanted agent found - reject', $logdata);
+		DI::logger()->debug('Uncategorized unwanted agent found - reject', $logdata);
 		blockbot_reject();
 	}
 
 	if (blockbot_is_security_checker($parts)) {
 		if (!DI::config()->get('blockbot', 'security_checker')) {
-			Logger::debug('Security checker found - reject', $logdata);
+			DI::logger()->debug('Security checker found - reject', $logdata);
 			blockbot_reject();
 		}
-		Logger::debug('Security checker found - accept', $logdata);
+		DI::logger()->debug('Security checker found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_social_media($parts)) {
-		Logger::debug('Social media service found - accept', $logdata);
+		DI::logger()->debug('Social media service found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_fediverse_client($parts)) {
-		Logger::debug('Fediverse client found - accept', $logdata);
+		DI::logger()->debug('Fediverse client found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_feed_reader($parts)) {
-		Logger::debug('Feed reader found - accept', $logdata);
+		DI::logger()->debug('Feed reader found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_fediverse_tool($parts)) {
-		Logger::debug('Fediverse tool found - accept', $logdata);
+		DI::logger()->debug('Fediverse tool found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_service_agent($parts)) {
-		Logger::debug('Service agent found - accept', $logdata);
+		DI::logger()->debug('Service agent found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_monitor($parts)) {
-		Logger::debug('Monitoring service found - accept', $logdata);
+		DI::logger()->debug('Monitoring service found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_validator($parts)) {
-		Logger::debug('Validation service found - accept', $logdata);
+		DI::logger()->debug('Validation service found - accept', $logdata);
 		return;
 	}
 
 	if (blockbot_is_good_tool($parts)) {
-		Logger::debug('Uncategorized helpful service found - accept', $logdata);
+		DI::logger()->debug('Uncategorized helpful service found - accept', $logdata);
 		return;
 	}
 
@@ -147,10 +146,10 @@ function blockbot_init_1()
 	if (blockbot_is_http_library($parts)) {
 		blockbot_check_login_attempt($_SERVER['REQUEST_URI'], $logdata);
 		if (!DI::config()->get('blockbot', 'http_libraries')) {
-			Logger::debug('HTTP Library found - reject', $logdata);
+			DI::logger()->debug('HTTP Library found - reject', $logdata);
 			blockbot_reject();
 		}
-		Logger::debug('HTTP Library found - accept', $logdata);
+		DI::logger()->debug('HTTP Library found - accept', $logdata);
 		return;
 	}
 
@@ -161,12 +160,12 @@ function blockbot_init_1()
 
 	if (!$isCrawler) {
 		blockbot_save('good-agents', $_SERVER['HTTP_USER_AGENT']);
-		Logger::debug('Non-bot user agent detected', $logdata);
+		DI::logger()->debug('Non-bot user agent detected', $logdata);
 		return;
 	}
 
 	blockbot_save('bad-agents', $_SERVER['HTTP_USER_AGENT']);
-	Logger::notice('Possible bot found - reject', $logdata);
+	DI::logger()->notice('Possible bot found - reject', $logdata);
 	blockbot_reject();
 }
 
@@ -217,7 +216,7 @@ function blockbot_log_activitypub(string $url, string $agent)
 function blockbot_check_login_attempt(string $url, array $logdata)
 {
 	if (in_array(trim(parse_url($url, PHP_URL_PATH), '/'), ['login', 'lostpass', 'register'])) {
-		Logger::debug('Login attempt detected - reject', $logdata);
+		DI::logger()->debug('Login attempt detected - reject', $logdata);
 		blockbot_reject();
 	}
 }
@@ -443,7 +442,7 @@ function blockbot_is_monitor(array $parts): bool
 }
 
 /**
- * Services in the centralized and decentralized social media environment 
+ * Services in the centralized and decentralized social media environment
  *
  * @param array $parts
  * @return boolean

From d78ea50516c67f871ddb49ca18328379a95b4d57 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:36:23 +0000
Subject: [PATCH 231/294] Replace call for Logger with DI::logger() in bluesky
 addon

---
 bluesky/bluesky.php               | 95 +++++++++++++++----------------
 bluesky/bluesky_feed.php          |  6 +-
 bluesky/bluesky_notifications.php |  6 +-
 bluesky/bluesky_timeline.php      |  6 +-
 4 files changed, 56 insertions(+), 57 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 5bf07afb..7f6bb9e7 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -30,7 +30,6 @@ use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
@@ -106,16 +105,16 @@ function bluesky_item_by_link(array &$hookData)
 		if (empty($did)) {
 			return;
 		}
-	
-		Logger::debug('Found bluesky post', ['uri' => $hookData['uri'], 'did' => $did, 'cid' => $matches[2]]);
-	
+
+		DI::logger()->debug('Found bluesky post', ['uri' => $hookData['uri'], 'did' => $did, 'cid' => $matches[2]]);
+
 		$uri = 'at://' . $did . '/app.bsky.feed.post/' . $matches[2];
 	} else {
 		$uri = $hookData['uri'];
 	}
 
 	$uri = DI::atpProcessor()->fetchMissingPost($uri, $hookData['uid'], Item::PR_FETCHED, 0, 0);
-	Logger::debug('Got post', ['uri' => $uri]);
+	DI::logger()->debug('Got post', ['uri' => $uri]);
 	if (!empty($uri)) {
 		$item = Post::selectFirst(['id'], ['uri' => $uri, 'uid' => $hookData['uid']]);
 		if (!empty($item['id'])) {
@@ -138,7 +137,7 @@ function bluesky_follow(array &$hook_data)
 		return;
 	}
 
-	Logger::debug('Check if contact is bluesky', ['data' => $hook_data]);
+	DI::logger()->debug('Check if contact is bluesky', ['data' => $hook_data]);
 	$contact = DBA::selectFirst('contact', [], ['network' => Protocol::BLUESKY, 'url' => $hook_data['url'], 'uid' => [0, $hook_data['uid']]]);
 	if (empty($contact)) {
 		return;
@@ -159,7 +158,7 @@ function bluesky_follow(array &$hook_data)
 	$activity = DI::atProtocol()->XRPCPost($hook_data['uid'], 'com.atproto.repo.createRecord', $post);
 	if (!empty($activity->uri)) {
 		$hook_data['contact'] = $contact;
-		Logger::debug('Successfully start following', ['url' => $contact['url'], 'uri' => $activity->uri]);
+		DI::logger()->debug('Successfully start following', ['url' => $contact['url'], 'uri' => $activity->uri]);
 	}
 }
 
@@ -213,7 +212,7 @@ function bluesky_block(array &$hook_data)
 		if ($ucid) {
 			Contact::remove($ucid);
 		}
-		Logger::debug('Successfully blocked contact', ['url' => $hook_data['contact']['url'], 'uri' => $activity->uri]);
+		DI::logger()->debug('Successfully blocked contact', ['url' => $hook_data['contact']['url'], 'uri' => $activity->uri]);
 	}
 }
 
@@ -421,11 +420,11 @@ function bluesky_cron()
 	if ($last) {
 		$next = $last + ($poll_interval * 60);
 		if ($next > time()) {
-			Logger::notice('poll interval not reached');
+			DI::logger()->notice('poll interval not reached');
 			return;
 		}
 	}
-	Logger::notice('cron_start');
+	DI::logger()->notice('cron_start');
 
 	$abandon_days = intval(DI::config()->get('system', 'account_abandon_days'));
 	if ($abandon_days < 1) {
@@ -437,19 +436,19 @@ function bluesky_cron()
 	$pconfigs = DBA::selectToArray('pconfig', [], ["`cat` = ? AND `k` IN (?, ?) AND `v`", 'bluesky', 'import', 'import_feeds']);
 	foreach ($pconfigs as $pconfig) {
 		if (empty(DI::atProtocol()->getUserDid($pconfig['uid']))) {
-			Logger::debug('User has got no valid DID', ['uid' => $pconfig['uid']]);
+			DI::logger()->debug('User has got no valid DID', ['uid' => $pconfig['uid']]);
 			continue;
 		}
 
 		if ($abandon_days != 0) {
 			if (!DBA::exists('user', ["`uid` = ? AND `login_date` >= ?", $pconfig['uid'], $abandon_limit])) {
-				Logger::notice('abandoned account: timeline from user will not be imported', ['user' => $pconfig['uid']]);
+				DI::logger()->notice('abandoned account: timeline from user will not be imported', ['user' => $pconfig['uid']]);
 				continue;
 			}
 		}
 
 		// Refresh the token now, so that it doesn't need to be refreshed in parallel by the following workers
-		Logger::debug('Refresh the token', ['uid' => $pconfig['uid']]);
+		DI::logger()->debug('Refresh the token', ['uid' => $pconfig['uid']]);
 		DI::atProtocol()->getUserToken($pconfig['uid']);
 
 		$last_sync = DI::pConfig()->get($pconfig['uid'], 'bluesky', 'last_contact_sync');
@@ -463,32 +462,32 @@ function bluesky_cron()
 			Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_timeline.php', $pconfig['uid']);
 		}
 		if (DI::pConfig()->get($pconfig['uid'], 'bluesky', 'import_feeds')) {
-			Logger::debug('Fetch feeds for user', ['uid' => $pconfig['uid']]);
+			DI::logger()->debug('Fetch feeds for user', ['uid' => $pconfig['uid']]);
 			$feeds = bluesky_get_feeds($pconfig['uid']);
 			foreach ($feeds as $feed) {
 				Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_feed.php', $pconfig['uid'], $feed);
 			}
 		}
-		Logger::debug('Polling done for user', ['uid' => $pconfig['uid']]);
+		DI::logger()->debug('Polling done for user', ['uid' => $pconfig['uid']]);
 	}
 
-	Logger::notice('Polling done for all users');
+	DI::logger()->notice('Polling done for all users');
 
 	DI::keyValue()->set('bluesky_last_poll', time());
 
 	$last_clean = DI::keyValue()->get('bluesky_last_clean');
 	if (empty($last_clean) || ($last_clean + 86400 < time())) {
-		Logger::notice('Start contact cleanup');
+		DI::logger()->notice('Start contact cleanup');
 		$contacts = DBA::select('account-user-view', ['id', 'pid'], ["`network` = ? AND `uid` != ? AND `rel` = ?", Protocol::BLUESKY, 0, Contact::NOTHING]);
 		while ($contact = DBA::fetch($contacts)) {
 			Worker::add(Worker::PRIORITY_LOW, 'MergeContact', $contact['pid'], $contact['id'], 0);
 		}
 		DBA::close($contacts);
 		DI::keyValue()->set('bluesky_last_clean', time());
-		Logger::notice('Contact cleanup done');
+		DI::logger()->notice('Contact cleanup done');
 	}
 
-	Logger::notice('cron_end');
+	DI::logger()->notice('cron_end');
 }
 
 function bluesky_hook_fork(array &$b)
@@ -508,7 +507,7 @@ function bluesky_hook_fork(array &$b)
 	if (DI::pConfig()->get($post['uid'], 'bluesky', 'import')) {
 		// Don't post if it isn't a reply to a bluesky post
 		if (($post['gravity'] != Item::GRAVITY_PARENT) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::BLUESKY])) {
-			Logger::notice('No bluesky parent found', ['item' => $post['id']]);
+			DI::logger()->notice('No bluesky parent found', ['item' => $post['id']]);
 			$b['execute'] = false;
 			return;
 		}
@@ -555,12 +554,12 @@ function bluesky_send(array &$b)
 	}
 
 	if ($b['gravity'] != Item::GRAVITY_PARENT) {
-		Logger::debug('Got comment', ['item' => $b]);
+		DI::logger()->debug('Got comment', ['item' => $b]);
 
 		if ($b['deleted']) {
 			$uri = DI::atpProcessor()->getUriClass($b['uri']);
 			if (empty($uri)) {
-				Logger::debug('Not a bluesky post', ['uri' => $b['uri']]);
+				DI::logger()->debug('Not a bluesky post', ['uri' => $b['uri']]);
 				return;
 			}
 			bluesky_delete_post($b['uri'], $b['uid']);
@@ -571,12 +570,12 @@ function bluesky_send(array &$b)
 		$parent = DI::atpProcessor()->getUriClass($b['thr-parent']);
 
 		if (empty($root) || empty($parent)) {
-			Logger::debug('No bluesky post', ['parent' => $b['parent'], 'thr-parent' => $b['thr-parent']]);
+			DI::logger()->debug('No bluesky post', ['parent' => $b['parent'], 'thr-parent' => $b['thr-parent']]);
 			return;
 		}
 
 		if ($b['gravity'] == Item::GRAVITY_COMMENT) {
-			Logger::debug('Posting comment', ['root' => $root, 'parent' => $parent]);
+			DI::logger()->debug('Posting comment', ['root' => $root, 'parent' => $parent]);
 			bluesky_create_post($b, $root, $parent);
 			return;
 		} elseif (in_array($b['verb'], [Activity::LIKE, Activity::ANNOUNCE])) {
@@ -635,10 +634,10 @@ function bluesky_create_activity(array $item, stdClass $parent = null)
 	if (empty($activity->uri)) {
 		return;
 	}
-	Logger::debug('Activity done', ['return' => $activity]);
+	DI::logger()->debug('Activity done', ['return' => $activity]);
 	$uri = DI::atpProcessor()->getUri($activity);
 	Item::update(['extid' => $uri], ['guid' => $item['guid']]);
-	Logger::debug('Set extid', ['id' => $item['id'], 'extid' => $activity]);
+	DI::logger()->debug('Set extid', ['id' => $item['id'], 'extid' => $activity]);
 }
 
 function bluesky_create_post(array $item, stdClass $root = null, stdClass $parent = null)
@@ -722,14 +721,14 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
 			}
 			return;
 		}
-		Logger::debug('Posting done', ['return' => $parent]);
+		DI::logger()->debug('Posting done', ['return' => $parent]);
 		if (empty($root)) {
 			$root = $parent;
 		}
 		if (($key == 0) && ($item['gravity'] != Item::GRAVITY_PARENT)) {
 			$uri = DI::atpProcessor()->getUri($parent);
 			Item::update(['extid' => $uri], ['guid' => $item['guid']]);
-			Logger::debug('Set extid', ['id' => $item['id'], 'extid' => $uri]);
+			DI::logger()->debug('Set extid', ['id' => $item['id'], 'extid' => $uri]);
 		}
 	}
 }
@@ -899,20 +898,20 @@ function bluesky_upload_blob(int $uid, array $photo): ?stdClass
 	$new_size   = strlen($content);
 
 	if (($size != 0) && ($new_size == 0) && ($retrial == 0)) {
-		Logger::warning('Size is empty after resize, uploading original file', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
+		DI::logger()->warning('Size is empty after resize, uploading original file', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
 		$content = Photo::getImageForPhoto($photo);
 	} else {
-		Logger::info('Uploading', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
+		DI::logger()->info('Uploading', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
 	}
 
 	$data = DI::atProtocol()->post($uid, '/xrpc/com.atproto.repo.uploadBlob', $content, ['Content-type' => $photo['type'], 'Authorization' => ['Bearer ' . DI::atProtocol()->getUserToken($uid)]]);
 	if (empty($data) || empty($data->blob)) {
-		Logger::info('Uploading failed', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
+		DI::logger()->info('Uploading failed', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
 		return null;
 	}
 
 	Item::incrementOutbound(Protocol::BLUESKY);
-	Logger::debug('Uploaded blob', ['return' => $data, 'uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
+	DI::logger()->debug('Uploaded blob', ['return' => $data, 'uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
 	return $data->blob;
 }
 
@@ -920,11 +919,11 @@ function bluesky_delete_post(string $uri, int $uid)
 {
 	$parts = DI::atpProcessor()->getUriParts($uri);
 	if (empty($parts)) {
-		Logger::debug('No uri delected', ['uri' => $uri]);
+		DI::logger()->debug('No uri delected', ['uri' => $uri]);
 		return;
 	}
 	DI::atProtocol()->XRPCPost($uid, 'com.atproto.repo.deleteRecord', $parts);
-	Logger::debug('Deleted', ['parts' => $parts]);
+	DI::logger()->debug('Deleted', ['parts' => $parts]);
 }
 
 function bluesky_fetch_timeline(int $uid)
@@ -1026,10 +1025,10 @@ function bluesky_fetch_notifications(int $uid)
 	foreach ($data->notifications as $notification) {
 		$uri = DI::atpProcessor()->getUri($notification);
 		if (Post::exists(['uri' => $uri, 'uid' => $uid]) || Post::exists(['extid' => $uri, 'uid' => $uid])) {
-			Logger::debug('Notification already processed', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
+			DI::logger()->debug('Notification already processed', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
 			continue;
 		}
-		Logger::debug('Process notification', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
+		DI::logger()->debug('Process notification', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
 		switch ($notification->reason) {
 			case 'like':
 				$item = DI::atpProcessor()->getHeaderFromPost($notification, $uri, $uid, Conversation::PARCEL_CONNECTOR);
@@ -1039,9 +1038,9 @@ function bluesky_fetch_notifications(int $uid)
 				$item['thr-parent'] = DI::atpProcessor()->fetchMissingPost($item['thr-parent'], $uid, Item::PR_FETCHED, $item['contact-id'], 0);
 				if (!empty($item['thr-parent'])) {
 					$data = Item::insert($item);
-					Logger::debug('Got like', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
+					DI::logger()->debug('Got like', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
 				} else {
-					Logger::info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
+					DI::logger()->info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
 				}
 				break;
 
@@ -1053,37 +1052,37 @@ function bluesky_fetch_notifications(int $uid)
 				$item['thr-parent'] = DI::atpProcessor()->fetchMissingPost($item['thr-parent'], $uid, Item::PR_FETCHED, $item['contact-id'], 0);
 				if (!empty($item['thr-parent'])) {
 					$data = Item::insert($item);
-					Logger::debug('Got repost', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
+					DI::logger()->debug('Got repost', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
 				} else {
-					Logger::info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
+					DI::logger()->info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
 				}
 				break;
 
 			case 'follow':
 				$contact = DI::atpActor()->getContactByDID($notification->author->did, $uid, $uid);
-				Logger::debug('New follower', ['uid' => $uid, 'nick' => $contact['nick'], 'uri' => $uri]);
+				DI::logger()->debug('New follower', ['uid' => $uid, 'nick' => $contact['nick'], 'uri' => $uri]);
 				break;
 
 			case 'mention':
 				$contact = DI::atpActor()->getContactByDID($notification->author->did, $uid, 0);
 				$result  = DI::atpProcessor()->fetchMissingPost($uri, $uid, Item::PR_TO, $contact['id'], 0);
-				Logger::debug('Got mention', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
+				DI::logger()->debug('Got mention', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
 			case 'reply':
 				$contact = DI::atpActor()->getContactByDID($notification->author->did, $uid, 0);
 				$result  = DI::atpProcessor()->fetchMissingPost($uri, $uid, Item::PR_COMMENT, $contact['id'], 0);
-				Logger::debug('Got reply', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
+				DI::logger()->debug('Got reply', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
 			case 'quote':
 				$contact = DI::atpActor()->getContactByDID($notification->author->did, $uid, 0);
 				$result  = DI::atpProcessor()->fetchMissingPost($uri, $uid, Item::PR_PUSHED, $contact['id'], 0);
-				Logger::debug('Got quote', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
+				DI::logger()->debug('Got quote', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
 			default:
-				Logger::notice('Unhandled reason', ['reason' => $notification->reason, 'uri' => $uri]);
+				DI::logger()->notice('Unhandled reason', ['reason' => $notification->reason, 'uri' => $uri]);
 				break;
 		}
 	}
@@ -1114,16 +1113,16 @@ function bluesky_fetch_feed(int $uid, string $feed)
 		$languages = $entry->post->record->langs ?? [];
 
 		if (!Relay::isWantedLanguage($entry->post->record->text, 0, $contact['id'] ?? 0, $languages)) {
-			Logger::debug('Unwanted language detected', ['languages' => $languages, 'text' => $entry->post->record->text]);
+			DI::logger()->debug('Unwanted language detected', ['languages' => $languages, 'text' => $entry->post->record->text]);
 			continue;
 		}
 		$causer = DI::atpActor()->getContactByDID($entry->post->author->did, $uid, 0);
 		$uri_id = bluesky_complete_post($entry->post, $uid, Item::PR_TAG, $causer['id'], Conversation::PARCEL_CONNECTOR);
 		if (!empty($uri_id)) {
 			$stored = Post\Category::storeFileByURIId($uri_id, $uid, Post\Category::SUBCRIPTION, $feedname, $feedurl);
-			Logger::debug('Stored tag subscription for user', ['uri-id' => $uri_id, 'uid' => $uid, 'name' => $feedname, 'url' => $feedurl, 'stored' => $stored]);
+			DI::logger()->debug('Stored tag subscription for user', ['uri-id' => $uri_id, 'uid' => $uid, 'name' => $feedname, 'url' => $feedurl, 'stored' => $stored]);
 		} else {
-			Logger::notice('Post not found', ['entry' => $entry]);
+			DI::logger()->notice('Post not found', ['entry' => $entry]);
 		}
 		if (!empty($entry->reason)) {
 			bluesky_process_reason($entry->reason, DI::atpProcessor()->getUri($entry->post), $uid);
diff --git a/bluesky/bluesky_feed.php b/bluesky/bluesky_feed.php
index a20ef1b9..e4aa3fdc 100644
--- a/bluesky/bluesky_feed.php
+++ b/bluesky/bluesky_feed.php
@@ -1,6 +1,6 @@
 <?php
 
-use Friendica\Core\Logger;
+use Friendica\DI;
 
 function bluesky_feed_run($argv, $argc)
 {
@@ -10,7 +10,7 @@ function bluesky_feed_run($argv, $argc)
 		return;
 	}
 
-	Logger::debug('Importing feed - start', ['user' => $argv[1], 'feed' => $argv[2]]);
+	DI::logger()->debug('Importing feed - start', ['user' => $argv[1], 'feed' => $argv[2]]);
 	bluesky_fetch_feed($argv[1], $argv[2]);
-	Logger::debug('Importing feed - done', ['user' => $argv[1], 'feed' => $argv[2]]);
+	DI::logger()->debug('Importing feed - done', ['user' => $argv[1], 'feed' => $argv[2]]);
 }
diff --git a/bluesky/bluesky_notifications.php b/bluesky/bluesky_notifications.php
index 1fbc8f67..e1bf2047 100644
--- a/bluesky/bluesky_notifications.php
+++ b/bluesky/bluesky_notifications.php
@@ -1,6 +1,6 @@
 <?php
 
-use Friendica\Core\Logger;
+use Friendica\DI;
 
 function bluesky_notifications_run($argv, $argc)
 {
@@ -10,7 +10,7 @@ function bluesky_notifications_run($argv, $argc)
 		return;
 	}
 
-	Logger::notice('importing notifications - start', ['user' => $argv[1]]);
+	DI::logger()->notice('importing notifications - start', ['user' => $argv[1]]);
 	bluesky_fetch_notifications($argv[1]);
-	Logger::notice('importing notifications - done', ['user' => $argv[1]]);
+	DI::logger()->notice('importing notifications - done', ['user' => $argv[1]]);
 }
diff --git a/bluesky/bluesky_timeline.php b/bluesky/bluesky_timeline.php
index fda846ba..37b22d99 100644
--- a/bluesky/bluesky_timeline.php
+++ b/bluesky/bluesky_timeline.php
@@ -1,6 +1,6 @@
 <?php
 
-use Friendica\Core\Logger;
+use Friendica\DI;
 
 function bluesky_timeline_run($argv, $argc)
 {
@@ -10,7 +10,7 @@ function bluesky_timeline_run($argv, $argc)
 		return;
 	}
 
-	Logger::notice('importing timeline - start', ['user' => $argv[1]]);
+	DI::logger()->notice('importing timeline - start', ['user' => $argv[1]]);
 	bluesky_fetch_timeline($argv[1]);
-	Logger::notice('importing timeline - done', ['user' => $argv[1]]);
+	DI::logger()->notice('importing timeline - done', ['user' => $argv[1]]);
 }

From 77ebaca28102deb1c8ae398aeb18903c5188d0a6 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:37:28 +0000
Subject: [PATCH 232/294] Replace call for Logger with DI::logger() in ratioed
 addon

---
 ratioed/RatioedPanel.php | 5 ++---
 ratioed/ratioed.php      | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/ratioed/RatioedPanel.php b/ratioed/RatioedPanel.php
index 91665640..4cf5d7ff 100644
--- a/ratioed/RatioedPanel.php
+++ b/ratioed/RatioedPanel.php
@@ -3,7 +3,6 @@
 namespace Friendica\Addon\ratioed;
 
 use Friendica\Content\Pager;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -260,7 +259,7 @@ FROM (
 
 	protected function setupUserCallback(): \Closure
 	{
-		Logger::debug("ratioed: setupUserCallback");
+		DI::logger()->debug("ratioed: setupUserCallback");
 		$parentCallback = parent::setupUserCallback();
 		return function ($user) use ($parentCallback) {
 			$blocked_count = DBA::count('user-contact', ['uid' => $user['uid'], 'is-blocked' => 1]);
@@ -310,7 +309,7 @@ FROM (
 			$this->fillReplyGuyData($user);
 
 			$user = $parentCallback($user);
-			Logger::debug("ratioed: setupUserCallback", [
+			DI::logger()->debug("ratioed: setupUserCallback", [
 				'uid' => $user['uid'],
 				'blocked_by' => $user['blocked_by'],
 				'comments' => $user['comments'],
diff --git a/ratioed/ratioed.php b/ratioed/ratioed.php
index 443fdaa9..5cc6d539 100644
--- a/ratioed/ratioed.php
+++ b/ratioed/ratioed.php
@@ -8,7 +8,6 @@
 
 use Friendica\Addon\ratioed\RatioedPanel;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\DI;
 
 /**
@@ -18,7 +17,7 @@ function ratioed_install()
 {
 	Hook::register('moderation_users_tabs', 'addon/ratioed/ratioed.php', 'ratioed_users_tabs');
 
-	Logger::info("ratioed: installed");
+	DI::logger()->info("ratioed: installed");
 }
 
 /**
@@ -34,7 +33,7 @@ function ratioed_module() {}
  * @param array $arr Parameters, including "tabs" which is the list to modify, and "selectedTab", which is the currently selected tab ID
  */
 function ratioed_users_tabs(array &$arr) {
-	Logger::debug("ratioed: users tabs");
+	DI::logger()->debug("ratioed: users tabs");
 
 	array_push($arr['tabs'], [
 		'label'	 => DI::l10n()->t('Behaviour'),
@@ -50,7 +49,7 @@ function ratioed_users_tabs(array &$arr) {
  * @brief Displays the ratioed tab in the moderation panel
  */
 function ratioed_content() {
-	Logger::debug("ratioed: content");
+	DI::logger()->debug("ratioed: content");
 
 	$ratioed = DI::getDice()->create(RatioedPanel::class, [$_SERVER]);
 	$httpException = DI::getDice()->create(Friendica\Module\Special\HTTPException::class);

From 1d1a00df275d19e81fdf44580d126c2affc89f74 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:37:58 +0000
Subject: [PATCH 233/294] Replace call for Logger with DI::logger() in cld
 addon

---
 cld/cld.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/cld/cld.php b/cld/cld.php
index 83361e2b..d4fef6c5 100644
--- a/cld/cld.php
+++ b/cld/cld.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\DI;
 
 function cld_install()
@@ -18,17 +17,17 @@ function cld_install()
 function cld_detect_languages(array &$data)
 {
 	if (!in_array('cld2', get_loaded_extensions())) {
-		Logger::warning('CLD2 is not installed.');
+		DI::logger()->warning('CLD2 is not installed.');
 		return;
 	}
 
 	if (!class_exists('CLD2Detector')) {
-		Logger::warning('CLD2Detector class does not exist.');
+		DI::logger()->warning('CLD2Detector class does not exist.');
 		return;
 	}
 
 	if (!class_exists('CLD2Encoding')) {
-		Logger::warning('CLD2Encoding class does not exist.');
+		DI::logger()->warning('CLD2Encoding class does not exist.');
 		return;
 	}
 
@@ -53,7 +52,7 @@ function cld_detect_languages(array &$data)
 	}
 
 	if (!$result['is_reliable']) {
-		Logger::debug('Unreliable detection', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
+		DI::logger()->debug('Unreliable detection', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
 		if (($original == $detected) && ($data['detected'][$original] < $result['language_probability'] / 100)) {
 			$data['detected'][$original] = $result['language_probability'] / 100;
 		}
@@ -63,12 +62,12 @@ function cld_detect_languages(array &$data)
 	$available = array_keys(DI::l10n()->getLanguageCodes());
 
 	if (!in_array($detected, $available)) {
-		Logger::debug('Unsupported language', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
+		DI::logger()->debug('Unsupported language', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
 		return;
 	}
 
 	if ($original != $detected) {
-		Logger::debug('Detected different language', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
+		DI::logger()->debug('Detected different language', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
 	}
 
 	$length = count($data['detected']);

From 4881e6004a9bc883714fe31eff59484a41ad8e2e Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:38:27 +0000
Subject: [PATCH 234/294] Replace call for Logger with DI::logger() in diaspora
 addon

---
 diaspora/diaspora.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index d6c98e34..3c4b4c0e 100644
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -11,7 +11,6 @@ require_once 'addon/diaspora/Diaspora_Connection.php';
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Core\Worker;
@@ -186,7 +185,7 @@ function diaspora_send(array &$b)
 {
 	$hostname = DI::baseUrl()->getHost();
 
-	Logger::notice('diaspora_send: invoked');
+	DI::logger()->notice('diaspora_send: invoked');
 
 	if ($b['deleted'] || ($b['private'] == Item::PRIVATE) || ($b['created'] !== $b['edited'])) {
 		return;
@@ -210,14 +209,14 @@ function diaspora_send(array &$b)
 		return;
 	}
 
-	Logger::info('diaspora_send: prepare posting');
+	DI::logger()->info('diaspora_send: prepare posting');
 
 	$handle = DI::pConfig()->get($b['uid'], 'diaspora', 'handle');
 	$password = DI::pConfig()->get($b['uid'], 'diaspora', 'password');
 	$aspect = DI::pConfig()->get($b['uid'], 'diaspora', 'aspect');
 
 	if ($handle && $password) {
-		Logger::info('diaspora_send: all values seem to be okay');
+		DI::logger()->info('diaspora_send: all values seem to be okay');
 
 		$title = $b['title'];
 		$body = $b['body'];
@@ -248,20 +247,20 @@ function diaspora_send(array &$b)
 		require_once "addon/diaspora/diasphp.php";
 
 		try {
-			Logger::info('diaspora_send: prepare');
+			DI::logger()->info('diaspora_send: prepare');
 			$conn = new Diaspora_Connection($handle, $password);
-			Logger::info('diaspora_send: try to log in ' . $handle);
+			DI::logger()->info('diaspora_send: try to log in ' . $handle);
 			$conn->logIn();
-			Logger::info('diaspora_send: try to send ' . $body);
+			DI::logger()->info('diaspora_send: try to send ' . $body);
 
 			$conn->provider = $hostname;
 			$conn->postStatusMessage($body, $aspect);
 
-			Logger::notice('diaspora_send: success');
+			DI::logger()->notice('diaspora_send: success');
 		} catch (Exception $e) {
-			Logger::notice("diaspora_send: Error submitting the post: " . $e->getMessage());
+			DI::logger()->notice("diaspora_send: Error submitting the post: " . $e->getMessage());
 
-			Logger::info('diaspora_send: requeueing ' . $b['uid']);
+			DI::logger()->info('diaspora_send: requeueing ' . $b['uid']);
 
 			Worker::defer();
 		}

From b38c2d18be2d0174e7e5866cdbbae8cfa75b5b88 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:38:48 +0000
Subject: [PATCH 235/294] Replace call for Logger with DI::logger() in
 discourse addon

---
 discourse/discourse.php | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/discourse/discourse.php b/discourse/discourse.php
index e97a4fd8..b8d0d996 100644
--- a/discourse/discourse.php
+++ b/discourse/discourse.php
@@ -10,7 +10,6 @@
 
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
@@ -79,13 +78,13 @@ function discourse_email_getmessage(&$message)
 	// We do assume that all Discourse servers are running with SSL
 	if (preg_match('=topic/(.*\d)/(.*\d)@(.*)=', $message['item']['uri'], $matches) &&
 		discourse_fetch_post_from_api($message, $matches[2], $matches[3])) {
-		Logger::info('Fetched comment via API (message-id mode)', ['host' => $matches[3], 'topic' => $matches[1], 'post' => $matches[2]]);
+		DI::logger()->info('Fetched comment via API (message-id mode)', ['host' => $matches[3], 'topic' => $matches[1], 'post' => $matches[2]]);
 		return;
 	}
 
 	if (preg_match('=topic/(.*\d)@(.*)=', $message['item']['uri'], $matches) &&
 		discourse_fetch_topic_from_api($message, 'https://' . $matches[2], $matches[1], 1)) {
-		Logger::info('Fetched starting post via API (message-id mode)', ['host' => $matches[2], 'topic' => $matches[1]]);
+		DI::logger()->info('Fetched starting post via API (message-id mode)', ['host' => $matches[2], 'topic' => $matches[1]]);
 		return;
 	}
 
@@ -95,16 +94,16 @@ function discourse_email_getmessage(&$message)
 	}
 
 	if (empty($message['item']['plink']) || !preg_match('=(http.*)/t/.*/(.*\d)/(.*\d)=', $message['item']['plink'], $matches)) {
-		Logger::info('This is no Discourse post');
+		DI::logger()->info('This is no Discourse post');
 		return;
 	}
 
 	if (discourse_fetch_topic_from_api($message, $matches[1], $matches[2], $matches[3])) {
-		Logger::info('Fetched post via API (plink mode)', ['host' => $matches[1], 'topic' => $matches[2], 'id' => $matches[3]]);
+		DI::logger()->info('Fetched post via API (plink mode)', ['host' => $matches[1], 'topic' => $matches[2], 'id' => $matches[3]]);
 		return;
 	}
 
-	Logger::info('Fallback mode', ['plink' => $message['item']['plink']]);
+	DI::logger()->info('Fallback mode', ['plink' => $message['item']['plink']]);
 	// Search in the HTML part for the discourse entry and the author profile
 	if (!empty($message['html'])) {
 		$message = discourse_get_html($message);
@@ -121,7 +120,7 @@ function discourse_fetch_post($host, $topic, $pid)
 	$url = $host . '/t/' . $topic . '/' . $pid . '.json';
 	$curlResult = DI::httpClient()->get($url);
 	if (!$curlResult->isSuccess()) {
-		Logger::info('No success', ['url' => $url]);
+		DI::logger()->info('No success', ['url' => $url]);
 		return false;
 	}
 
@@ -133,11 +132,11 @@ function discourse_fetch_post($host, $topic, $pid)
 			/// @todo Possibly fetch missing posts here
 			continue;
 		}
-		Logger::info('Got post data from topic', $post);
+		DI::logger()->info('Got post data from topic', $post);
 		return $post;
 	}
 
-	Logger::info('Post not found', ['host' => $host, 'topic' => $topic, 'pid' => $pid]);
+	DI::logger()->info('Post not found', ['host' => $host, 'topic' => $topic, 'pid' => $pid]);
 	return false;
 }
 
@@ -169,7 +168,7 @@ function discourse_fetch_post_from_api(&$message, $post, $host)
 
 	$message = discourse_process_post($message, $data, $hostaddr);
 
-	Logger::info('Got API data', $message);
+	DI::logger()->info('Got API data', $message);
 	return true;
 }
 
@@ -202,7 +201,7 @@ function discourse_get_user($post, $hostaddr)
 	$contact['url'] = $hostaddr . '/u/' . $contact['nick'];
 	$contact['nurl'] = Strings::normaliseLink($contact['url']);
 	$contact['baseurl'] = $hostaddr;
-	Logger::info('Contact', $contact);
+	DI::logger()->info('Contact', $contact);
 	$contact['id'] = Contact::getIdForURL($contact['url'], 0, false, $contact);
         if (!empty($contact['id'])) {
 		$avatar = $contact['photo'];
@@ -268,11 +267,11 @@ function discourse_get_html($message)
 	$div = $doc2->importNode($result->item(0), true);
 	$doc2->appendChild($div);
 	$message['html'] = $doc2->saveHTML();
-	Logger::info('Found html body', ['html' => $message['html']]);
+	DI::logger()->info('Found html body', ['html' => $message['html']]);
 
 	$profile = discourse_get_profile($xpath);
 	if (!empty($profile['url'])) {
-		Logger::info('Found profile', $profile);
+		DI::logger()->info('Found profile', $profile);
 		$message['item']['author-id'] = Contact::getIdForURL($profile['url'], 0, false, $profile);
 		$message['item']['author-link'] = $profile['url'];
 		$message['item']['author-name'] = $profile['name'];
@@ -288,21 +287,21 @@ function discourse_get_text($message)
 	$text = str_replace("\r", '', $text);
 	$pos = strpos($text, "\n---\n");
 	if ($pos == 0) {
-		Logger::info('No separator found', ['text' => $text]);
+		DI::logger()->info('No separator found', ['text' => $text]);
 		return $message;
 	}
 
 	$message['text'] = trim(substr($text, 0, $pos));
 
-	Logger::info('Found text body', ['text' => $message['text']]);
+	DI::logger()->info('Found text body', ['text' => $message['text']]);
 
 	$message['text'] = Markdown::toBBCode($message['text']);
 
 	$text = substr($text, $pos);
-	Logger::info('Found footer', ['text' => $text]);
+	DI::logger()->info('Found footer', ['text' => $text]);
 	if (preg_match('=\((http.*/t/.*/.*\d/.*\d)\)=', $text, $link)) {
 		$message['item']['plink'] = $link[1];
-		Logger::info('Found plink', ['plink' => $message['item']['plink']]);
+		DI::logger()->info('Found plink', ['plink' => $message['item']['plink']]);
 	}
 	return $message;
 }

From 1db552ead93ef398b6f3fb689c95d763c4d93a72 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:39:11 +0000
Subject: [PATCH 236/294] Replace call for Logger with DI::logger() in dwpost
 addon

---
 dwpost/dwpost.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index 7ce30086..7bad85dc 100644
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -10,7 +10,6 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\Item;
@@ -185,12 +184,12 @@ function dwpost_send(array &$b)
 
 EOT;
 
-		Logger::debug('dwpost: data: ' . $xml);
+		DI::logger()->debug('dwpost: data: ' . $xml);
 
 		if ($dw_blog !== 'test') {
 			$x = DI::httpClient()->post($dw_blog, $xml, ['Content-Type' => 'text/xml'])->getBodyString();
 		}
 
-		Logger::info('posted to dreamwidth: ' . ($x) ? $x : '');
+		DI::logger()->info('posted to dreamwidth: ' . ($x) ? $x : '');
 	}
 }

From e7755584cbbd3850389495420613ebfe2b59ddb1 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:40:12 +0000
Subject: [PATCH 237/294] Replace call for Logger with DI::logger() in
 geocoordinates addon

---
 geocoordinates/geocoordinates.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/geocoordinates/geocoordinates.php b/geocoordinates/geocoordinates.php
index eb56f093..5af1defc 100644
--- a/geocoordinates/geocoordinates.php
+++ b/geocoordinates/geocoordinates.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -51,25 +50,25 @@ function geocoordinates_resolve_item(array &$item)
 	$s = DI::httpClient()->fetch('https://api.opencagedata.com/geocode/v1/json?q=' . $coords[0] . ',' . $coords[1] . '&key=' . $key . '&language=' . $language);
 
 	if (!$s) {
-		Logger::info('API could not be queried');
+		DI::logger()->info('API could not be queried');
 		return;
 	}
 
 	$data = json_decode($s);
 
 	if ($data->status->code != '200') {
-		Logger::info('API returned error ' . $data->status->code . ' ' . $data->status->message);
+		DI::logger()->info('API returned error ' . $data->status->code . ' ' . $data->status->message);
 		return;
 	}
 
 	if (($data->total_results == 0) || (count($data->results) == 0)) {
-		Logger::info('No results found for coordinates ' . $item['coord']);
+		DI::logger()->info('No results found for coordinates ' . $item['coord']);
 		return;
 	}
 
 	$item['location'] = $data->results[0]->formatted;
 
-	Logger::info('Got location for coordinates ' . $coords[0] . '-' . $coords[1] . ': ' . $item['location']);
+	DI::logger()->info('Got location for coordinates ' . $coords[0] . '-' . $coords[1] . ': ' . $item['location']);
 
 	if ($item['location'] != '') {
 		DI::cache()->set('geocoordinates:' . $language.':' . $coords[0] . '-' . $coords[1], $item['location']);

From 15a951235f1f2d2039315851eb0a38831b77c05a Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:40:32 +0000
Subject: [PATCH 238/294] Replace call for Logger with DI::logger() in ifttt
 addon

---
 ifttt/ifttt.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index 51fa8db8..cb23032b 100644
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -8,7 +8,6 @@
  */
 use Friendica\Content\PageInfo;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -86,16 +85,16 @@ function ifttt_post()
 
 	$user = DBA::selectFirst('user', ['uid'], ['nickname' => $nickname]);
 	if (!DBA::isResult($user)) {
-		Logger::info('User ' . $nickname . ' not found.');
+		DI::logger()->info('User ' . $nickname . ' not found.');
 		return;
 	}
 
 	$uid = $user['uid'];
 
-	Logger::info('Received a post for user ' . $uid . ' from ifttt ' . print_r($_REQUEST, true));
+	DI::logger()->info('Received a post for user ' . $uid . ' from ifttt ' . print_r($_REQUEST, true));
 
 	if (!isset($_REQUEST['key'])) {
-		Logger::notice('No key found.');
+		DI::logger()->notice('No key found.');
 		return;
 	}
 
@@ -103,7 +102,7 @@ function ifttt_post()
 
 	// Check the key
 	if ($key != DI::pConfig()->get($uid, 'ifttt', 'key')) {
-		Logger::info('Invalid key for user ' . $uid);
+		DI::logger()->info('Invalid key for user ' . $uid);
 		return;
 	}
 
@@ -114,7 +113,7 @@ function ifttt_post()
 	}
 
 	if (!in_array($item['type'], ['status', 'link', 'photo'])) {
-		Logger::info('Unknown item type ' . $item['type']);
+		DI::logger()->info('Unknown item type ' . $item['type']);
 		return;
 	}
 

From 50023180895a4c1e70163762bd90d56d38d823ba Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:41:02 +0000
Subject: [PATCH 239/294] Replace call for Logger with DI::logger() in ijpost
 addon

---
 ijpost/ijpost.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index 37c3cd45..9fe502af 100644
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -10,7 +10,6 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\Item;
@@ -178,11 +177,11 @@ function ijpost_send(array &$b)
 
 EOT;
 
-		Logger::debug('ijpost: data: ' . $xml);
+		DI::logger()->debug('ijpost: data: ' . $xml);
 
 		if ($ij_blog !== 'test') {
 			$x = DI::httpClient()->post($ij_blog, $xml, ['Content-Type' => 'text/xml'])->getBodyString();
 		}
-		Logger::info('posted to insanejournal: ' . $x ? $x : '');
+		DI::logger()->info('posted to insanejournal: ' . $x ? $x : '');
 	}
 }

From 5d51c5b56ecbbc220332fd5b2bea6bb34c436e5f Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:42:25 +0000
Subject: [PATCH 240/294] Replace call for Logger with DI::logger() in
 js_upload addon

---
 js_upload/js_upload.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index f1d85aa3..c0a2467d 100644
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -8,7 +8,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Util\Images;
@@ -68,7 +67,7 @@ function js_upload_post_init(array &$b)
 	$js_upload_jsonresponse = htmlspecialchars(json_encode($result), ENT_NOQUOTES);
 
 	if (isset($result['error'])) {
-		Logger::info('mod/photos.php: photos_post(): error uploading photo: ' . $result['error']);
+		DI::logger()->info('mod/photos.php: photos_post(): error uploading photo: ' . $result['error']);
 		echo json_encode($result);
 		exit();
 	}
@@ -91,7 +90,7 @@ function js_upload_post_end(int &$b)
 {
 	global $js_upload_jsonresponse;
 
-	Logger::notice('upload_post_end');
+	DI::logger()->notice('upload_post_end');
 	if (!empty($js_upload_jsonresponse)) {
 		echo $js_upload_jsonresponse;
 		exit();
@@ -187,6 +186,10 @@ class js_upload_qqFileUploader
 {
 	private $allowedExtensions;
 	private $sizeLimit;
+
+	/**
+	 * @var js_upload_qqUploadedFileXhr|js_upload_qqUploadedFileForm
+	 */
 	private $file;
 
 	function __construct(array $allowedExtensions = [], $sizeLimit)
@@ -234,7 +237,7 @@ class js_upload_qqFileUploader
 		$filename = $pathinfo['filename'];
 
 		if (!isset($pathinfo['extension'])) {
-			Logger::warning('extension isn\'t set.', ['filename' => $filename]);
+			DI::logger()->warning('extension isn\'t set.', ['filename' => $filename]);
 		}
 		$ext = $pathinfo['extension'] ?? '';
 

From a488f2513159b44765400fa03f3351f5885e851f Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:44:48 +0000
Subject: [PATCH 241/294] Replace call for Logger with DI::logger() in ldapauth
 addon

---
 ldapauth/ldapauth.php | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
index f834b4d5..b80c5226 100644
--- a/ldapauth/ldapauth.php
+++ b/ldapauth/ldapauth.php
@@ -30,7 +30,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\User;
@@ -69,54 +68,54 @@ function ldapauth_authenticate($username, $password)
 	$ldap_autocreateaccount_nameattribute  = DI::config()->get('ldapauth', 'ldap_autocreateaccount_nameattribute');
 
 	if (!extension_loaded('ldap') || !strlen($ldap_server)) {
-		Logger::error('Addon not configured or missing php-ldap extension', ['extension_loaded' => extension_loaded('ldap'), 'server' => $ldap_server]);
+		DI::logger()->error('Addon not configured or missing php-ldap extension', ['extension_loaded' => extension_loaded('ldap'), 'server' => $ldap_server]);
 		return false;
 	}
 
 	if (!strlen($password)) {
-		Logger::error('Empty password disallowed', ['provided_password_length' => strlen($password)]);
+		DI::logger()->error('Empty password disallowed', ['provided_password_length' => strlen($password)]);
 		return false;
 	}
 
 	$connect = @ldap_connect($ldap_server);
 	if ($connect === false) {
-		Logger::warning('Could not connect to LDAP server', ['server' => $ldap_server]);
+		DI::logger()->warning('Could not connect to LDAP server', ['server' => $ldap_server]);
 		return false;
 	}
 
 	@ldap_set_option($connect, LDAP_OPT_PROTOCOL_VERSION, 3);
 	@ldap_set_option($connect, LDAP_OPT_REFERRALS, 0);
 	if ((@ldap_bind($connect, $ldap_binddn, $ldap_bindpw)) === false) {
-		Logger::warning('Could not bind to LDAP server', ['server' => $ldap_server, 'binddn' => $ldap_binddn, 'errno' => ldap_errno($connect), 'error' => ldap_error($connect)]);
+		DI::logger()->warning('Could not bind to LDAP server', ['server' => $ldap_server, 'binddn' => $ldap_binddn, 'errno' => ldap_errno($connect), 'error' => ldap_error($connect)]);
 		return false;
 	}
 
 	$res = @ldap_search($connect, $ldap_searchdn, $ldap_userattr . '=' . $username);
 	if (!$res) {
-		Logger::notice('LDAP user not found.', ['searchdn' => $ldap_searchdn, 'userattr' => $ldap_userattr, 'username' => $username, 'errno' => ldap_errno($connect), 'error' => ldap_error($connect)]);
+		DI::logger()->notice('LDAP user not found.', ['searchdn' => $ldap_searchdn, 'userattr' => $ldap_userattr, 'username' => $username, 'errno' => ldap_errno($connect), 'error' => ldap_error($connect)]);
 		return false;
 	}
 
 	$id = @ldap_first_entry($connect, $res);
 	if (!$id) {
-		Logger::notice('Could not retrieve first LDAP entry.', ['searchdn' => $ldap_searchdn, 'userattr' => $ldap_userattr, 'username' => $username, 'errno' => ldap_errno($connect), 'error' => ldap_error($connect)]);
+		DI::logger()->notice('Could not retrieve first LDAP entry.', ['searchdn' => $ldap_searchdn, 'userattr' => $ldap_userattr, 'username' => $username, 'errno' => ldap_errno($connect), 'error' => ldap_error($connect)]);
 		return false;
 	}
 
 	$dn = @ldap_get_dn($connect, $id);
 	if (!@ldap_bind($connect, $dn, $password)) {
-		Logger::notice('Could not authenticate LDAP user with provided password', ['errno' => ldap_errno($connect), 'error' => ldap_error($connect)]);
+		DI::logger()->notice('Could not authenticate LDAP user with provided password', ['errno' => ldap_errno($connect), 'error' => ldap_error($connect)]);
 		return false;
 	}
 
 	if (strlen($ldap_group) && @ldap_compare($connect, $ldap_group, 'member', $dn) !== true) {
 		$errno = @ldap_errno($connect);
 		if ($errno === 32) {
-			Logger::notice('LDAP Access Control Group does not exist', ['errno' => $errno, 'error' => ldap_error($connect)]);
+			DI::logger()->notice('LDAP Access Control Group does not exist', ['errno' => $errno, 'error' => ldap_error($connect)]);
 		} elseif ($errno === 16) {
-			Logger::notice('LDAP membership attribute does not exist in access control group', ['errno' => $errno, 'error' => ldap_error($connect)]);
+			DI::logger()->notice('LDAP membership attribute does not exist in access control group', ['errno' => $errno, 'error' => ldap_error($connect)]);
 		} else {
-			Logger::notice('LDAP user isn\'t part of the authorized group', ['dn' => $dn]);
+			DI::logger()->notice('LDAP user isn\'t part of the authorized group', ['dn' => $dn]);
 		}
 
 		@ldap_close($connect);
@@ -140,7 +139,7 @@ function ldapauth_authenticate($username, $password)
 		$authentication = User::getAuthenticationInfo($username);
 		return User::getById($authentication['uid']);
 	} catch (Exception $e) {
-		Logger::notice('LDAP authentication error: ' . $e->getMessage());
+		DI::logger()->notice('LDAP authentication error: ' . $e->getMessage());
 		return false;
 	}
 }
@@ -148,7 +147,7 @@ function ldapauth_authenticate($username, $password)
 function ldap_createaccount($username, $password, $email, $name)
 {
 	if (!strlen($email) || !strlen($name)) {
-		Logger::notice('Could not create local user from LDAP data, no email or nickname provided');
+		DI::logger()->notice('Could not create local user from LDAP data, no email or nickname provided');
 		return false;
 	}
 
@@ -160,10 +159,10 @@ function ldap_createaccount($username, $password, $email, $name)
 			'password' => $password,
 			'verified' => 1
 		]);
-		Logger::info('Local user created from LDAP data', ['username' => $username, 'name' => $name]);
+		DI::logger()->info('Local user created from LDAP data', ['username' => $username, 'name' => $name]);
 		return $user;
 	} catch (Exception $ex) {
-		Logger::error('Could not create local user from LDAP data', ['username' => $username, 'exception' => $ex->getMessage()]);
+		DI::logger()->error('Could not create local user from LDAP data', ['username' => $username, 'exception' => $ex->getMessage()]);
 	}
 
 	return false;

From f08750199df1a0b7833e2eaba774f41c88cfe049 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:45:25 +0000
Subject: [PATCH 242/294] Replace call for Logger with DI::logger() in
 libertree addon

---
 libertree/libertree.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libertree/libertree.php b/libertree/libertree.php
index c138e597..1489a029 100644
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -8,7 +8,6 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -130,7 +129,7 @@ function libertree_post_local(array &$b)
 
 function libertree_send(array &$b)
 {
-	Logger::notice('libertree_send: invoked');
+	DI::logger()->notice('libertree_send: invoked');
 
 	if ($b['deleted'] || ($b['private'] == Item::PRIVATE) || ($b['created'] !== $b['edited'])) {
 		return;
@@ -196,6 +195,6 @@ function libertree_send(array &$b)
 		];
 
 		$result = DI::httpClient()->post($ltree_blog, $params)->getBodyString();
-		Logger::notice('libertree: ' . $result);
+		DI::logger()->notice('libertree: ' . $result);
 	}
 }

From 9ed02034f1755ae5832b96d34800a7758ad37bf5 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:46:04 +0000
Subject: [PATCH 243/294] Replace call for Logger with DI::logger() in ljpost
 addon

---
 ljpost/ljpost.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index b416c605..fd7d1bd8 100644
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -10,7 +10,6 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\Item;
@@ -200,7 +199,7 @@ function ljpost_send(array &$b)
 </methodCall>
 EOT;
 
-		Logger::debug('ljpost: data: ' . $xml);
+		DI::logger()->debug('ljpost: data: ' . $xml);
 
 		$x = '';
 
@@ -208,6 +207,6 @@ EOT;
 			$x = DI::httpClient()->post($lj_blog, $xml, ['Content-Type' => 'text/xml'])->getBodyString();
 		}
 
-		Logger::info('posted to livejournal: ' . $x);
+		DI::logger()->info('posted to livejournal: ' . $x);
 	}
 }

From 9a91bae363392fd1df0849afb4a21e24de994579 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:46:30 +0000
Subject: [PATCH 244/294] Replace call for Logger with DI::logger() in
 mailstream addon

---
 mailstream/mailstream.php | 45 +++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 9910a63d..5228b168 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -8,7 +8,6 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
@@ -32,7 +31,7 @@ function mailstream_install()
 	Hook::register('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
 	Hook::register('mailstream_send_hook', 'addon/mailstream/mailstream.php', 'mailstream_send_hook');
 
-	Logger::info("installed mailstream");
+	DI::logger()->info("installed mailstream");
 }
 
 /**
@@ -86,7 +85,7 @@ function mailstream_generate_id(string $uri): string
 	$host = DI::baseUrl()->getHost();
 	$resource = hash('md5', $uri);
 	$message_id = "<" . $resource . "@" . $host . ">";
-	Logger::debug('generated message ID', ['id' => $message_id, 'uri' => $uri]);
+	DI::logger()->debug('generated message ID', ['id' => $message_id, 'uri' => $uri]);
 	return $message_id;
 }
 
@@ -95,20 +94,20 @@ function mailstream_send_hook(array $data)
 	$criteria = array('uid' => $data['uid'], 'contact-id' => $data['contact-id'], 'uri' => $data['uri']);
 	$item = Post::selectFirst([], $criteria);
 	if (empty($item)) {
-		Logger::error('could not find item');
+		DI::logger()->error('could not find item');
 		return;
 	}
 
 	$user = User::getById($item['uid']);
 	if (empty($user)) {
-		Logger::error('could not find user', ['uid' => $item['uid']]);
+		DI::logger()->error('could not find user', ['uid' => $item['uid']]);
 		return;
 	}
 
 	if (!mailstream_send($data['message_id'], $item, $user)) {
-		Logger::debug('send failed, will retry', $data);
+		DI::logger()->debug('send failed, will retry', $data);
 		if (!Worker::defer()) {
-			Logger::error('failed and could not defer', $data);
+			DI::logger()->error('failed and could not defer', $data);
 		}
 	}
 }
@@ -124,32 +123,32 @@ function mailstream_send_hook(array $data)
 function mailstream_post_hook(array &$item)
 {
 	if ($item['uid'] === 0) {
-		Logger::debug('mailstream: root user, skipping item ' . $item['id']);
+		DI::logger()->debug('mailstream: root user, skipping item ' . $item['id']);
 		return;
 	}
 	if (!DI::pConfig()->get($item['uid'], 'mailstream', 'enabled')) {
-		Logger::debug('mailstream: not enabled.', ['item' => $item['id'], ' uid ' => $item['uid']]);
+		DI::logger()->debug('mailstream: not enabled.', ['item' => $item['id'], ' uid ' => $item['uid']]);
 		return;
 	}
 	if (!$item['contact-id']) {
-		Logger::debug('no contact-id', ['item' => $item['id']]);
+		DI::logger()->debug('no contact-id', ['item' => $item['id']]);
 		return;
 	}
 	if (!$item['uri']) {
-		Logger::debug('no uri', ['item' => $item['id']]);
+		DI::logger()->debug('no uri', ['item' => $item['id']]);
 		return;
 	}
 	if ($item['verb'] == Activity::ANNOUNCE) {
-		Logger::debug('ignoring announce', ['item' => $item['id']]);
+		DI::logger()->debug('ignoring announce', ['item' => $item['id']]);
 		return;
 	}
 	if (DI::pConfig()->get($item['uid'], 'mailstream', 'nolikes')) {
 		if ($item['verb'] == Activity::LIKE) {
-			Logger::debug('ignoring like', ['item' => $item['id']]);
+			DI::logger()->debug('ignoring like', ['item' => $item['id']]);
 			return;
 		}
 		if ($item['verb'] == Activity::DISLIKE) {
-			Logger::debug('ignoring dislike', ['item' => $item['id']]);
+			DI::logger()->debug('ignoring dislike', ['item' => $item['id']]);
 			return;
 		}
 	}
@@ -200,7 +199,7 @@ function mailstream_do_images(array &$item, array &$attachments)
 		try {
 			$curlResult = DI::httpClient()->get($url, HttpClientAccept::DEFAULT, [HttpClientOptions::COOKIEJAR => $cookiejar]);
 			if (!$curlResult->isSuccess()) {
-				Logger::debug('mailstream: fetch image url failed', [
+				DI::logger()->debug('mailstream: fetch image url failed', [
 					'url' => $url,
 					'item_id' => $item['id'],
 					'return_code' => $curlResult->getReturnCode()
@@ -208,7 +207,7 @@ function mailstream_do_images(array &$item, array &$attachments)
 				continue;
 			}
 		} catch (InvalidArgumentException $e) {
-			Logger::error('exception fetching url', ['url' => $url, 'item_id' => $item['id']]);
+			DI::logger()->error('exception fetching url', ['url' => $url, 'item_id' => $item['id']]);
 			continue;
 		}
 		$attachments[$url] = [
@@ -309,7 +308,7 @@ function mailstream_subject(array $item): string
 	}
 	$contact = Contact::selectFirst([], ['id' => $item['contact-id'], 'uid' => $item['uid']]);
 	if (!DBA::isResult($contact)) {
-		Logger::error('no contact', [
+		DI::logger()->error('no contact', [
 			'item' => $item['id'],
 			'plink' => $item['plink'],
 			'contact id' => $item['contact-id'],
@@ -351,16 +350,16 @@ function mailstream_subject(array $item): string
 function mailstream_send(string $message_id, array $item, array $user): bool
 {
 	if (!is_array($item)) {
-		Logger::error('item is empty', ['message_id' => $message_id]);
+		DI::logger()->error('item is empty', ['message_id' => $message_id]);
 		return false;
 	}
 
 	if (!$item['visible']) {
-		Logger::debug('item not yet visible', ['item uri' => $item['uri']]);
+		DI::logger()->debug('item not yet visible', ['item uri' => $item['uri']]);
 		return false;
 	}
 	if (!$message_id) {
-		Logger::error('no message ID supplied', ['item uri' => $item['uri'], 'user email' => $user['email']]);
+		DI::logger()->error('no message ID supplied', ['item uri' => $item['uri'], 'user email' => $user['email']]);
 		return true;
 	}
 
@@ -418,15 +417,15 @@ function mailstream_send(string $message_id, array $item, array $user): bool
 		if (!$mail->Send()) {
 			throw new Exception($mail->ErrorInfo);
 		}
-		Logger::debug('sent message', [
+		DI::logger()->debug('sent message', [
 			'message ID' => $mail->MessageID,
 			'subject' => $mail->Subject,
 			'address' => $address
 		]);
 	} catch (phpmailerException $e) {
-		Logger::debug('PHPMailer exception sending message', ['id' => $message_id, 'error' => $e->errorMessage()]);
+		DI::logger()->debug('PHPMailer exception sending message', ['id' => $message_id, 'error' => $e->errorMessage()]);
 	} catch (Exception $e) {
-		Logger::debug('exception sending message', ['id' => $message_id, 'error' => $e->getMessage()]);
+		DI::logger()->debug('exception sending message', ['id' => $message_id, 'error' => $e->getMessage()]);
 	}
 
 	return true;

From 9ceff8f5929d7899b91cc8b1acc26e47cd3dfce7 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:46:58 +0000
Subject: [PATCH 245/294] Replace call for Logger with DI::logger() in
 nominatim addon

---
 nominatim/nominatim.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/nominatim/nominatim.php b/nominatim/nominatim.php
index a3d14af5..3a567b7b 100644
--- a/nominatim/nominatim.php
+++ b/nominatim/nominatim.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -45,19 +44,19 @@ function nominatim_resolve_item(array &$item)
 
 	$s = DI::httpClient()->fetch('https://nominatim.openstreetmap.org/reverse?lat=' . $coords[0] . '&lon=' . $coords[1] . '&format=json&addressdetails=0&accept-language=' . $language);
 	if (empty($s)) {
-		Logger::info('API could not be queried');
+		DI::logger()->info('API could not be queried');
 		return;
 	}
 
 	$data = json_decode($s, true);
 	if (empty($data['display_name'])) {
-		Logger::info('No results found for coordinates', ['coordinates' => $item['coord'], 'data' => $data]);
+		DI::logger()->info('No results found for coordinates', ['coordinates' => $item['coord'], 'data' => $data]);
 		return;
 	}
 
 	$item['location'] = $data['display_name'];
 
-	Logger::info('Got location', ['lat' => $coords[0], 'long' => $coords[1], 'location' => $item['location']]);
+	DI::logger()->info('Got location', ['lat' => $coords[0], 'long' => $coords[1], 'location' => $item['location']]);
 
 	if (!empty($item['location'])) {
 		DI::cache()->set('nominatim:' . $language . ':' . $coords[0] . '-' . $coords[1], $item['location']);

From 757d72c360396a06a58f91c4c9d14f7726a9f644 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:47:24 +0000
Subject: [PATCH 246/294] Replace call for Logger with DI::logger() in
 openstreetmap addon

---
 openstreetmap/openstreetmap.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index fc5ebbbe..bf0f54b6 100644
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -11,7 +11,6 @@
 
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
@@ -31,7 +30,7 @@ function openstreetmap_install()
 	Hook::register('Map::getCoordinates', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_get_coordinates');
 	Hook::register('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
 
-	Logger::notice("installed openstreetmap");
+	DI::logger()->notice("installed openstreetmap");
 }
 
 function openstreetmap_load_config(ConfigFileManager $loader)
@@ -154,8 +153,8 @@ function openstreetmap_generate_map(array &$b)
 	$lat = $b['lat']; // round($b['lat'], 5);
 	$lon = $b['lon']; // round($b['lon'], 5);
 
-	Logger::debug('lat: ' . $lat);
-	Logger::debug('lon: ' . $lon);
+	DI::logger()->debug('lat: ' . $lat);
+	DI::logger()->debug('lon: ' . $lon);
 
 	$cardlink = '<a href="' . $tmsserver;
 
@@ -173,7 +172,7 @@ function openstreetmap_generate_map(array &$b)
 		$b['html'] .= '<br/>' . $cardlink;
 	}
 
-	Logger::debug('generate_map: ' . $b['html']);
+	DI::logger()->debug('generate_map: ' . $b['html']);
 }
 
 function openstreetmap_addon_admin(string &$o)

From 469d3e6d61c8c20089be5da8ce7187db6507f77b Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:47:40 +0000
Subject: [PATCH 247/294] Replace call for Logger with DI::logger() in planets
 addon

---
 planets/planets.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/planets/planets.php b/planets/planets.php
index d96e33a6..8849010a 100644
--- a/planets/planets.php
+++ b/planets/planets.php
@@ -8,7 +8,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -28,7 +27,7 @@ function planets_install()
 	Hook::register('addon_settings', 'addon/planets/planets.php', 'planets_settings');
 	Hook::register('addon_settings_post', 'addon/planets/planets.php', 'planets_settings_post');
 
-	Logger::notice("installed planets");
+	DI::logger()->notice("installed planets");
 }
 
 /**
@@ -39,7 +38,7 @@ function planets_install()
  */
 function planets_post_hook(&$item)
 {
-	Logger::notice('planets invoked');
+	DI::logger()->notice('planets invoked');
 
 	if (!DI::userSession()->getLocalUserId()) {
 		/* non-zero if this is a logged in user of this system */

From 119ba0a78e1d578d802bf87b1d39e6da35a02da6 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:48:21 +0000
Subject: [PATCH 248/294] Replace call for Logger with DI::logger() in pnut
 addon

---
 pnut/pnut.php | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pnut/pnut.php b/pnut/pnut.php
index f298997b..5460b991 100644
--- a/pnut/pnut.php
+++ b/pnut/pnut.php
@@ -14,7 +14,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\DI;
@@ -76,7 +75,7 @@ function pnut_connect()
 
 	try {
 		$token = $nut->getAccessToken($callback_url);
-		Logger::debug('Got Token', [$token]);
+		DI::logger()->debug('Got Token', [$token]);
 		$o = DI::l10n()->t('You are now authenticated with pnut.io.');
 		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pnut', 'access_token', $token);
 	} catch (phpnutException $e) {
@@ -266,8 +265,8 @@ function pnut_post_hook(array &$b)
 		return;
 	}
 
-	Logger::notice('PNUT post invoked', ['id' => $b['id'], 'guid' => $b['guid'], 'plink' => $b['plink']]);
-	Logger::debug('PNUT array', $b);
+	DI::logger()->notice('PNUT post invoked', ['id' => $b['id'], 'guid' => $b['guid'], 'plink' => $b['plink']]);
+	DI::logger()->debug('PNUT array', $b);
 
 	$token = DI::pConfig()->get($b['uid'], 'pnut', 'access_token');
 	$nut = new phpnut\phpnut($token);
@@ -276,7 +275,7 @@ function pnut_post_hook(array &$b)
 	$text = $msgarr['text'];
 	$raw = [];
 
-	Logger::debug('PNUT msgarr', $msgarr);
+	DI::logger()->debug('PNUT msgarr', $msgarr);
 
 	if (count($msgarr['parts']) > 1) {
 		$tstamp = time();
@@ -292,23 +291,23 @@ function pnut_post_hook(array &$b)
 	if ($msgarr['type'] == 'photo') {
 		$fileraw = ['type' => 'dev.mcmillian.friendica.image', 'kind' => 'image', 'is_public' => true];
 		foreach ($msgarr['images'] as $image) {
-			Logger::debug('PNUT image', $image);
+			DI::logger()->debug('PNUT image', $image);
 
 			if (!empty($image['id'])) {
 				$photo = Photo::selectFirst([], ['id' => $image['id']]);
-				Logger::debug('PNUT selectFirst');
+				DI::logger()->debug('PNUT selectFirst');
 			} else {
 				$photo = Photo::createPhotoForExternalResource($image['url']);
-				Logger::debug('PNUT createPhotoForExternalResource');
+				DI::logger()->debug('PNUT createPhotoForExternalResource');
 			}
 			$picturedata = Photo::getImageForPhoto($photo);
 
-			Logger::debug('PNUT photo', $photo);
+			DI::logger()->debug('PNUT photo', $photo);
 			$picurefile = tempnam(System::getTempPath(), 'pnut');
 			file_put_contents($picurefile, $picturedata);
-			Logger::debug('PNUT got file?', ['filename' => $picurefile]);
+			DI::logger()->debug('PNUT got file?', ['filename' => $picurefile]);
 			$imagefile = $nut->createFile($picurefile, $fileraw);
-			Logger::debug('PNUT file', ['pnutimagefile' => $imagefile]);
+			DI::logger()->debug('PNUT file', ['pnutimagefile' => $imagefile]);
 			unlink($picurefile);
 
 			$raw['io.pnut.core.oembed'][] = ['+io.pnut.core.file' => ['file_id' => $imagefile['id'], 'file_token' => $imagefile['file_token'], 'format' => 'oembed']];
@@ -318,5 +317,5 @@ function pnut_post_hook(array &$b)
 	$raw['io.pnut.core.crosspost'][] = ['canonical_url' => $b['plink']];
 	$nut->createPost($text, ['raw' => $raw]);
 
-	Logger::debug('PNUT post complete', ['id' => $b['id'], 'text' => $text, 'raw' => $raw]);
+	DI::logger()->debug('PNUT post complete', ['id' => $b['id'], 'text' => $text, 'raw' => $raw]);
 }

From e32ba1ce7b0a1baad29d47df9dcb6328834fbd94 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:54:34 +0000
Subject: [PATCH 249/294] Replace call for Logger with DI::logger() in
 public_server addon

---
 public_server/public_server.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/public_server/public_server.php b/public_server/public_server.php
index eb7af1e7..9cd0f667 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -8,7 +8,6 @@
 
 use Friendica\BaseModule;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -47,7 +46,7 @@ function public_server_register_account($b)
 
 function public_server_cron($b)
 {
-	Logger::notice("public_server: cron start");
+	DI::logger()->notice("public_server: cron start");
 
 	$users = DBA::selectToArray('user', [], ["`account_expires_on` > ? AND `account_expires_on` < ?
 		AND `expire_notification_sent` <= ?", DBA::NULL_DATETIME, DateTimeFormat::utc('now + 5 days'), DBA::NULL_DATETIME]);
@@ -96,7 +95,7 @@ function public_server_cron($b)
 		}
 	}
 
-	Logger::notice("public_server: cron end");
+	DI::logger()->notice("public_server: cron end");
 }
 
 function public_server_enotify(array &$b)

From d50650b8cfe7284ee17b482f261e0a8778ad3758 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:55:13 +0000
Subject: [PATCH 250/294] Replace call for Logger with DI::logger() in pumpio
 addon

---
 pumpio/pumpio.php | 73 +++++++++++++++++++++++------------------------
 1 file changed, 36 insertions(+), 37 deletions(-)

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index ffe5f187..c3445b48 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -10,7 +10,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
@@ -107,7 +106,7 @@ function pumpio_registerclient($host)
 	$params['logo_url'] = DI::baseUrl() . '/images/friendica-256.png';
 	$params['redirect_uris'] = DI::baseUrl() . '/pumpio/connect';
 
-	Logger::info('pumpio_registerclient: ' . $url . ' parameters', $params);
+	DI::logger()->info('pumpio_registerclient: ' . $url . ' parameters', $params);
 
 	// @TODO Rewrite this to our own HTTP client
 	$ch = curl_init($url);
@@ -122,10 +121,10 @@ function pumpio_registerclient($host)
 
 	if ($curl_info['http_code'] == '200') {
 		$values = json_decode($s);
-		Logger::info('pumpio_registerclient: success ', (array)$values);
+		DI::logger()->info('pumpio_registerclient: success ', (array)$values);
 		return $values;
 	}
-	Logger::info('pumpio_registerclient: failed: ', $curl_info);
+	DI::logger()->info('pumpio_registerclient: failed: ', $curl_info);
 	return false;
 
 }
@@ -138,7 +137,7 @@ function pumpio_connect()
 	$hostname        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pumpio', 'host');
 
 	if ((($consumer_key == '') || ($consumer_secret == '')) && ($hostname != '')) {
-		Logger::notice('pumpio_connect: register client');
+		DI::logger()->notice('pumpio_connect: register client');
 		$clientdata = pumpio_registerclient($hostname);
 		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'consumer_key', $clientdata->client_id);
 		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'consumer_secret', $clientdata->client_secret);
@@ -146,11 +145,11 @@ function pumpio_connect()
 		$consumer_key    = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pumpio', 'consumer_key');
 		$consumer_secret = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pumpio', 'consumer_secret');
 
-		Logger::info('pumpio_connect: ckey: ' . $consumer_key . ' csecrect: ' . $consumer_secret);
+		DI::logger()->info('pumpio_connect: ckey: ' . $consumer_key . ' csecrect: ' . $consumer_secret);
 	}
 
 	if (($consumer_key == '') || ($consumer_secret == '')) {
-		Logger::notice('pumpio_connect: '.sprintf('Unable to register the client at the pump.io server "%s".', $hostname));
+		DI::logger()->notice('pumpio_connect: '.sprintf('Unable to register the client at the pump.io server "%s".', $hostname));
 
 		return DI::l10n()->t("Unable to register the client at the pump.io server '%s'.", $hostname);
 	}
@@ -179,7 +178,7 @@ function pumpio_connect()
 	if (($success = $client->Initialize())) {
 		if (($success = $client->Process())) {
 			if (strlen($client->access_token)) {
-				Logger::info('pumpio_connect: otoken: ' . $client->access_token . ', osecrect: ' . $client->access_token_secret);
+				DI::logger()->info('pumpio_connect: otoken: ' . $client->access_token . ', osecrect: ' . $client->access_token_secret);
 				DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'oauth_token', $client->access_token);
 				DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'oauth_token_secret', $client->access_token_secret);
 			}
@@ -191,11 +190,11 @@ function pumpio_connect()
 	}
 
 	if ($success) {
-		Logger::notice('pumpio_connect: authenticated');
+		DI::logger()->notice('pumpio_connect: authenticated');
 		$o = DI::l10n()->t('You are now authenticated to pumpio.');
 		$o .= '<br /><a href="' . DI::baseUrl() . '/settings/connectors">' . DI::l10n()->t('return to the connector page') . '</a>';
 	} else {
-		Logger::notice('pumpio_connect: could not connect');
+		DI::logger()->notice('pumpio_connect: could not connect');
 		$o = 'Could not connect to pumpio. Refresh the page or try again later.';
 	}
 
@@ -345,7 +344,7 @@ function pumpio_hook_fork(array &$b)
 	if (DI::pConfig()->get($post['uid'], 'pumpio', 'import')) {
 		// Don't fork if it isn't a reply to a pump.io post
 		if (($post['gravity'] != Item::GRAVITY_PARENT) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::PUMPIO])) {
-			Logger::notice('No pump.io parent found for item ' . $post['id']);
+			DI::logger()->notice('No pump.io parent found for item ' . $post['id']);
 			$b['execute'] = false;
 			return;
 		}
@@ -389,7 +388,7 @@ function pumpio_send(array &$b)
 		return;
 	}
 
-	Logger::debug('pumpio_send: parameter ', $b);
+	DI::logger()->debug('pumpio_send: parameter ', $b);
 
 	$b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b));
 
@@ -399,7 +398,7 @@ function pumpio_send(array &$b)
 		$orig_post = Post::selectFirst([], $condition);
 
 		if (!DBA::isResult($orig_post)) {
-			Logger::notice('pumpio_send: no pumpio post ' . $b['parent']);
+			DI::logger()->notice('pumpio_send: no pumpio post ' . $b['parent']);
 			return;
 		} else {
 			$iscomment = true;
@@ -409,7 +408,7 @@ function pumpio_send(array &$b)
 
 		$receiver = pumpio_getreceiver($b);
 
-		Logger::notice('pumpio_send: receiver ', $receiver);
+		DI::logger()->notice('pumpio_send: receiver ', $receiver);
 
 		if (!count($receiver) && ($b['private'] == Item::PRIVATE) || !strstr($b['postopts'], 'pumpio')) {
 			return;
@@ -543,13 +542,13 @@ function pumpio_send(array &$b)
 			}
 
 			$post_id = $user->object->id;
-			Logger::notice('pumpio_send ' . $username . ': success ' . $post_id);
+			DI::logger()->notice('pumpio_send ' . $username . ': success ' . $post_id);
 			if ($post_id && $iscomment) {
-				Logger::notice('pumpio_send ' . $username . ': Update extid ' . $post_id . ' for post id ' . $b['id']);
+				DI::logger()->notice('pumpio_send ' . $username . ': Update extid ' . $post_id . ' for post id ' . $b['id']);
 				Item::update(['extid' => $post_id], ['id' => $b['id']]);
 			}
 		} else {
-			Logger::notice('pumpio_send '.$username.': '.$url.' general error: ' . print_r($user, true));
+			DI::logger()->notice('pumpio_send '.$username.': '.$url.' general error: ' . print_r($user, true));
 			Worker::defer();
 		}
 	}
@@ -619,9 +618,9 @@ function pumpio_action(int $uid, string $uri, string $action, string $content =
 	}
 
 	if ($success) {
-		Logger::notice('pumpio_action '.$username.' '.$action.': success '.$uri);
+		DI::logger()->notice('pumpio_action '.$username.' '.$action.': success '.$uri);
 	} else {
-		Logger::notice('pumpio_action '.$username.' '.$action.': general error: '.$uri);
+		DI::logger()->notice('pumpio_action '.$username.' '.$action.': general error: '.$uri);
 		Worker::defer();
 	}
 }
@@ -639,15 +638,15 @@ function pumpio_sync()
 	if ($last) {
 		$next = $last + ($poll_interval * 60);
 		if ($next > time()) {
-			Logger::notice('pumpio: poll intervall not reached');
+			DI::logger()->notice('pumpio: poll intervall not reached');
 			return;
 		}
 	}
-	Logger::notice('pumpio: cron_start');
+	DI::logger()->notice('pumpio: cron_start');
 
 	$pconfigs = DBA::selectToArray('pconfig', ['uid'], ['cat' => 'pumpio', 'k' => 'mirror', 'v' => '1']);
 	foreach ($pconfigs as $rr) {
-		Logger::notice('pumpio: mirroring user '.$rr['uid']);
+		DI::logger()->notice('pumpio: mirroring user '.$rr['uid']);
 		pumpio_fetchtimeline($rr['uid']);
 	}
 
@@ -662,12 +661,12 @@ function pumpio_sync()
 	foreach ($pconfigs as $rr) {
 		if ($abandon_days != 0) {
 			if (DBA::exists('user', ["uid = ? AND `login_date` >= ?", $rr['uid'], $abandon_limit])) {
-				Logger::notice('abandoned account: timeline from user '.$rr['uid'].' will not be imported');
+				DI::logger()->notice('abandoned account: timeline from user '.$rr['uid'].' will not be imported');
 				continue;
 			}
 		}
 
-		Logger::notice('pumpio: importing timeline from user '.$rr['uid']);
+		DI::logger()->notice('pumpio: importing timeline from user '.$rr['uid']);
 		pumpio_fetchinbox($rr['uid']);
 
 		// check for new contacts once a day
@@ -684,7 +683,7 @@ function pumpio_sync()
 		}
 	}
 
-	Logger::notice('pumpio: cron_end');
+	DI::logger()->notice('pumpio: cron_end');
 
 	DI::keyValue()->set('pumpio_last_poll', time());
 }
@@ -729,7 +728,7 @@ function pumpio_fetchtimeline(int $uid)
 
 	$url = 'https://'.$hostname.'/api/user/'.$username.'/feed/major';
 
-	Logger::notice('pumpio: fetching for user ' . $uid . ' ' . $url . ' C:' . $client->client_id . ' CS:' . $client->client_secret . ' T:' . $client->access_token . ' TS:' . $client->access_token_secret);
+	DI::logger()->notice('pumpio: fetching for user ' . $uid . ' ' . $url . ' C:' . $client->client_id . ' CS:' . $client->client_secret . ' T:' . $client->access_token . ' TS:' . $client->access_token_secret);
 
 	$useraddr = $username.'@'.$hostname;
 
@@ -741,7 +740,7 @@ function pumpio_fetchtimeline(int $uid)
 	}
 
 	if (!$success) {
-		Logger::notice('pumpio: error fetching posts for user ' . $uid . ' ' . $useraddr . ' ', $user);
+		DI::logger()->notice('pumpio: error fetching posts for user ' . $uid . ' ' . $useraddr . ' ', $user);
 		return;
 	}
 
@@ -801,11 +800,11 @@ function pumpio_fetchtimeline(int $uid)
 					}
 				}
 
-				Logger::notice('pumpio: posting for user ' . $uid);
+				DI::logger()->notice('pumpio: posting for user ' . $uid);
 
 				Item::insert($postarray, true);
 
-				Logger::notice('pumpio: posting done - user ' . $uid);
+				DI::logger()->notice('pumpio: posting done - user ' . $uid);
 			}
 		}
 	}
@@ -846,16 +845,16 @@ function pumpio_dounlike(int $uid, array $self, $post, string $own_id)
 	Item::markForDeletion(['verb' => Activity::LIKE, 'uid' => $uid, 'contact-id' => $contactid, 'thr-parent' => $orig_post['uri']]);
 
 	if (DBA::isResult($contact)) {
-		Logger::notice('pumpio_dounlike: unliked existing like. User ' . $own_id . ' ' . $uid . ' Contact: ' . $contactid . ' URI ' . $orig_post['uri']);
+		DI::logger()->notice('pumpio_dounlike: unliked existing like. User ' . $own_id . ' ' . $uid . ' Contact: ' . $contactid . ' URI ' . $orig_post['uri']);
 	} else {
-		Logger::notice('pumpio_dounlike: not found. User ' . $own_id . ' ' . $uid . ' Contact: ' . $contactid . ' Url ' . $orig_post['uri']);
+		DI::logger()->notice('pumpio_dounlike: not found. User ' . $own_id . ' ' . $uid . ' Contact: ' . $contactid . ' Url ' . $orig_post['uri']);
 	}
 }
 
 function pumpio_dolike(int $uid, array $self, $post, string $own_id, $threadcompletion = true)
 {
 	if (empty($post->object->id)) {
-		Logger::info('Got empty like: '.print_r($post, true));
+		DI::logger()->info('Got empty like: '.print_r($post, true));
 		return;
 	}
 
@@ -900,7 +899,7 @@ function pumpio_dolike(int $uid, array $self, $post, string $own_id, $threadcomp
 	];
 
 	if (Post::exists($condition)) {
-		Logger::notice('pumpio_dolike: found existing like. User ' . $own_id . ' ' . $uid . ' Contact: ' . $contactid . ' URI ' . $orig_post['uri']);
+		DI::logger()->notice('pumpio_dolike: found existing like. User ' . $own_id . ' ' . $uid . ' Contact: ' . $contactid . ' URI ' . $orig_post['uri']);
 		return;
 	}
 
@@ -934,7 +933,7 @@ function pumpio_dolike(int $uid, array $self, $post, string $own_id, $threadcomp
 
 	$ret = Item::insert($likedata);
 
-	Logger::notice('pumpio_dolike: ' . $ret . ' User ' . $own_id . ' ' . $uid . ' Contact: ' . $contactid . ' URI ' . $orig_post['uri']);
+	DI::logger()->notice('pumpio_dolike: ' . $ret . ' User ' . $own_id . ' ' . $uid . ' Contact: ' . $contactid . ' URI ' . $orig_post['uri']);
 }
 
 function pumpio_get_contact($uid, $contact, $no_insert = false)
@@ -1405,7 +1404,7 @@ function pumpio_fetchallcomments($uid, $id)
 	$hostname = DI::pConfig()->get($uid, 'pumpio', 'host');
 	$username = DI::pConfig()->get($uid, 'pumpio', 'user');
 
-	Logger::notice('pumpio_fetchallcomments: completing comment for user ' . $uid . ' post id ' . $id);
+	DI::logger()->notice('pumpio_fetchallcomments: completing comment for user ' . $uid . ' post id ' . $id);
 
 	$own_id = 'https://' . $hostname . '/' . $username;
 
@@ -1430,7 +1429,7 @@ function pumpio_fetchallcomments($uid, $id)
 	$client->access_token = $otoken;
 	$client->access_token_secret = $osecret;
 
-	Logger::notice('pumpio_fetchallcomments: fetching comment for user ' . $uid . ', URL ' . $url);
+	DI::logger()->notice('pumpio_fetchallcomments: fetching comment for user ' . $uid . ', URL ' . $url);
 
 	$item = new \stdClass();
 
@@ -1495,7 +1494,7 @@ function pumpio_fetchallcomments($uid, $id)
 
 		$post->object = $item;
 
-		Logger::notice('pumpio_fetchallcomments: posting comment ' . $post->object->id . ' ', json_decode(json_encode($post), true));
+		DI::logger()->notice('pumpio_fetchallcomments: posting comment ' . $post->object->id . ' ', json_decode(json_encode($post), true));
 		pumpio_dopost($client, $uid, $self, $post, $own_id, false);
 	}
 }

From 32a3160445d6a148b81daadd169705ddfe5558af Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:56:09 +0000
Subject: [PATCH 251/294] Replace call for Logger with DI::logger() in
 randplace addon

---
 randplace/randplace.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/randplace/randplace.php b/randplace/randplace.php
index 5cb07597..89a75f98 100644
--- a/randplace/randplace.php
+++ b/randplace/randplace.php
@@ -20,7 +20,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -40,7 +39,7 @@ function randplace_install()
 	Hook::register('addon_settings', 'addon/randplace/randplace.php', 'randplace_settings');
 	Hook::register('addon_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
 
-	Logger::notice("installed randplace");
+	DI::logger()->notice("installed randplace");
 }
 
 function randplace_uninstall()
@@ -50,7 +49,7 @@ function randplace_uninstall()
 	 *
 	 * Except hooks, they are all unregistered automatically and don't need to be unregistered manually.
 	 */
-	Logger::notice("removed randplace");
+	DI::logger()->notice("removed randplace");
 }
 
 function randplace_post_hook(&$item)
@@ -61,7 +60,7 @@ function randplace_post_hook(&$item)
 	 *      - A status post by a profile owner
 	 *      - The profile owner must have allowed our addon
 	 */
-	Logger::notice('randplace invoked');
+	DI::logger()->notice('randplace invoked');
 
 	if (!DI::userSession()->getLocalUserId()) {
 		/* non-zero if this is a logged in user of this system */

From ac6c1d7a49a386555c054faa6d13bb108856ebd0 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:56:29 +0000
Subject: [PATCH 252/294] Replace call for Logger with DI::logger() in saml
 addon

---
 saml/saml.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/saml/saml.php b/saml/saml.php
index 81a6bfcc..c8824b46 100755
--- a/saml/saml.php
+++ b/saml/saml.php
@@ -8,7 +8,6 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -63,7 +62,7 @@ function saml_metadata()
 			);
 		}
 	} catch (Exception $e) {
-		Logger::error($e->getMessage());
+		DI::logger()->error($e->getMessage());
 	}
 }
 
@@ -125,7 +124,7 @@ function saml_is_configured()
 function saml_sso_initiate(string &$body)
 {
 	if (!saml_is_configured()) {
-		Logger::warning('SAML SSO tried to trigger, but the SAML addon is not configured yet!');
+		DI::logger()->warning('SAML SSO tried to trigger, but the SAML addon is not configured yet!');
 		return;
 	}
 
@@ -154,7 +153,7 @@ function saml_sso_reply()
 
 	if (!empty($errors)) {
 		echo 'Errors encountered.';
-		Logger::error(implode(', ', $errors));
+		DI::logger()->error(implode(', ', $errors));
 		exit();
 	}
 
@@ -190,7 +189,7 @@ function saml_sso_reply()
 function saml_slo_initiate()
 {
 	if (!saml_is_configured()) {
-		Logger::warning('SAML SLO tried to trigger, but the SAML addon is not configured yet!');
+		DI::logger()->warning('SAML SLO tried to trigger, but the SAML addon is not configured yet!');
 		return;
 	}
 
@@ -221,7 +220,7 @@ function saml_slo_reply()
 	if (empty($errors)) {
 		$auth->redirectTo(DI::baseUrl());
 	} else {
-		Logger::error(implode(', ', $errors));
+		DI::logger()->error(implode(', ', $errors));
 	}
 }
 
@@ -314,7 +313,7 @@ function saml_addon_admin_post()
 function saml_create_user($username, $email, $name)
 {
 	if (!strlen($email) || !strlen($name)) {
-		Logger::error('Could not create user: no email or username given.');
+		DI::logger()->error('Could not create user: no email or username given.');
 		return false;
 	}
 
@@ -336,7 +335,7 @@ function saml_create_user($username, $email, $name)
 
 		return $user;
 	} catch (Exception $e) {
-		Logger::error(
+		DI::logger()->error(
 			'Exception while creating user',
 			[
 				'username'  => $username,

From bfdccb451ce391361de025d01565b4a52af99d6c Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:56:45 +0000
Subject: [PATCH 253/294] Replace call for Logger with DI::logger() in
 statusnet addon

---
 statusnet/statusnet.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index bd115115..8663aaea 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -40,7 +40,6 @@ require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . '
 use CodebirdSN\CodebirdSN;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
@@ -58,7 +57,7 @@ function statusnet_install()
 	Hook::register('hook_fork', 'addon/statusnet/statusnet.php', 'statusnet_hook_fork');
 	Hook::register('post_local', 'addon/statusnet/statusnet.php', 'statusnet_post_local');
 	Hook::register('jot_networks', 'addon/statusnet/statusnet.php', 'statusnet_jot_nets');
-	Logger::notice('installed GNU Social');
+	DI::logger()->notice('installed GNU Social');
 }
 
 function statusnet_jot_nets(array &$jotnets_fields)
@@ -355,7 +354,7 @@ function statusnet_post_hook(array &$b)
 		return;
 	}
 
-	Logger::notice('GNU Socialpost invoked');
+	DI::logger()->notice('GNU Socialpost invoked');
 
 	DI::pConfig()->load($b['uid'], 'statusnet');
 
@@ -407,7 +406,7 @@ function statusnet_post_hook(array &$b)
 			$cb->setToken($otoken, $osecret);
 			$result = $cb->statuses_update($postdata);
 			//$result = $dent->post('statuses/update', $postdata);
-			Logger::info('statusnet_post send, result: ' . print_r($result, true) .
+			DI::logger()->info('statusnet_post send, result: ' . print_r($result, true) .
 				"\nmessage: " . $msg . "\nOriginal post: " . print_r($b, true) . "\nPost Data: " . print_r($postdata, true));
 
 			if (!empty($result->source)) {
@@ -415,9 +414,9 @@ function statusnet_post_hook(array &$b)
 			}
 
 			if (!empty($result->error)) {
-				Logger::notice('Send to GNU Social failed: "' . $result->error . '"');
+				DI::logger()->notice('Send to GNU Social failed: "' . $result->error . '"');
 			} elseif ($iscomment) {
-				Logger::notice('statusnet_post: Update extid ' . $result->id . ' for post id ' . $b['id']);
+				DI::logger()->notice('statusnet_post: Update extid ' . $result->id . ' for post id ' . $b['id']);
 				Item::update(['extid' => $hostname . '::' . $result->id, 'body' => $result->text], ['id' => $b['id']]);
 			}
 		}

From 763c5026f237a569f9f6cc9b4b65311556ca0087 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:57:12 +0000
Subject: [PATCH 254/294] Replace call for Logger with DI::logger() in tumblr
 addon

---
 tumblr/tumblr.php | 99 +++++++++++++++++++++++------------------------
 1 file changed, 49 insertions(+), 50 deletions(-)

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 12f13aa8..819c0ca5 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -14,7 +14,6 @@ use Friendica\Content\Text\NPF;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
@@ -60,7 +59,7 @@ function tumblr_install()
 	Hook::register('check_item_notification', __FILE__, 'tumblr_check_item_notification');
 	Hook::register('probe_detect',            __FILE__, 'tumblr_probe_detect');
 	Hook::register('item_by_link',            __FILE__, 'tumblr_item_by_link');
-	Logger::info('installed tumblr');
+	DI::logger()->info('installed tumblr');
 }
 
 function tumblr_load_config(ConfigFileManager $loader)
@@ -121,16 +120,16 @@ function tumblr_item_by_link(array &$hookData)
 		return;
 	}
 
-	Logger::debug('Found tumblr post', ['url' => $hookData['uri'], 'blog' => $matches[1], 'id' => $matches[2]]);
+	DI::logger()->debug('Found tumblr post', ['url' => $hookData['uri'], 'blog' => $matches[1], 'id' => $matches[2]]);
 
 	$parameters = ['id' => $matches[2], 'reblog_info' => false, 'notes_info' => false, 'npf' => false];
 	$result = tumblr_get($hookData['uid'], 'blog/' . $matches[1] . '/posts', $parameters);
 	if ($result->meta->status > 399) {
-		Logger::notice('Error fetching status', ['meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'blog' => $matches[1], 'id' => $matches[2]]);
+		DI::logger()->notice('Error fetching status', ['meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'blog' => $matches[1], 'id' => $matches[2]]);
 		return [];
 	}
 
-	Logger::debug('Got post', ['blog' => $matches[1], 'id' => $matches[2], 'result' => $result->response->posts]);
+	DI::logger()->debug('Got post', ['blog' => $matches[1], 'id' => $matches[2], 'result' => $result->response->posts]);
 	if (!empty($result->response->posts)) {
 		$hookData['item_id'] = tumblr_process_post($result->response->posts[0], $hookData['uid'], Item::PR_FETCHED);
 		Item::incrementInbound(Protocol::TUMBLR);
@@ -159,20 +158,20 @@ function tumblr_follow(array &$hook_data)
 		return;
 	}
 
-	Logger::debug('Check if contact is Tumblr', ['url' => $hook_data['url']]);
+	DI::logger()->debug('Check if contact is Tumblr', ['url' => $hook_data['url']]);
 
 	$fields = tumblr_get_contact_by_url($hook_data['url'], $uid);
 	if (empty($fields)) {
-		Logger::debug('Contact is not a Tumblr contact', ['url' => $hook_data['url']]);
+		DI::logger()->debug('Contact is not a Tumblr contact', ['url' => $hook_data['url']]);
 		return;
 	}
 
 	$result = tumblr_post($uid, 'user/follow', ['url' => $fields['url']]);
 	if ($result->meta->status <= 399) {
 		$hook_data['contact'] = $fields;
-		Logger::debug('Successfully start following', ['url' => $fields['url']]);
+		DI::logger()->debug('Successfully start following', ['url' => $fields['url']]);
 	} else {
-		Logger::notice('Following failed', ['meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'url' => $fields['url']]);
+		DI::logger()->notice('Following failed', ['meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'url' => $fields['url']]);
 	}
 }
 
@@ -415,11 +414,11 @@ function tumblr_cron()
 	if ($last) {
 		$next = $last + ($poll_interval * 60);
 		if ($next > time()) {
-			Logger::notice('poll interval not reached');
+			DI::logger()->notice('poll interval not reached');
 			return;
 		}
 	}
-	Logger::notice('cron_start');
+	DI::logger()->notice('cron_start');
 
 	$abandon_days = intval(DI::config()->get('system', 'account_abandon_days'));
 	if ($abandon_days < 1) {
@@ -432,30 +431,30 @@ function tumblr_cron()
 	foreach ($pconfigs as $pconfig) {
 		if ($abandon_days != 0) {
 			if (!DBA::exists('user', ["`uid` = ? AND `login_date` >= ?", $pconfig['uid'], $abandon_limit])) {
-				Logger::notice('abandoned account: timeline from user will not be imported', ['user' => $pconfig['uid']]);
+				DI::logger()->notice('abandoned account: timeline from user will not be imported', ['user' => $pconfig['uid']]);
 				continue;
 			}
 		}
 
-		Logger::notice('importing timeline - start', ['user' => $pconfig['uid']]);
+		DI::logger()->notice('importing timeline - start', ['user' => $pconfig['uid']]);
 		tumblr_fetch_dashboard($pconfig['uid'], $last);
 		tumblr_fetch_tags($pconfig['uid'], $last);
-		Logger::notice('importing timeline - done', ['user' => $pconfig['uid']]);
+		DI::logger()->notice('importing timeline - done', ['user' => $pconfig['uid']]);
 	}
 
 	$last_clean = DI::keyValue()->get('tumblr_last_clean');
 	if (empty($last_clean) || ($last_clean + 86400 < time())) {
-		Logger::notice('Start contact cleanup');
+		DI::logger()->notice('Start contact cleanup');
 		$contacts = DBA::select('account-user-view', ['id', 'pid'], ["`network` = ? AND `uid` != ? AND `rel` = ?", Protocol::TUMBLR, 0, Contact::NOTHING]);
 		while ($contact = DBA::fetch($contacts)) {
 			Worker::add(Worker::PRIORITY_LOW, 'MergeContact', $contact['pid'], $contact['id'], 0);
 		}
 		DBA::close($contacts);
 		DI::keyValue()->set('tumblr_last_clean', time());
-		Logger::notice('Contact cleanup done');
+		DI::logger()->notice('Contact cleanup done');
 	}
 
-	Logger::notice('cron_end');
+	DI::logger()->notice('cron_end');
 
 	DI::keyValue()->set('tumblr_last_poll', time());
 }
@@ -478,7 +477,7 @@ function tumblr_hook_fork(array &$b)
 	if (DI::pConfig()->get($post['uid'], 'tumblr', 'import')) {
 		// Don't post if it isn't a reply to a tumblr post
 		if (($post['gravity'] != Item::GRAVITY_PARENT) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::TUMBLR])) {
-			Logger::notice('No tumblr parent found', ['item' => $post['id']]);
+			DI::logger()->notice('No tumblr parent found', ['item' => $post['id']]);
 			$b['execute'] = false;
 			return;
 		}
@@ -525,20 +524,20 @@ function tumblr_send(array &$b)
 	}
 
 	if ($b['gravity'] != Item::GRAVITY_PARENT) {
-		Logger::debug('Got comment', ['item' => $b]);
+		DI::logger()->debug('Got comment', ['item' => $b]);
 
 		$parent = tumblr_get_post_from_uri($b['thr-parent']);
 		if (empty($parent)) {
-			Logger::notice('No tumblr post', ['thr-parent' => $b['thr-parent']]);
+			DI::logger()->notice('No tumblr post', ['thr-parent' => $b['thr-parent']]);
 			return;
 		}
 
-		Logger::debug('Parent found', ['parent' => $parent]);
+		DI::logger()->debug('Parent found', ['parent' => $parent]);
 
 		$page = tumblr_get_page($b['uid']);
 
 		if ($b['gravity'] == Item::GRAVITY_COMMENT) {
-			Logger::notice('Commenting is not supported (yet)');
+			DI::logger()->notice('Commenting is not supported (yet)');
 		} else {
 			if (($b['verb'] == Activity::LIKE) && !$b['deleted']) {
 				$params = ['id' => $parent['id'], 'reblog_key' => $parent['reblog_key']];
@@ -562,12 +561,12 @@ function tumblr_send(array &$b)
 			}
 
 			if ($result->meta->status < 400) {
-				Logger::info('Successfully performed activity', ['verb' => $b['verb'], 'deleted' => $b['deleted'], 'meta' => $result->meta, 'response' => $result->response]);
+				DI::logger()->info('Successfully performed activity', ['verb' => $b['verb'], 'deleted' => $b['deleted'], 'meta' => $result->meta, 'response' => $result->response]);
 				if (!$b['deleted'] && !empty($result->response->id_string)) {
 					Item::update(['extid' => 'tumblr::' . $result->response->id_string], ['guid' => $b['guid']]);
 				}
 			} else {
-				Logger::notice('Error while performing activity', ['verb' => $b['verb'], 'deleted' => $b['deleted'], 'meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'params' => $params]);
+				DI::logger()->notice('Error while performing activity', ['verb' => $b['verb'], 'deleted' => $b['deleted'], 'meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'params' => $params]);
 			}
 		}
 		return;
@@ -665,9 +664,9 @@ function tumblr_send_legacy(array $b)
 	$result = tumblr_post($b['uid'], 'blog/' . $page . '/post', $params);
 
 	if ($result->meta->status < 400) {
-		Logger::info('Success (legacy)', ['blog' => $page, 'meta' => $result->meta, 'response' => $result->response]);
+		DI::logger()->info('Success (legacy)', ['blog' => $page, 'meta' => $result->meta, 'response' => $result->response]);
 	} else {
-		Logger::notice('Error posting blog (legacy)', ['blog' => $page, 'meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'params' => $params]);
+		DI::logger()->notice('Error posting blog (legacy)', ['blog' => $page, 'meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'params' => $params]);
 	}
 }
 
@@ -676,7 +675,7 @@ function tumblr_send_npf(array $post): bool
 	$page = tumblr_get_page($post['uid']);
 
 	if (empty($page)) {
-		Logger::notice('Missing page, post will not be send to Tumblr.', ['uid' => $post['uid'], 'page' => $page, 'id' => $post['id']]);
+		DI::logger()->notice('Missing page, post will not be send to Tumblr.', ['uid' => $post['uid'], 'page' => $page, 'id' => $post['id']]);
 		// "true" is returned, since the legacy function will fail as well.
 		return true;
 	}
@@ -707,10 +706,10 @@ function tumblr_send_npf(array $post): bool
 	$result = tumblr_post($post['uid'], 'blog/' . $page . '/posts', $params);
 
 	if ($result->meta->status < 400) {
-		Logger::info('Success (NPF)', ['blog' => $page, 'meta' => $result->meta, 'response' => $result->response]);
+		DI::logger()->info('Success (NPF)', ['blog' => $page, 'meta' => $result->meta, 'response' => $result->response]);
 		return true;
 	} else {
-		Logger::notice('Error posting blog (NPF)', ['blog' => $page, 'meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'params' => $params]);
+		DI::logger()->notice('Error posting blog (NPF)', ['blog' => $page, 'meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'params' => $params]);
 		return false;
 	}
 }
@@ -747,10 +746,10 @@ function tumblr_fetch_tags(int $uid, int $last_poll)
 		foreach (array_reverse($data->response) as $post) {
 			$id = tumblr_process_post($post, $uid, Item::PR_TAG, $last_poll);
 			if (!empty($id)) {
-				Logger::debug('Tag post imported', ['tag' => $tag, 'id' => $id]);
+				DI::logger()->debug('Tag post imported', ['tag' => $tag, 'id' => $id]);
 				$post = Post::selectFirst(['uri-id'], ['id' => $id]);
 				$stored = Post\Category::storeFileByURIId($post['uri-id'], $uid, Post\Category::SUBCRIPTION, $tag);
-				Logger::debug('Stored tag subscription for user', ['uri-id' => $post['uri-id'], 'uid' => $uid, 'tag' => $tag, 'stored' => $stored]);
+				DI::logger()->debug('Stored tag subscription for user', ['uri-id' => $post['uri-id'], 'uid' => $uid, 'tag' => $tag, 'stored' => $stored]);
 				Item::incrementInbound(Protocol::TUMBLR);
 			}
 		}
@@ -775,7 +774,7 @@ function tumblr_fetch_dashboard(int $uid, int $last_poll)
 
 	$dashboard = tumblr_get($uid, 'user/dashboard', $parameters);
 	if ($dashboard->meta->status > 399) {
-		Logger::notice('Error fetching dashboard', ['meta' => $dashboard->meta, 'response' => $dashboard->response, 'errors' => $dashboard->errors]);
+		DI::logger()->notice('Error fetching dashboard', ['meta' => $dashboard->meta, 'response' => $dashboard->response, 'errors' => $dashboard->errors]);
 		return [];
 	}
 
@@ -788,7 +787,7 @@ function tumblr_fetch_dashboard(int $uid, int $last_poll)
 			$last = $post->id;
 		}
 
-		Logger::debug('Importing post', ['uid' => $uid, 'created' => date(DateTimeFormat::MYSQL, $post->timestamp), 'id' => $post->id_string]);
+		DI::logger()->debug('Importing post', ['uid' => $uid, 'created' => date(DateTimeFormat::MYSQL, $post->timestamp), 'id' => $post->id_string]);
 
 		tumblr_process_post($post, $uid, Item::PR_NONE, $last_poll);
 		Item::incrementInbound(Protocol::TUMBLR);
@@ -1063,7 +1062,7 @@ function tumblr_get_type_replacement(array $data, string $plink): string
 			}
 
 		default:
-			Logger::notice('Unknown type', ['type' => $data['type'], 'data' => $data, 'plink' => $plink]);
+			DI::logger()->notice('Unknown type', ['type' => $data['type'], 'data' => $data, 'plink' => $plink]);
 			$body = '';
 	}
 
@@ -1118,9 +1117,9 @@ function tumblr_get_contact(stdClass $blog, int $uid): array
 			$cid = $contact['id'];
 			Contact::update($fields, ['id' => $cid], true);
 		}
-		Logger::debug('Get user contact', ['id' => $cid, 'uid' => $uid, 'update' => $update]);
+		DI::logger()->debug('Get user contact', ['id' => $cid, 'uid' => $uid, 'update' => $update]);
 	} else {
-		Logger::debug('Get public contact', ['id' => $cid, 'uid' => $uid, 'update' => $update]);
+		DI::logger()->debug('Get public contact', ['id' => $cid, 'uid' => $uid, 'update' => $update]);
 	}
 
 	if (!empty($avatar)) {
@@ -1156,13 +1155,13 @@ function tumblr_get_contact_fields(stdClass $blog, int $uid, bool $update): arra
 	];
 
 	if (!$update) {
-		Logger::debug('Got contact fields', ['uid' => $uid, 'url' => $fields['url']]);
+		DI::logger()->debug('Got contact fields', ['uid' => $uid, 'url' => $fields['url']]);
 		return $fields;
 	}
 
 	$info = tumblr_get($uid, 'blog/' . $blog->uuid . '/info');
 	if ($info->meta->status > 399) {
-		Logger::notice('Error fetching blog info', ['meta' => $info->meta, 'response' => $info->response, 'errors' => $info->errors]);
+		DI::logger()->notice('Error fetching blog info', ['meta' => $info->meta, 'response' => $info->response, 'errors' => $info->errors]);
 		return $fields;
 	}
 	Item::incrementInbound(Protocol::TUMBLR);
@@ -1184,7 +1183,7 @@ function tumblr_get_contact_fields(stdClass $blog, int $uid, bool $update): arra
 
 	$fields['header'] = $info->response->blog->theme->header_image_focused;
 
-	Logger::debug('Got updated contact fields', ['uid' => $uid, 'url' => $fields['url']]);
+	DI::logger()->debug('Got updated contact fields', ['uid' => $uid, 'url' => $fields['url']]);
 	return $fields;
 }
 
@@ -1226,7 +1225,7 @@ function tumblr_get_blogs(int $uid): array
 {
 	$userinfo = tumblr_get($uid, 'user/info');
 	if ($userinfo->meta->status > 399) {
-		Logger::notice('Error fetching blogs', ['meta' => $userinfo->meta, 'response' => $userinfo->response, 'errors' => $userinfo->errors]);
+		DI::logger()->notice('Error fetching blogs', ['meta' => $userinfo->meta, 'response' => $userinfo->response, 'errors' => $userinfo->errors]);
 		return [];
 	}
 
@@ -1282,15 +1281,15 @@ function tumblr_get_contact_by_url(string $url, int $uid): ?array
 		return null;
 	}
 
-	Logger::debug('Update Tumblr blog data', ['url' => $url, 'blog' => $blog, 'uid' => $uid]);
+	DI::logger()->debug('Update Tumblr blog data', ['url' => $url, 'blog' => $blog, 'uid' => $uid]);
 
 	$info = tumblr_get($uid, 'blog/' . $blog . '/info');
 	if ($info->meta->status > 399) {
-		Logger::notice('Error fetching blog info', ['meta' => $info->meta, 'response' => $info->response, 'errors' => $info->errors, 'blog' => $blog, 'uid' => $uid]);
+		DI::logger()->notice('Error fetching blog info', ['meta' => $info->meta, 'response' => $info->response, 'errors' => $info->errors, 'blog' => $blog, 'uid' => $uid]);
 		return null;
 	}
 
-	Logger::debug('Got data', ['blog' => $blog, 'meta' => $info->meta]);
+	DI::logger()->debug('Got data', ['blog' => $blog, 'meta' => $info->meta]);
 	Item::incrementInbound(Protocol::TUMBLR);
 
 	$baseurl = 'https://tumblr.com';
@@ -1419,7 +1418,7 @@ function tumblr_get_token(int $uid, string $code = ''): string
 	$refresh_token = DI::pConfig()->get($uid, 'tumblr', 'refresh_token');
 
 	if (empty($code) && !empty($access_token) && ($expires_at > (time()))) {
-		Logger::debug('Got token', ['uid' => $uid, 'expires_at' => date('c', $expires_at)]);
+		DI::logger()->debug('Got token', ['uid' => $uid, 'expires_at' => date('c', $expires_at)]);
 		return $access_token;
 	}
 
@@ -1431,11 +1430,11 @@ function tumblr_get_token(int $uid, string $code = ''): string
 	if (empty($refresh_token) && empty($code)) {
 		$result = tumblr_exchange_token($uid);
 		if (empty($result->refresh_token)) {
-			Logger::info('Invalid result while exchanging token', ['uid' => $uid]);
+			DI::logger()->info('Invalid result while exchanging token', ['uid' => $uid]);
 			return '';
 		}
 		$expires_at = time() + $result->expires_in;
-		Logger::debug('Updated token from OAuth1 to OAuth2', ['uid' => $uid, 'expires_at' => date('c', $expires_at)]);
+		DI::logger()->debug('Updated token from OAuth1 to OAuth2', ['uid' => $uid, 'expires_at' => date('c', $expires_at)]);
 	} else {
 		if (!empty($code)) {
 			$parameters['code']       = $code;
@@ -1447,18 +1446,18 @@ function tumblr_get_token(int $uid, string $code = ''): string
 
 		$curlResult = DI::httpClient()->post('https://api.tumblr.com/v2/oauth2/token', $parameters);
 		if (!$curlResult->isSuccess()) {
-			Logger::info('Error fetching token', ['uid' => $uid, 'code' => $code, 'result' => $curlResult->getBodyString(), 'parameters' => $parameters]);
+			DI::logger()->info('Error fetching token', ['uid' => $uid, 'code' => $code, 'result' => $curlResult->getBodyString(), 'parameters' => $parameters]);
 			return '';
 		}
 
 		$result = json_decode($curlResult->getBodyString());
 		if (empty($result)) {
-			Logger::info('Invalid result when updating token', ['uid' => $uid]);
+			DI::logger()->info('Invalid result when updating token', ['uid' => $uid]);
 			return '';
 		}
 
 		$expires_at = time() + $result->expires_in;
-		Logger::debug('Renewed token', ['uid' => $uid, 'expires_at' => date('c', $expires_at)]);
+		DI::logger()->debug('Renewed token', ['uid' => $uid, 'expires_at' => date('c', $expires_at)]);
 	}
 
 	DI::pConfig()->set($uid, 'tumblr', 'access_token', $result->access_token);
@@ -1502,7 +1501,7 @@ function tumblr_exchange_token(int $uid): stdClass
 		$response = $client->post('oauth2/exchange', ['auth' => 'oauth']);
 		return json_decode($response->getBody()->getContents());
 	} catch (RequestException $exception) {
-		Logger::notice('Exchange failed', ['code' => $exception->getCode(), 'message' => $exception->getMessage()]);
+		DI::logger()->notice('Exchange failed', ['code' => $exception->getCode(), 'message' => $exception->getMessage()]);
 		return new stdClass;
 	}
 }

From a7b26f64538159e72799fae87679d1d10e0b1bb3 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:57:34 +0000
Subject: [PATCH 255/294] Replace call for Logger with DI::logger() in
 tesseract addon

---
 tesseract/tesseract.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tesseract/tesseract.php b/tesseract/tesseract.php
index 4c630dbb..ea048032 100644
--- a/tesseract/tesseract.php
+++ b/tesseract/tesseract.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\System;
 use thiagoalessio\TesseractOCR\TesseractOCR;
 
@@ -17,7 +16,7 @@ function tesseract_install()
 {
 	Hook::register('ocr-detection', __FILE__, 'tesseract_ocr_detection');
 
-	Logger::notice('installed tesseract');
+	DI::logger()->notice('installed tesseract');
 }
 
 function tesseract_ocr_detection(&$media)
@@ -33,6 +32,6 @@ function tesseract_ocr_detection(&$media)
 		$ocr->imageData($media['img_str'], strlen($media['img_str']));
 		$media['description'] = $ocr->run();
 	} catch (\Throwable $th) {
-		Logger::info('Error calling TesseractOCR', ['message' => $th->getMessage()]);
+		DI::logger()->info('Error calling TesseractOCR', ['message' => $th->getMessage()]);
 	}
 }

From e4d14cab62755aa91d986584b4898d75054b3471 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:58:10 +0000
Subject: [PATCH 256/294] Replace call for Logger with DI::logger() in twitter
 addon

---
 tesseract/tesseract.php |  1 +
 twitter/twitter.php     | 31 +++++++++++++++----------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tesseract/tesseract.php b/tesseract/tesseract.php
index ea048032..a07c690c 100644
--- a/tesseract/tesseract.php
+++ b/tesseract/tesseract.php
@@ -8,6 +8,7 @@
 
 use Friendica\Core\Hook;
 use Friendica\Core\System;
+use Friendica\DI;
 use thiagoalessio\TesseractOCR\TesseractOCR;
 
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
diff --git a/twitter/twitter.php b/twitter/twitter.php
index ea4ae356..a9654405 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -38,7 +38,6 @@
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
 use Friendica\DI;
@@ -217,7 +216,7 @@ function twitter_post_hook(array &$b)
 
 	$b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b));
 
-	Logger::notice('twitter post invoked', ['id' => $b['id'], 'guid' => $b['guid']]);
+	DI::logger()->notice('twitter post invoked', ['id' => $b['id'], 'guid' => $b['guid']]);
 
 	DI::pConfig()->load($b['uid'], 'twitter');
 
@@ -227,17 +226,17 @@ function twitter_post_hook(array &$b)
 	$access_secret = DI::pConfig()->get($b['uid'], 'twitter', 'access_secret');
 
 	if (empty($api_key) || empty($api_secret) || empty($access_token) || empty($access_secret)) {
-		Logger::info('Missing keys, secrets or tokens.');
+		DI::logger()->info('Missing keys, secrets or tokens.');
 		return;
 	}
 
 	$msgarr = Plaintext::getPost($b, 280, true, BBCode::TWITTER);
-	Logger::debug('Got plaintext', ['id' => $b['id'], 'message' => $msgarr]);
+	DI::logger()->debug('Got plaintext', ['id' => $b['id'], 'message' => $msgarr]);
 
 	$media_ids = [];
 
 	if (!empty($msgarr['images']) || !empty($msgarr['remote_images'])) {
-		Logger::info('Got images', ['id' => $b['id'], 'images' => $msgarr['images'] ?? []]);
+		DI::logger()->info('Got images', ['id' => $b['id'], 'images' => $msgarr['images'] ?? []]);
 
 		$retrial = Worker::getRetrial();
 		if ($retrial > 4) {
@@ -250,7 +249,7 @@ function twitter_post_hook(array &$b)
 			try {
 				$media_ids[] = twitter_upload_image($b['uid'], $image, $retrial);
 			} catch (RequestException $exception) {
-				Logger::warning('Error while uploading image', ['image' => $image, 'code' => $exception->getCode(), 'message' => $exception->getMessage()]);
+				DI::logger()->warning('Error while uploading image', ['image' => $image, 'code' => $exception->getCode(), 'message' => $exception->getMessage()]);
 				Worker::defer();
 				return;
 			}
@@ -259,13 +258,13 @@ function twitter_post_hook(array &$b)
 
 	$in_reply_to_tweet_id = 0;
 
-	Logger::debug('Post message', ['id' => $b['id'], 'parts' => count($msgarr['parts'])]);
+	DI::logger()->debug('Post message', ['id' => $b['id'], 'parts' => count($msgarr['parts'])]);
 	foreach ($msgarr['parts'] as $key => $part) {
 		try {
 			$id = twitter_post_status($b['uid'], $part, $media_ids, $in_reply_to_tweet_id);
-			Logger::info('twitter_post send', ['part' => $key, 'id' => $b['id'], 'result' => $id]);
+			DI::logger()->info('twitter_post send', ['part' => $key, 'id' => $b['id'], 'result' => $id]);
 		} catch (RequestException $exception) {
-			Logger::warning('Error while posting message', ['part' => $key, 'id' => $b['id'], 'code' => $exception->getCode(), 'message' => $exception->getMessage()]);
+			DI::logger()->warning('Error while posting message', ['part' => $key, 'id' => $b['id'], 'code' => $exception->getCode(), 'message' => $exception->getMessage()]);
 			$status = [
 				'code'    => $exception->getCode(),
 				'reason'  => $exception->getResponse()->getReasonPhrase(),
@@ -319,9 +318,9 @@ function twitter_upload_image(int $uid, array $image, int $retrial)
 	$picturedata = $picture->asString();
 	$new_size    = strlen($picturedata);
 
-	Logger::info('Uploading', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size, 'image' => $image]);
+	DI::logger()->info('Uploading', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size, 'image' => $image]);
 	$media = twitter_post($uid, 'https://upload.twitter.com/1.1/media/upload.json', 'form_params', ['media' => base64_encode($picturedata)]);
-	Logger::info('Uploading done', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size, 'image' => $image]);
+	DI::logger()->info('Uploading done', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size, 'image' => $image]);
 
 	if (isset($media->media_id_string)) {
 		$media_id = $media->media_id_string;
@@ -334,10 +333,10 @@ function twitter_upload_image(int $uid, array $image, int $retrial)
 				]
 			];
 			$ret = twitter_post($uid, 'https://upload.twitter.com/1.1/media/metadata/create.json', 'json', $data);
-			Logger::info('Metadata create', ['uid' => $uid, 'data' => $data, 'return' => $ret]);
+			DI::logger()->info('Metadata create', ['uid' => $uid, 'data' => $data, 'return' => $ret]);
 		}
 	} else {
-		Logger::error('Failed upload', ['uid' => $uid, 'size' => strlen($picturedata), 'image' => $image['url'], 'return' => $media]);
+		DI::logger()->error('Failed upload', ['uid' => $uid, 'size' => strlen($picturedata), 'image' => $image['url'], 'return' => $media]);
 		throw new Exception('Failed upload of ' . $image['url']);
 	}
 
@@ -373,7 +372,7 @@ function twitter_post(int $uid, string $url, string $type, array $data): stdClas
 	DI::pConfig()->set($uid, 'twitter', 'last_status', $status);
 
 	$content = json_decode($body) ?? new stdClass;
-	Logger::debug('Success', ['content' => $content]);
+	DI::logger()->debug('Success', ['content' => $content]);
 	return $content;
 }
 
@@ -402,7 +401,7 @@ function twitter_test_connection(int $uid)
 			'content' => $response->getBody()->getContents()
 		];
 		DI::pConfig()->set(1, 'twitter', 'last_status',  $status);
-		Logger::info('Test successful', ['uid' => $uid]);
+		DI::logger()->info('Test successful', ['uid' => $uid]);
 	} catch (RequestException $exception) {
 		$status = [
 			'code'    => $exception->getCode(),
@@ -410,6 +409,6 @@ function twitter_test_connection(int $uid)
 			'content' => $exception->getMessage()
 		];
 		DI::pConfig()->set(1, 'twitter', 'last_status',  $status);
-		Logger::info('Test failed', ['uid' => $uid]);
+		DI::logger()->info('Test failed', ['uid' => $uid]);
 	}
 }

From dd775645d48b0309e08f604500e2baf85171800f Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 11:58:32 +0000
Subject: [PATCH 257/294] Replace call for Logger with DI::logger() in wppost
 addon

---
 wppost/wppost.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/wppost/wppost.php b/wppost/wppost.php
index f2ee5d21..de216806 100644
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -9,7 +9,6 @@
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -257,13 +256,13 @@ function wppost_send(array &$b)
 
 EOT;
 
-		Logger::debug('wppost: data: ' . $xml);
+		DI::logger()->debug('wppost: data: ' . $xml);
 
 		$x = '';
 
 		if ($wp_blog !== 'test') {
 			$x = DI::httpClient()->post($wp_blog, $xml)->getBodyString();
 		}
-		Logger::info('posted to wordpress: ' . $x);
+		DI::logger()->info('posted to wordpress: ' . $x);
 	}
 }

From 4c8c262b07f61d08a6f9a67c325a54dcb95b4c75 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 24 Jan 2025 12:10:58 +0000
Subject: [PATCH 258/294] fix in googlemaps addon

---
 googlemaps/googlemaps.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/googlemaps/googlemaps.php b/googlemaps/googlemaps.php
index a0bba8ad..94a3a96b 100644
--- a/googlemaps/googlemaps.php
+++ b/googlemaps/googlemaps.php
@@ -8,6 +8,7 @@
  */
 
 use Friendica\Core\Hook;
+use Friendica\DI;
 
 function googlemaps_install()
 {

From cbfcfb33494d1662de1a5f5689caa23d723d6bca Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 25 Jan 2025 02:44:54 +0000
Subject: [PATCH 259/294] Issue 14692: Avoid loop situation

---
 blockbot/blockbot.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php
index 163d0cbc..71e35c93 100644
--- a/blockbot/blockbot.php
+++ b/blockbot/blockbot.php
@@ -208,7 +208,7 @@ function blockbot_log_activitypub(string $url, string $agent)
 		blockbot_save('activitypub-inbox-agents', $agent);
 	}
 
-	if (!empty($_SERVER['HTTP_SIGNATURE']) && !empty(HTTPSignature::getSigner('', $_SERVER))) {
+	if (!empty($_SERVER['HTTP_SIGNATURE']) && !empty(HTTPSignature::getSigner('', $_SERVER, false))) {
 		blockbot_save('activitypub-signature-agents', $agent);
 	}
 }

From 8384b74696b54c126a2b2c835a010403b6413b7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@home.arpa>
Date: Thu, 23 Jan 2025 16:32:22 +0100
Subject: [PATCH 260/294] add condition for selected theme

---
 saml/saml.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/saml/saml.php b/saml/saml.php
index c8824b46..83e4d3fd 100755
--- a/saml/saml.php
+++ b/saml/saml.php
@@ -82,11 +82,13 @@ function saml_footer(string &$body)
 <script>
 var target=$("#settings-nickname-desc");
 if (target.length) { target.append("<p>$fragment</p>"); }
-document.getElementById('id_email').setAttribute('readonly', 'readonly');
 var saml_hint = document.createElement("span");
 var saml_hint_text = document.createTextNode('$samlhint');
 saml_hint.appendChild(saml_hint_text);
-document.getElementById('id_email').parentNode.insertBefore(saml_hint, document.getElementById('id_email').nextSibling);
+if ( document.getElementById('id_email') != null ) {
+	document.getElementById('id_email').setAttribute('readonly', 'readonly');
+	document.getElementById('id_email').parentNode.insertBefore(saml_hint, document.getElementById('id_email').nextSibling);
+}
 // Frio theme
 if ( document.getElementById('password-settings-collapse') != null ) {
 	document.getElementById('password-settings-collapse').replaceChildren(saml_hint.cloneNode(true));

From 16127854dd7f9018162c333bdcc6556a2c1ee3d4 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 28 Jan 2025 20:27:52 +0000
Subject: [PATCH 261/294] Accessibility: Use different id values for options

---
 invidious/invidious.php | 8 ++++----
 markdown/markdown.php   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/invidious/invidious.php b/invidious/invidious.php
index 033ecce5..5fa2eca9 100644
--- a/invidious/invidious.php
+++ b/invidious/invidious.php
@@ -54,8 +54,8 @@ function invidious_settings(array &$data)
 
 	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/invidious/');
 	$html = Renderer::replaceMacros($t, [
-		'$enabled' => ['enabled', DI::l10n()->t('Replace Youtube links with links to an Invidious server'), $enabled, DI::l10n()->t('If enabled, Youtube links are replaced with the links to the specified Invidious server.')],
-		'$server'  => ['server', DI::l10n()->t('Invidious server'), $server, DI::l10n()->t('See %s for a list of available Invidious servers.', '<a href="https://api.invidious.io/">https://api.invidious.io/</a>')],
+		'$enabled' => ['invidious-enabled', DI::l10n()->t('Replace Youtube links with links to an Invidious server'), $enabled, DI::l10n()->t('If enabled, Youtube links are replaced with the links to the specified Invidious server.')],
+		'$server'  => ['invidious-server', DI::l10n()->t('Invidious server'), $server, DI::l10n()->t('See %s for a list of available Invidious servers.', '<a href="https://api.invidious.io/">https://api.invidious.io/</a>')],
 	]);
 
 	$data = [
@@ -71,9 +71,9 @@ function invidious_settings_post(array &$b)
 		return;
 	}
 
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'invidious', 'enabled', (bool)$_POST['enabled']);
+	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'invidious', 'enabled', (bool)$_POST['invidious-enabled']);
 
-	$server = trim($_POST['server'], " \n\r\t\v\x00/");
+	$server = trim($_POST['invidious-server'], " \n\r\t\v\x00/");
 	if ($server != DI::config()->get('invidious', 'server', INVIDIOUS_DEFAULT) && !empty($server)) {
 		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'invidious', 'server', $server);
 	} else {
diff --git a/markdown/markdown.php b/markdown/markdown.php
index 0822ac83..1ef6cd9a 100644
--- a/markdown/markdown.php
+++ b/markdown/markdown.php
@@ -26,7 +26,7 @@ function markdown_addon_settings(array &$data)
 
 	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/markdown/');
 	$html = Renderer::replaceMacros($t, [
-		'$enabled' => ['enabled', DI::l10n()->t('Enable Markdown parsing'), $enabled, DI::l10n()->t('If enabled, adds Markdown support to the Compose Post form.')],
+		'$enabled' => ['markdown-enabled', DI::l10n()->t('Enable Markdown parsing'), $enabled, DI::l10n()->t('If enabled, adds Markdown support to the Compose Post form.')],
 	]);
 
 	$data = [
@@ -42,7 +42,7 @@ function markdown_addon_settings_post(array &$b)
 		return;
 	}
 
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'markdown', 'enabled', intval($_POST['enabled']));
+	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'markdown', 'enabled', intval($_POST['markdown-enabled']));
 }
 
 function markdown_post_local_start(&$request) {

From e6d92cc94a56660207e08095865195da97d403a5 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 5 Feb 2025 15:11:14 +0000
Subject: [PATCH 262/294] Rewrite Monolog factory to implement LoggerFactory

---
 .../{Monolog.php => MonologFactory.php}       | 41 ++++++++++++++-----
 monolog/static/dependencies.config.php        |  7 +---
 monolog/static/strategies.config.php          | 26 ------------
 3 files changed, 33 insertions(+), 41 deletions(-)
 rename monolog/src/Factory/{Monolog.php => MonologFactory.php} (51%)
 delete mode 100644 monolog/static/strategies.config.php

diff --git a/monolog/src/Factory/Monolog.php b/monolog/src/Factory/MonologFactory.php
similarity index 51%
rename from monolog/src/Factory/Monolog.php
rename to monolog/src/Factory/MonologFactory.php
index c5c69824..ede4d5b2 100644
--- a/monolog/src/Factory/Monolog.php
+++ b/monolog/src/Factory/MonologFactory.php
@@ -4,7 +4,8 @@ namespace Friendica\Addon\monolog\src\Factory;
 
 use Friendica\Addon\monolog\src\Monolog\IntrospectionProcessor;
 use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\Logger\Factory\AbstractLoggerTypeFactory;
+use Friendica\Core\Logger\Capability\IHaveCallIntrospections;
+use Friendica\Core\Logger\Factory\LoggerFactory;
 use Monolog\Formatter\LineFormatter;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
@@ -16,32 +17,52 @@ use Psr\Log\LogLevel;
 
 require_once __DIR__ . '/../../vendor/autoload.php';
 
-class Monolog extends AbstractLoggerTypeFactory
+final class MonologFactory implements LoggerFactory
 {
-	public function create(IManageConfigValues $config, string $loglevel = null): LoggerInterface
+	private IHaveCallIntrospections $introspection;
+
+	private IManageConfigValues $config;
+
+	/**
+	 * @param string $channel The channel for the logger
+	 */
+	public function __construct(IHaveCallIntrospections $introspection, IManageConfigValues $config)
+	{
+		$this->introspection = $introspection;
+		$this->config        = $config;
+	}
+
+	/**
+	 * Creates and returns a PSR-3 Logger instance.
+	 *
+	 * Calling this method multiple times with the same parameters SHOULD return the same object.
+	 *
+	 * @param \Psr\Log\LogLevel::* $logLevel The log level
+	 * @param \Friendica\Core\Logger\Capability\LogChannel::* $logChannel The log channel
+	 */
+	public function createLogger(string $logLevel, string $logChannel): LoggerInterface
 	{
 		$loggerTimeZone = new \DateTimeZone('UTC');
 
-		$logger = new Logger($this->channel);
+		$logger = new Logger($logChannel);
 		$logger->setTimezone($loggerTimeZone);
 		$logger->pushProcessor(new PsrLogMessageProcessor());
 		$logger->pushProcessor(new ProcessIdProcessor());
 		$logger->pushProcessor(new UidProcessor());
 		$logger->pushProcessor(new IntrospectionProcessor($this->introspection, LogLevel::DEBUG));
 
-		$logfile = $config->get('system', 'logfile');
+		$logfile = $this->config->get('system', 'logfile');
 
 		// just add a stream in case it's either writable or not file
 		if (is_writable($logfile)) {
-			$loglevel = $loglevel ?? static::mapLegacyConfigDebugLevel($config->get('system', 'loglevel'));
-			$loglevel = Logger::toMonologLevel($loglevel);
+			$logLevel = Logger::toMonologLevel($logLevel);
 
 			// fallback to notice if an invalid loglevel is set
-			if (!is_int($loglevel)) {
-				$loglevel = LogLevel::NOTICE;
+			if (!is_int($logLevel)) {
+				$logLevel = LogLevel::NOTICE;
 			}
 
-			$fileHandler = new StreamHandler($logfile, $loglevel);
+			$fileHandler = new StreamHandler($logfile, $logLevel);
 
 			$formatter = new LineFormatter("%datetime% %channel% [%level_name%]: %message% %context% %extra%\n");
 			$fileHandler->setFormatter($formatter);
diff --git a/monolog/static/dependencies.config.php b/monolog/static/dependencies.config.php
index e3066594..75ea8df7 100644
--- a/monolog/static/dependencies.config.php
+++ b/monolog/static/dependencies.config.php
@@ -20,10 +20,7 @@
  */
 
 return [
-	\Monolog\Logger::class => [
-		'instanceOf' => \Friendica\Addon\monolog\src\Factory\Monolog::class,
-		'call' => [
-			['create', [], \Dice\Dice::CHAIN_CALL],
-		],
+	\Friendica\Core\Logger\Factory\LoggerFactory::class => [
+		'instanceOf' => \Friendica\Addon\monolog\src\Factory\MonologFactory::class,
 	],
 ];
diff --git a/monolog/static/strategies.config.php b/monolog/static/strategies.config.php
deleted file mode 100644
index 87153839..00000000
--- a/monolog/static/strategies.config.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2010-2023, the Friendica project
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-return [
-	\Psr\Log\LoggerInterface::class => [
-		\Monolog\Logger::class => ['monolog'],
-	],
-];

From 0bafcc78f827b4bc1f064a0cc73a3c87700ced63 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 5 Feb 2025 15:20:06 +0000
Subject: [PATCH 263/294] Add READMD.md for monolog addon

---
 monolog/README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 monolog/README.md

diff --git a/monolog/README.md b/monolog/README.md
new file mode 100644
index 00000000..e5a139e9
--- /dev/null
+++ b/monolog/README.md
@@ -0,0 +1,14 @@
+# Monolog Addon
+
+A Logging framework with lots of additions (see [Monolog](https://github.com/Seldaek/monolog/)). There are just Friendica additions inside the src directory.
+
+Set `system.logger_config` to `monolog` in your `config/local.config.php` file to activate Monolog.
+
+```
+// in config/local.config.php
+// ...
+    'system' => [
+        'logger_config' => 'monolog',
+    ]
+// ...
+```

From f7ec934893bda2ac130dd5e6867ed564a074a943 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 5 Feb 2025 15:20:22 +0000
Subject: [PATCH 264/294] bump version to 1.1

---
 monolog/monolog.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/monolog/monolog.php b/monolog/monolog.php
index b13efff9..f194aac4 100644
--- a/monolog/monolog.php
+++ b/monolog/monolog.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * Name: Monolog
- * Description: A Logging framework with lots of additions (see [Monolog](https://github.com/Seldaek/monolog/)). There are just Friendica additions inside the src directory
- * Version: 1.0
+ * Description: A Logging framework with lots of additions, customized for Friendica.
+ * Version: 1.1
  * Author: Philipp Holzer
  */

From c4f8c65817c478e0e682a8a74573deb634642c8b Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 5 Feb 2025 15:32:24 +0000
Subject: [PATCH 265/294] Remove wrong phpdoc

---
 monolog/src/Factory/MonologFactory.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/monolog/src/Factory/MonologFactory.php b/monolog/src/Factory/MonologFactory.php
index ede4d5b2..e0c11e13 100644
--- a/monolog/src/Factory/MonologFactory.php
+++ b/monolog/src/Factory/MonologFactory.php
@@ -23,9 +23,6 @@ final class MonologFactory implements LoggerFactory
 
 	private IManageConfigValues $config;
 
-	/**
-	 * @param string $channel The channel for the logger
-	 */
 	public function __construct(IHaveCallIntrospections $introspection, IManageConfigValues $config)
 	{
 		$this->introspection = $introspection;

From ed75360eb4f573c961dc1e1eca58bed7b2ba37e1 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Thu, 6 Feb 2025 09:27:22 +0000
Subject: [PATCH 266/294] Setting the logger_config config is no longer needed

---
 monolog/README.md | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/monolog/README.md b/monolog/README.md
index e5a139e9..74ade29d 100644
--- a/monolog/README.md
+++ b/monolog/README.md
@@ -3,12 +3,3 @@
 A Logging framework with lots of additions (see [Monolog](https://github.com/Seldaek/monolog/)). There are just Friendica additions inside the src directory.
 
 Set `system.logger_config` to `monolog` in your `config/local.config.php` file to activate Monolog.
-
-```
-// in config/local.config.php
-// ...
-    'system' => [
-        'logger_config' => 'monolog',
-    ]
-// ...
-```

From 5701853d295f08c93cdc5f2b0e807bab85d4cddd Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Thu, 6 Feb 2025 11:35:10 +0000
Subject: [PATCH 267/294] Remove config docs, format syntax

---
 monolog/README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/monolog/README.md b/monolog/README.md
index 74ade29d..efb7959a 100644
--- a/monolog/README.md
+++ b/monolog/README.md
@@ -1,5 +1,4 @@
 # Monolog Addon
 
-A Logging framework with lots of additions (see [Monolog](https://github.com/Seldaek/monolog/)). There are just Friendica additions inside the src directory.
-
-Set `system.logger_config` to `monolog` in your `config/local.config.php` file to activate Monolog.
+A Logging framework with lots of additions (see [Monolog](https://github.com/Seldaek/monolog/)).
+There are just Friendica additions inside the src directory.

From 373c30b5d0fc84dd1cb238bcf9dc2cd381d2c5d6 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 6 Feb 2025 20:50:40 -0500
Subject: [PATCH 268/294] [tumblr] Ward against unexpected response format in
 tumblr_fetch_tags()

- Adress https://github.com/friendica/friendica/issues/14646#issuecomment-2628090487
---
 tumblr/tumblr.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 819c0ca5..f2e2d78d 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -743,6 +743,12 @@ function tumblr_fetch_tags(int $uid, int $last_poll)
 
 	foreach (DI::pConfig()->get($uid, 'tumblr', 'tags') ?? [] as $tag) {
 		$data = tumblr_get($uid, 'tagged', ['tag' => $tag]);
+
+		if (!is_array($data->response)) {
+			DI::logger()->warning('Unexpected Tumblr response format', ['uid' => $uid, 'url' => 'tagged', 'parameters' => ['tag' => $tag], 'data' => $data]);
+			continue;
+		}
+
 		foreach (array_reverse($data->response) as $post) {
 			$id = tumblr_process_post($post, $uid, Item::PR_TAG, $last_poll);
 			if (!empty($id)) {

From 07008af9c15bbe2ed431f97e9429b03642ec8820 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 16 Feb 2025 06:12:49 +0000
Subject: [PATCH 269/294] Bluesky: Avoid duplicated reshares

---
 bluesky/bluesky.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 7f6bb9e7..ba80660c 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1005,6 +1005,10 @@ function bluesky_process_reason(stdClass $reason, string $uri, int $uid)
 		return;
 	}
 
+	if (Post::exists(['uid' => $item['uid'], 'thr-parent' => $item['thr-parent'], 'verb' => $item['verb'], 'contact-id' => $item['contact-id']])) {
+		return;
+	}
+
 	$item['guid']         = Item::guidFromUri($item['uri'], $contact['alias']);
 	$item['owner-name']   = $item['author-name'];
 	$item['owner-link']   = $item['author-link'];

From 859d92ab02ce74718b10853f84522d84f85b35b6 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 16 Feb 2025 05:48:09 +0000
Subject: [PATCH 270/294] Improve accessibility with showmore and rendertime

---
 rendertime/rendertime.php    | 2 +-
 showmore_dyn/showmore_dyn.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php
index 1cce5b1b..4523d911 100644
--- a/rendertime/rendertime.php
+++ b/rendertime/rendertime.php
@@ -59,7 +59,7 @@ function rendertime_page_end(string &$o)
 
 	if (DI::userSession()->isSiteAdmin() && (($_GET['mode'] ?? '') != 'minimal') && !DI::mode()->isMobile() && !DI::mode()->isMobile() && !$ignored) {
 
-		$o = $o . '<div class="renderinfo">' . DI::l10n()->t("Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s",
+		$o = $o . '<div class="renderinfo" aria-hidden="true">' . DI::l10n()->t("Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s",
 				round($profiler->get('database') - $profiler->get('database_write'), 3),
 				round($profiler->get('database_write'), 3),
 				round($profiler->get('network'), 2),
diff --git a/showmore_dyn/showmore_dyn.js b/showmore_dyn/showmore_dyn.js
index 74803d2d..fd07a82f 100644
--- a/showmore_dyn/showmore_dyn.js
+++ b/showmore_dyn/showmore_dyn.js
@@ -59,7 +59,7 @@ function addHeightToggleHandler($item) {
 	$item.data("item-id", itemId);
 	var toggleId = "wall-item-body-toggle-" + itemId;
 
-	$item.append('<div class="wall-item-body-toggle" data-item-id="' + itemId + '" id="' + toggleId + '" ><button type="button" class="wall-item-body-toggle-text">' + showmore_dyn_showmore_linktext + '</button></div>');
+	$item.append('<div class="wall-item-body-toggle" data-item-id="' + itemId + '" id="' + toggleId + '" ><button type="button" class="wall-item-body-toggle-text" aria-hidden="true">' + showmore_dyn_showmore_linktext + '</button></div>');
 	$item.addClass("limitable limit-height");
 
 	var $toggle = $("#" + toggleId);

From ec718ea29412b3482ec4543152b021b75e0f36f4 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 20 Feb 2025 23:03:27 -0500
Subject: [PATCH 271/294] [tumblr] Skip empty tags when saving user-defined
 tags
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Skip empty tags when fetching them
↪ Empty tags were triggering a Tumblr API error
- Address https://github.com/friendica/friendica/issues/14646#issuecomment-2628090487
- Using log output from https://github.com/friendica/friendica/issues/14646#issuecomment-2665000962
---
 tumblr/tumblr.php | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index f2e2d78d..4415e2de 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -391,12 +391,17 @@ function tumblr_settings_post(array &$b)
 		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'tumblr', 'import',          intval($_POST['tumblr_import']));
 
 		$max_tags = DI::config()->get('tumblr', 'max_tags') ?? TUMBLR_DEFAULT_MAXIMUM_TAGS;
-		$tags     = [];
-		foreach (explode(',', $_POST['tags']) as $tag) {
-			if (count($tags) < $max_tags) {
-				$tags[] = trim($tag, ' #');
-			}
-		}
+
+		$tags = array_slice(
+			array_filter(
+				array_map(
+					function($tag) { return trim($tag, ' #');},
+					explode(',', $_POST['tags']) ?: []
+				)
+			),
+			0,
+			$max_tags,
+		);
 
 		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'tumblr', 'tags', $tags);
 	}
@@ -742,6 +747,11 @@ function tumblr_fetch_tags(int $uid, int $last_poll)
 	}
 
 	foreach (DI::pConfig()->get($uid, 'tumblr', 'tags') ?? [] as $tag) {
+		// Tumblr will return an error for queries on empty tag
+		if (!$tag) {
+			continue;
+		}
+
 		$data = tumblr_get($uid, 'tagged', ['tag' => $tag]);
 
 		if (!is_array($data->response)) {

From d488c1907a8047d9eeaa802a24f5573feba76991 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Tue, 25 Feb 2025 15:24:00 +0000
Subject: [PATCH 272/294] Fix PHPStan error in webdav_storage addon

---
 webdav_storage/src/WebDavConfig.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webdav_storage/src/WebDavConfig.php b/webdav_storage/src/WebDavConfig.php
index 2236e97a..320b06a2 100644
--- a/webdav_storage/src/WebDavConfig.php
+++ b/webdav_storage/src/WebDavConfig.php
@@ -52,7 +52,7 @@ class WebDavConfig implements ICanConfigureStorage
 		$this->config = $config;
 		$this->client = $client;
 
-		$this->authOptions = null;
+		$this->authOptions = [];
 
 		if (!empty($this->config->get('webdav', 'username'))) {
 			$this->authOptions = [

From cfe27582eeba1442f8414a4edc731b53057bc092 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 26 Feb 2025 08:47:06 +0000
Subject: [PATCH 273/294] Fix PHPStan error in tumblr addon

---
 tumblr/tumblr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 4415e2de..9e691bf2 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -791,7 +791,7 @@ function tumblr_fetch_dashboard(int $uid, int $last_poll)
 	$dashboard = tumblr_get($uid, 'user/dashboard', $parameters);
 	if ($dashboard->meta->status > 399) {
 		DI::logger()->notice('Error fetching dashboard', ['meta' => $dashboard->meta, 'response' => $dashboard->response, 'errors' => $dashboard->errors]);
-		return [];
+		return;
 	}
 
 	if (empty($dashboard->response->posts)) {

From 512ad63dbff6a9c4c85ff414e0768eda09b71b52 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 26 Feb 2025 14:35:00 +0000
Subject: [PATCH 274/294] Fix PHPStan errors in statusnet addon

---
 statusnet/library/codebirdsn.php     |  2 +-
 statusnet/library/statusnetoauth.php | 16 ++++++-------
 statusnet/library/twitteroauth.php   | 36 ++++++++++++++--------------
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/statusnet/library/codebirdsn.php b/statusnet/library/codebirdsn.php
index 9807d97f..bffca163 100644
--- a/statusnet/library/codebirdsn.php
+++ b/statusnet/library/codebirdsn.php
@@ -976,7 +976,7 @@ class CodebirdSN
      * @param string $method The method that has been called
      * @param string $reply  The actual reply, JSON-encoded or URL-encoded
      *
-     * @return array|object The parsed reply
+     * @return string|array|object The parsed reply
      */
     protected function _parseApiReply($method, $reply)
     {
diff --git a/statusnet/library/statusnetoauth.php b/statusnet/library/statusnetoauth.php
index c32b2b4f..da21be58 100644
--- a/statusnet/library/statusnetoauth.php
+++ b/statusnet/library/statusnetoauth.php
@@ -12,7 +12,7 @@ require_once __DIR__ . DIRECTORY_SEPARATOR . 'twitteroauth.php';
  */
 class StatusNetOAuth extends TwitterOAuth
 {
-	function get_maxlength()
+	public function get_maxlength()
 	{
 		$config = $this->get($this->host . 'statusnet/config.json');
 		if (empty($config)) {
@@ -21,27 +21,27 @@ class StatusNetOAuth extends TwitterOAuth
 		return $config->site->textlimit;
 	}
 
-	function accessTokenURL()
+	public function accessTokenURL()
 	{
 		return $this->host . 'oauth/access_token';
 	}
 
-	function authenticateURL()
+	public function authenticateURL()
 	{
 		return $this->host . 'oauth/authenticate';
 	}
 
-	function authorizeURL()
+	public function authorizeURL()
 	{
 		return $this->host . 'oauth/authorize';
 	}
 
-	function requestTokenURL()
+	public function requestTokenURL()
 	{
 		return $this->host . 'oauth/request_token';
 	}
 
-	function __construct($apipath, $consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL)
+	public function __construct($apipath, $consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL)
 	{
 		parent::__construct($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret);
 		$this->host = $apipath;
@@ -52,9 +52,9 @@ class StatusNetOAuth extends TwitterOAuth
 	 *
 	 * Copied here from the TwitterOAuth library and complemented by applying the proxy settings of Friendica
 	 *
-	 * @return array|object API results
+	 * @return array|object|mixed API results
 	 */
-	function http($url, $method, $postfields = NULL)
+	public function http($url, $method, $postfields = NULL)
 	{
 		$this->http_info = [];
 		$ci = curl_init();
diff --git a/statusnet/library/twitteroauth.php b/statusnet/library/twitteroauth.php
index bf413d23..bab66195 100644
--- a/statusnet/library/twitteroauth.php
+++ b/statusnet/library/twitteroauth.php
@@ -45,11 +45,11 @@ class TwitterOAuth
 	public $http_header;
 	/**
 	 * Contains the last HTTP request info
-	 * @var string
+	 * @var array
 	 */
 	public $http_info;
 
-	/** @var OAuthToken */
+	/** @var OAuthToken|null */
 	private $token;
 	/** @var OAuthConsumer */
 	private $consumer;
@@ -59,27 +59,27 @@ class TwitterOAuth
 	/**
 	 * Set API URLS
 	 */
-	function accessTokenURL()
+	public function accessTokenURL()
 	{
 		return 'https://api.twitter.com/oauth/access_token';
 	}
 
-	function authenticateURL()
+	public function authenticateURL()
 	{
 		return 'https://twitter.com/oauth/authenticate';
 	}
 
-	function authorizeURL()
+	public function authorizeURL()
 	{
 		return 'https://twitter.com/oauth/authorize';
 	}
 
-	function requestTokenURL()
+	public function requestTokenURL()
 	{
 		return 'https://api.twitter.com/oauth/request_token';
 	}
 
-	function __construct($consumer_key, $consumer_secret, $oauth_token = null, $oauth_token_secret = null)
+	public function __construct($consumer_key, $consumer_secret, $oauth_token = null, $oauth_token_secret = null)
 	{
 		$this->sha1_method = new OAuthSignatureMethod_HMAC_SHA1();
 		$this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
@@ -96,7 +96,7 @@ class TwitterOAuth
 	 * @param callable $oauth_callback
 	 * @return array
 	 */
-	function getRequestToken($oauth_callback = null)
+	public function getRequestToken($oauth_callback = null)
 	{
 		$parameters = [];
 		if (!empty($oauth_callback)) {
@@ -114,7 +114,7 @@ class TwitterOAuth
 	 *
 	 * @return string
 	 */
-	function getAuthorizeURL($token, $sign_in_with_twitter = TRUE)
+	public function getAuthorizeURL($token, $sign_in_with_twitter = TRUE)
 	{
 		if (is_array($token)) {
 			$token = $token['oauth_token'];
@@ -137,7 +137,7 @@ class TwitterOAuth
 	 *                "user_id" => "9436992",
 	 *                "screen_name" => "abraham")
 	 */
-	function getAccessToken($oauth_verifier = FALSE)
+	public function getAccessToken($oauth_verifier = FALSE)
 	{
 		$parameters = [];
 		if (!empty($oauth_verifier)) {
@@ -162,7 +162,7 @@ class TwitterOAuth
 	 *                "screen_name" => "abraham",
 	 *                "x_auth_expires" => "0")
 	 */
-	function getXAuthToken($username, $password)
+	public function getXAuthToken($username, $password)
 	{
 		$parameters = [];
 		$parameters['x_auth_username'] = $username;
@@ -182,7 +182,7 @@ class TwitterOAuth
 	 * @param array $parameters
 	 * @return mixed|string
 	 */
-	function get($url, $parameters = [])
+	public function get($url, $parameters = [])
 	{
 		$response = $this->oAuthRequest($url, 'GET', $parameters);
 		if ($this->format === 'json' && $this->decode_json) {
@@ -199,7 +199,7 @@ class TwitterOAuth
 	 * @param array $parameters
 	 * @return mixed|string
 	 */
-	function post($url, $parameters = [])
+	public function post($url, $parameters = [])
 	{
 		$response = $this->oAuthRequest($url, 'POST', $parameters);
 		if ($this->format === 'json' && $this->decode_json) {
@@ -216,7 +216,7 @@ class TwitterOAuth
 	 * @param array $parameters
 	 * @return mixed|string
 	 */
-	function delete($url, $parameters = [])
+	public function delete($url, $parameters = [])
 	{
 		$response = $this->oAuthRequest($url, 'DELETE', $parameters);
 		if ($this->format === 'json' && $this->decode_json) {
@@ -234,7 +234,7 @@ class TwitterOAuth
 	 * @param array $parameters
 	 * @return mixed|string
 	 */
-	function oAuthRequest($url, $method, $parameters)
+	public function oAuthRequest($url, $method, $parameters)
 	{
 		if (strrpos($url, 'https://') !== 0 && strrpos($url, 'http://') !== 0) {
 			$url = "{$this->host}{$url}.{$this->format}";
@@ -258,9 +258,9 @@ class TwitterOAuth
 	 * @param string $url
 	 * @param string $method
 	 * @param mixed  $postfields
-	 * @return string API results
+	 * @return string|bool|mixed API results
 	 */
-	function http($url, $method, $postfields = null)
+	public function http($url, $method, $postfields = null)
 	{
 		$this->http_info = [];
 		$ci = curl_init();
@@ -305,7 +305,7 @@ class TwitterOAuth
 	 * @param string $header
 	 * @return int
 	 */
-	function getHeader($ch, $header)
+	public function getHeader($ch, $header)
 	{
 		$i = strpos($header, ':');
 		if (!empty($i)) {

From bbce8c345f6e25f979f81b4939f0a647ce3245fb Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 26 Feb 2025 15:12:25 +0000
Subject: [PATCH 275/294] Fix PHPStan errors in phpnut addon

---
 pnut/lib/phpnut.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pnut/lib/phpnut.php b/pnut/lib/phpnut.php
index ff765243..716945ed 100644
--- a/pnut/lib/phpnut.php
+++ b/pnut/lib/phpnut.php
@@ -1025,7 +1025,7 @@ class phpnut
      * see: https://docs.pnut.io/resources/posts/search
      * @param string $query The search query. Supports
      * normal search terms. Searches post text.
-     * @return array An array of associative arrays, each representing one post.
+     * @return string|array|false An array of associative arrays, each representing one post.
      * or false on error
      */
     public function searchPosts(array $params=[], string $query='', string $order='default')
@@ -1769,7 +1769,7 @@ class phpnut
      * see: https://docs.pnut.io/resources/messages/search
      * @param string $query The search query. Supports
      * normal search terms. Searches common channel raw.
-     * @return array An array of associative arrays, each representing one channel.
+     * @return string|array|false An array of associative arrays, each representing one channel.
      * or false on error
      */
     public function searchMessages(array $params=[], string $query='', string $order='default')

From 21a7529a0ef570c68bb15d97adcbc82ba57d0b7b Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 26 Feb 2025 15:21:19 +0000
Subject: [PATCH 276/294] fix PHPStan error in phpmailer addon

---
 phpmailer/phpmailer.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/phpmailer/phpmailer.php b/phpmailer/phpmailer.php
index f4bb7753..10287a04 100644
--- a/phpmailer/phpmailer.php
+++ b/phpmailer/phpmailer.php
@@ -28,10 +28,14 @@ function phpmailer_load_config(ConfigFileManager $loader)
 }
 
 /**
- * @param IEmail $email
+ * @param null|IEmail $email
  */
-function phpmailer_emailer_send_prepare(IEmail &$email)
+function phpmailer_emailer_send_prepare(?IEmail &$email)
 {
+	if ($email === null) {
+		return;
+	}
+
 	// Passing `true` enables exceptions
 	$mailer = new PHPMailer(true);
 	try {

From dda6710b1064559621ac3f4f720fe8b7ef6533f9 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Thu, 13 Mar 2025 09:36:34 +0000
Subject: [PATCH 277/294] Fix error in notifyall addon

---
 notifyall/notifyall.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index d37bac56..387fa1ab 100644
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -50,7 +50,7 @@ function notifyall_post()
 
 	$recipients = DBA::p("SELECT DISTINCT `email` FROM `user`" . DBA::buildCondition($condition), $condition);
 
-	if (! $recipients) {
+	if (! $recipients || !is_iterable($recipients)) {
 		DI::sysmsg()->addNotice(DI::l10n()->t('No recipients found.'));
 		return;
 	}

From 417a3a81989fb07ea89209e4a7c4caf47afcd192 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Thu, 13 Mar 2025 09:49:18 +0000
Subject: [PATCH 278/294] Fix error in membersince addon

---
 membersince/membersince.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/membersince/membersince.php b/membersince/membersince.php
index 448b8cf2..df6388c6 100644
--- a/membersince/membersince.php
+++ b/membersince/membersince.php
@@ -17,7 +17,11 @@ function membersince_install()
 	Hook::register('profile_advanced', 'addon/membersince/membersince.php', 'membersince_display');
 }
 
-function membersince_display(array &$b)
+/**
+ * @param array|string|null $b
+ * @return void
+ */
+function membersince_display(&$b)
 {
 	$uid = DI::userSession()->getLocalUserId();
 
@@ -59,7 +63,7 @@ function membersince_display(array &$b)
 		$div->appendChild($entry);
 		$elm->parentNode->insertBefore($div, $elm->nextSibling);
 
-		$b = $doc->saveHTML();
+		$b = (string) $doc->saveHTML();
 	} else {
 		// Works in Vier.
 		$b = preg_replace('/<\/dl>/', "</dl>\n\n\n<dl id=\"aprofile-membersince\" class=\"aprofile\">\n<dt>" . DI::l10n()->t('Member since:') . "</dt>\n<dd>" . DateTimeFormat::local($user['register_date']) . "</dd>\n</dl>", $b, 1);

From c56ec7c7c4c2545fcb463719d92630ea653bde61 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Thu, 13 Mar 2025 10:29:47 +0000
Subject: [PATCH 279/294] Fix error in mailstream addon

---
 mailstream/mailstream.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 5228b168..98654831 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -179,7 +179,7 @@ function mailstream_post_hook(array &$item)
 function mailstream_do_images(array &$item, array &$attachments)
 {
 	if (!DI::pConfig()->get($item['uid'], 'mailstream', 'attachimg')) {
-		return;
+		return $attachments;
 	}
 
 	$attachments = [];

From 2667b4d78ede7dbcc4068acc43ad80209fbb2440 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Thu, 13 Mar 2025 11:38:18 +0000
Subject: [PATCH 280/294] Fix error in libravatar addon

---
 libravatar/Services/Libravatar.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libravatar/Services/Libravatar.php b/libravatar/Services/Libravatar.php
index e51ef070..a5bd0793 100644
--- a/libravatar/Services/Libravatar.php
+++ b/libravatar/Services/Libravatar.php
@@ -361,19 +361,19 @@ class Services_Libravatar
     protected function domainGet($identifier)
     {
         if ($identifier === null) {
-            return null;
+            return '';
         }
 
         // What are we, email or openid? Split ourself up and get the
         // important bit out.
         if (filter_var($identifier, FILTER_VALIDATE_EMAIL)) {
             $email = explode('@', $identifier);
-            return $email[1];
+            return (string) $email[1];
         }
 
         //OpenID
         $url    = parse_url($identifier);
-        $domain = $url['host'];
+        $domain = (string) $url['host'];
         if (isset($url['port']) && $url['scheme'] === 'http'
             && $url['port'] != 80
             || isset($url['port']) && $url['scheme'] === 'https'

From ad316852376f82c6d5998b4f6dc8edbd86495e2a Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Thu, 13 Mar 2025 11:51:53 +0000
Subject: [PATCH 281/294] Fix error in js_upload addon

---
 js_upload/js_upload.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index c0a2467d..4bf91de1 100644
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -188,7 +188,7 @@ class js_upload_qqFileUploader
 	private $sizeLimit;
 
 	/**
-	 * @var js_upload_qqUploadedFileXhr|js_upload_qqUploadedFileForm
+	 * @var js_upload_qqUploadedFileXhr|js_upload_qqUploadedFileForm|false
 	 */
 	private $file;
 

From cdeaa433a133d88569987a9e0c7cd57863198bcd Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Thu, 13 Mar 2025 11:55:34 +0000
Subject: [PATCH 282/294] Fix error in diaspora addon

---
 diaspora/Diaspora_Connection.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/diaspora/Diaspora_Connection.php b/diaspora/Diaspora_Connection.php
index d8390d70..05c21eb0 100644
--- a/diaspora/Diaspora_Connection.php
+++ b/diaspora/Diaspora_Connection.php
@@ -33,7 +33,6 @@ class Diaspora_Connection {
 		}
 
 		$this->cookiejar = tempnam(System::getTempPath(), 'cookies');
-		return $this;
 	}
 
 	public function __destruct() {

From dd58b000d9728dc16976011c8bd8a044449a573e Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Thu, 13 Mar 2025 11:57:28 +0000
Subject: [PATCH 283/294] Fix error in bluesky addon

---
 bluesky/bluesky.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index ba80660c..500f1846 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -961,13 +961,13 @@ function bluesky_complete_post(stdClass $post, int $uid, int $post_reason, int $
 	if (!empty($existing_uri)) {
 		$comments = Post::countPosts(['thr-parent' => $existing_uri, 'gravity' => Item::GRAVITY_COMMENT]);
 		if (($post->replyCount <= $comments) || !$complete) {
-			return DI::atpProcessor()->fetchUriId($existing_uri, $uid);
+			return (int) DI::atpProcessor()->fetchUriId($existing_uri, $uid);
 		}
 	}
 
 	if ($complete) {
 		$uri = DI::atpProcessor()->fetchMissingPost(DI::atpProcessor()->getUri($post), $uid, $post_reason, $causer, 0, '', true, $protocol);
-		$uri_id = DI::atpProcessor()->fetchUriId($uri, $uid);
+		$uri_id = (int) DI::atpProcessor()->fetchUriId($uri, $uid);
 	} else {
 		$uri_id = DI::atpProcessor()->processPost($post, $uid, $post_reason, $causer, 0, $protocol);
 	}

From db875bc755449ec71571a35cb62942b282cae0b9 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 14 Mar 2025 07:49:20 +0000
Subject: [PATCH 284/294] Remove type casting to int

---
 bluesky/bluesky.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 500f1846..ba80660c 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -961,13 +961,13 @@ function bluesky_complete_post(stdClass $post, int $uid, int $post_reason, int $
 	if (!empty($existing_uri)) {
 		$comments = Post::countPosts(['thr-parent' => $existing_uri, 'gravity' => Item::GRAVITY_COMMENT]);
 		if (($post->replyCount <= $comments) || !$complete) {
-			return (int) DI::atpProcessor()->fetchUriId($existing_uri, $uid);
+			return DI::atpProcessor()->fetchUriId($existing_uri, $uid);
 		}
 	}
 
 	if ($complete) {
 		$uri = DI::atpProcessor()->fetchMissingPost(DI::atpProcessor()->getUri($post), $uid, $post_reason, $causer, 0, '', true, $protocol);
-		$uri_id = (int) DI::atpProcessor()->fetchUriId($uri, $uid);
+		$uri_id = DI::atpProcessor()->fetchUriId($uri, $uid);
 	} else {
 		$uri_id = DI::atpProcessor()->processPost($post, $uid, $post_reason, $causer, 0, $protocol);
 	}

From 38a8e9a16950584b14c0c5b4e1945c31cbd2e0df Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 14 Mar 2025 08:15:02 +0000
Subject: [PATCH 285/294] remove obvious type cast

---
 libravatar/Services/Libravatar.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libravatar/Services/Libravatar.php b/libravatar/Services/Libravatar.php
index a5bd0793..8b3dd493 100644
--- a/libravatar/Services/Libravatar.php
+++ b/libravatar/Services/Libravatar.php
@@ -368,12 +368,12 @@ class Services_Libravatar
         // important bit out.
         if (filter_var($identifier, FILTER_VALIDATE_EMAIL)) {
             $email = explode('@', $identifier);
-            return (string) $email[1];
+            return $email[1];
         }
 
         //OpenID
         $url    = parse_url($identifier);
-        $domain = (string) $url['host'];
+        $domain = $url['host'];
         if (isset($url['port']) && $url['scheme'] === 'http'
             && $url['port'] != 80
             || isset($url['port']) && $url['scheme'] === 'https'

From 06b4f164f5bb26162fa948797b4cc79e09e27fe1 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Fri, 14 Mar 2025 08:21:08 +0000
Subject: [PATCH 286/294] cast db stmt object to array

---
 notifyall/notifyall.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index 387fa1ab..f814c4f5 100644
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -50,14 +50,14 @@ function notifyall_post()
 
 	$recipients = DBA::p("SELECT DISTINCT `email` FROM `user`" . DBA::buildCondition($condition), $condition);
 
-	if (! $recipients || !is_iterable($recipients)) {
+	if (! $recipients) {
 		DI::sysmsg()->addNotice(DI::l10n()->t('No recipients found.'));
 		return;
 	}
 
 	$notifyEmail = new NotifyAllEmail(DI::l10n(), DI::config(), DI::baseUrl(), $text);
 
-	foreach ($recipients as $recipient) {
+	foreach (DBA::toArray($recipients) as $recipient) {
 		DI::emailer()->send($notifyEmail->withRecipient($recipient['email']));
 	}
 

From 97a3b5815ba0da99469dd77f36021cea73b61a00 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Fri, 14 Mar 2025 23:53:09 +0100
Subject: [PATCH 287/294] [CI] Bump PHP versions in woodpecker

---
 .woodpecker/.continuous-deployment.yml | 2 +-
 .woodpecker/.phpunit.yml               | 8 +++++---
 .woodpecker/.releaser.yml              | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.woodpecker/.continuous-deployment.yml b/.woodpecker/.continuous-deployment.yml
index 6b41deae..d6d8a22a 100644
--- a/.woodpecker/.continuous-deployment.yml
+++ b/.woodpecker/.continuous-deployment.yml
@@ -48,7 +48,7 @@ steps:
       branch: [ develop, '*-rc' ]
       event: push
   composer_install:
-    image: friendicaci/php8.2:php8.2.16
+    image: friendicaci/php8.2:php8.2.28
     commands:
       - export COMPOSER_HOME=.composer
       - composer validate
diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml
index 8b840f80..b0745ad0 100644
--- a/.woodpecker/.phpunit.yml
+++ b/.woodpecker/.phpunit.yml
@@ -5,11 +5,13 @@ matrix:
     - PHP_MAJOR_VERSION: 8.0
       PHP_VERSION: 8.0.30
     - PHP_MAJOR_VERSION: 8.1
-      PHP_VERSION: 8.1.27
+      PHP_VERSION: 8.1.31
     - PHP_MAJOR_VERSION: 8.2
-      PHP_VERSION: 8.2.16
+      PHP_VERSION: 8.2.28
     - PHP_MAJOR_VERSION: 8.3
-      PHP_VERSION: 8.3.3
+      PHP_VERSION: 8.3.17
+    - PHP_MAJOR_VERSION: 8.4
+      PHP_VERSION: 8.4.5
 
 # This forces PHP Unit executions at the "opensocial" labeled location (because of much more power...)
 labels:
diff --git a/.woodpecker/.releaser.yml b/.woodpecker/.releaser.yml
index 2d880a6b..7407f2bc 100644
--- a/.woodpecker/.releaser.yml
+++ b/.woodpecker/.releaser.yml
@@ -45,7 +45,7 @@ steps:
       repo: friendica/friendica-addons
       event: tag
   composer_install:
-    image: friendicaci/php8.2:php8.2.16
+    image: friendicaci/php8.2:php8.2.28
     commands:
       - export COMPOSER_HOME=.composer
       - composer validate

From 48ff761bdb142bce070594c635f91fc47796374a Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Mon, 28 Apr 2025 13:01:41 +0000
Subject: [PATCH 288/294] Replace Addon class with AddonHelper

---
 libravatar/libravatar.php | 5 +++--
 pumpio/pumpio.php         | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index 6cb35331..6f47bf51 100644
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -6,7 +6,6 @@
  * Author: Klaus Weidenbach <http://friendica.dszdw.net/profile/klaus>
  */
 
-use Friendica\Core\Addon;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
@@ -71,7 +70,9 @@ function libravatar_addon_admin(string &$o)
 		'pagan' => DI::l10n()->t('retro adventure game character'),
 	];
 
-	if (Addon::isEnabled('gravatar')) {
+	$addonHelper = DI::addonHelper();
+
+	if ($addonHelper->isAddonEnabled('gravatar')) {
 		$o = '<h5>' .DI::l10n()->t('Information') .'</h5><p>' .DI::l10n()->t('Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.') .'</p><br><br>';
 	}
 
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index c3445b48..2d6937e8 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -8,7 +8,6 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Addon;
 use Friendica\Core\Hook;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
@@ -627,7 +626,9 @@ function pumpio_action(int $uid, string $uri, string $action, string $content =
 
 function pumpio_sync()
 {
-	if (!Addon::isEnabled('pumpio')) {
+	$addonHelper = DI::addonHelper();
+
+	if (!$addonHelper->isAddonEnabled('pumpio')) {
 		return;
 	}
 

From cd4f102d02695dbe6be885a301e1d3b1852f0523 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 17 Apr 2025 21:29:42 +0000
Subject: [PATCH 289/294] Bluesky: Support for mentions

---
 bluesky/bluesky.php | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index ba80660c..ce6ddaf2 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -672,6 +672,8 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
 		}
 	}
 
+	$item['body'] = bluesky_set_mentions($item['body']);
+
 	$urls = bluesky_get_urls($item['body']);
 	$item['body'] = $urls['body'];
 
@@ -733,14 +735,41 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
 	}
 }
 
-function bluesky_get_urls(string $body): array
+function bluesky_set_mentions(string $body): string
 {
-	// Remove all hashtag and mention links
+	// Remove all url based mention links
 	$body = preg_replace("/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", '$1$3', $body);
 
+	if (!preg_match_all("/[@!]\[url\=(did:.*?)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER)) {
+		return $body;
+	}
+
+	foreach ($matches as $match) {
+		$contact = Contact::selectFirst(['addr'], ['nurl' => $match[1]]);
+		if (!empty($contact['addr'])) {
+			$body = str_replace($match[0], '@[url=' . $match[1] . ']' . $contact['addr'] . '[/url]', $body);
+		} else {
+			$body = str_replace($match[0], '@' . $match[2], $body);
+		}
+	}
+
+	return $body;
+}
+
+function bluesky_get_urls(string $body): array
+{
 	$body = BBCode::expandVideoLinks($body);
 	$urls = [];
 
+	// Search for Mentions
+	if (preg_match_all("/[@!]\[url\=(did:.*?)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER)) {
+		foreach ($matches as $match) {
+			$text = '@' . $match[2];
+			$urls[strpos($body, $match[0])] = ['mention' => $match[1], 'text' => $text, 'hash' => $text];
+			$body = str_replace($match[0], $text, $body);
+		}
+	}
+
 	// Search for hash tags
 	if (preg_match_all("/#\[url\=(https?:.*?)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER)) {
 		foreach ($matches as $match) {
@@ -825,6 +854,9 @@ function bluesky_get_facets(string $body, array $urls): array
 		} elseif (!empty($url['url'])) {
 			$feature->uri = $url['url'];
 			$feature->$type = 'app.bsky.richtext.facet#link';
+		} elseif (!empty($url['mention'])) {
+			$feature->did = $url['mention'];
+			$feature->$type = 'app.bsky.richtext.facet#mention';
 		} else {
 			continue;
 		}

From 2289fdc97ec74ffba2027c6f619065f86100190b Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 13 Apr 2025 06:12:02 +0000
Subject: [PATCH 290/294] Issue 14667: Pinned Bluesky feeds are fetched again

---
 bluesky/bluesky.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index ce6ddaf2..aef7156c 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -1174,8 +1174,14 @@ function bluesky_get_feeds(int $uid): array
 		return [];
 	}
 	foreach ($preferences->preferences as $preference) {
-		if ($preference->$type == 'app.bsky.actor.defs#savedFeedsPref') {
-			return $preference->pinned ?? [];
+		if ($preference->$type == 'app.bsky.actor.defs#savedFeedsPrefV2') {
+			$pinned = [];
+			foreach ($preference->items as $item) {
+				if (($item->type == 'feed') && $item->pinned) {
+					$pinned[] = $item->value;
+				}
+			}
+			return $pinned;
 		}
 	}
 	return [];

From 8a8639b07e0f93b9c5cd8d068bb70009cb0f7af7 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Thu, 5 Jun 2025 07:56:53 +0000
Subject: [PATCH 291/294] reset Dice calls for LoggerFactory

---
 monolog/static/dependencies.config.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/monolog/static/dependencies.config.php b/monolog/static/dependencies.config.php
index 75ea8df7..f992d69c 100644
--- a/monolog/static/dependencies.config.php
+++ b/monolog/static/dependencies.config.php
@@ -22,5 +22,6 @@
 return [
 	\Friendica\Core\Logger\Factory\LoggerFactory::class => [
 		'instanceOf' => \Friendica\Addon\monolog\src\Factory\MonologFactory::class,
+		'call' => null,
 	],
 ];

From 9387db358c0edb750ba8cecd1f4624033cc6403d Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 10 Jul 2025 06:30:21 +0200
Subject: [PATCH 292/294] update PHPMailer

---
 phpmailer/composer.lock                       |  20 +-
 phpmailer/vendor/autoload.php                 |  18 +
 phpmailer/vendor/composer/ClassLoader.php     | 202 ++++++++--
 .../vendor/composer/InstalledVersions.php     | 359 ++++++++++++++++++
 .../vendor/composer/autoload_classmap.php     |   3 +-
 .../vendor/composer/autoload_namespaces.php   |   2 +-
 phpmailer/vendor/composer/autoload_psr4.php   |   2 +-
 phpmailer/vendor/composer/autoload_real.php   |  27 +-
 phpmailer/vendor/composer/autoload_static.php |   1 +
 phpmailer/vendor/composer/installed.json      | 169 +++++----
 phpmailer/vendor/composer/installed.php       |  32 ++
 phpmailer/vendor/composer/platform_check.php  |  26 ++
 .../vendor/phpmailer/phpmailer/.editorconfig  |  15 -
 .../vendor/phpmailer/phpmailer/README.md      |  27 +-
 .../vendor/phpmailer/phpmailer/SECURITY.md    |   4 +-
 .../vendor/phpmailer/phpmailer/SMTPUTF8.md    |  48 +++
 phpmailer/vendor/phpmailer/phpmailer/VERSION  |   2 +-
 .../vendor/phpmailer/phpmailer/composer.json  |   3 +-
 .../phpmailer/phpmailer/get_oauth_token.php   |   6 +-
 .../phpmailer/language/phpmailer.lang-es.php  |  15 +-
 .../phpmailer/language/phpmailer.lang-fr.php  |   3 +-
 .../phpmailer/language/phpmailer.lang-ja.php  |  14 +-
 .../phpmailer/language/phpmailer.lang-ku.php  |  27 ++
 .../phpmailer/language/phpmailer.lang-pt.php  |  41 +-
 .../phpmailer/language/phpmailer.lang-ru.php  |  22 +-
 .../phpmailer/language/phpmailer.lang-tr.php  |   9 +-
 .../phpmailer/language/phpmailer.lang-ur.php  |  30 ++
 .../phpmailer/src/DSNConfigurator.php         |   2 +-
 .../phpmailer/phpmailer/src/Exception.php     |   2 +-
 .../vendor/phpmailer/phpmailer/src/OAuth.php  |   4 +-
 .../phpmailer/src/OAuthTokenProvider.php      |   2 +-
 .../phpmailer/phpmailer/src/PHPMailer.php     | 206 +++++++---
 .../vendor/phpmailer/phpmailer/src/POP3.php   |   8 +-
 .../vendor/phpmailer/phpmailer/src/SMTP.php   |  96 +++--
 34 files changed, 1151 insertions(+), 296 deletions(-)
 create mode 100644 phpmailer/vendor/composer/InstalledVersions.php
 create mode 100644 phpmailer/vendor/composer/installed.php
 create mode 100644 phpmailer/vendor/composer/platform_check.php
 delete mode 100644 phpmailer/vendor/phpmailer/phpmailer/.editorconfig
 create mode 100644 phpmailer/vendor/phpmailer/phpmailer/SMTPUTF8.md
 create mode 100644 phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ku.php
 create mode 100644 phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ur.php

diff --git a/phpmailer/composer.lock b/phpmailer/composer.lock
index b2144482..7cd1afd5 100644
--- a/phpmailer/composer.lock
+++ b/phpmailer/composer.lock
@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "phpmailer/phpmailer",
-            "version": "v6.9.1",
+            "version": "v6.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPMailer/PHPMailer.git",
-                "reference": "039de174cd9c17a8389754d3b877a2ed22743e18"
+                "reference": "bf74d75a1fde6beaa34a0ddae2ec5fce0f72a144"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/039de174cd9c17a8389754d3b877a2ed22743e18",
-                "reference": "039de174cd9c17a8389754d3b877a2ed22743e18",
+                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/bf74d75a1fde6beaa34a0ddae2ec5fce0f72a144",
+                "reference": "bf74d75a1fde6beaa34a0ddae2ec5fce0f72a144",
                 "shasum": ""
             },
             "require": {
@@ -75,24 +75,28 @@
                 }
             ],
             "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
+            "support": {
+                "issues": "https://github.com/PHPMailer/PHPMailer/issues",
+                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.10.0"
+            },
             "funding": [
                 {
                     "url": "https://github.com/Synchro",
                     "type": "github"
                 }
             ],
-            "time": "2023-11-25T22:23:28+00:00"
+            "time": "2025-04-24T15:19:31+00:00"
         }
     ],
     "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
         "php": ">=7.0"
     },
-    "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "platform-dev": {},
+    "plugin-api-version": "2.6.0"
 }
diff --git a/phpmailer/vendor/autoload.php b/phpmailer/vendor/autoload.php
index 60925835..1d45b283 100644
--- a/phpmailer/vendor/autoload.php
+++ b/phpmailer/vendor/autoload.php
@@ -2,6 +2,24 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, $err);
+        } elseif (!headers_sent()) {
+            echo $err;
+        }
+    }
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitPhpMailerAddon::getLoader();
diff --git a/phpmailer/vendor/composer/ClassLoader.php b/phpmailer/vendor/composer/ClassLoader.php
index 03b9bb9c..7824d8f7 100644
--- a/phpmailer/vendor/composer/ClassLoader.php
+++ b/phpmailer/vendor/composer/ClassLoader.php
@@ -37,26 +37,81 @@ namespace Composer\Autoload;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    http://www.php-fig.org/psr/psr-0/
- * @see    http://www.php-fig.org/psr/psr-4/
+ * @see    https://www.php-fig.org/psr/psr-0/
+ * @see    https://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {
+    /** @var \Closure(string):void */
+    private static $includeFile;
+
+    /** @var string|null */
+    private $vendorDir;
+
     // PSR-4
+    /**
+     * @var array<string, array<string, int>>
+     */
     private $prefixLengthsPsr4 = array();
+    /**
+     * @var array<string, list<string>>
+     */
     private $prefixDirsPsr4 = array();
+    /**
+     * @var list<string>
+     */
     private $fallbackDirsPsr4 = array();
 
     // PSR-0
+    /**
+     * List of PSR-0 prefixes
+     *
+     * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2')))
+     *
+     * @var array<string, array<string, list<string>>>
+     */
     private $prefixesPsr0 = array();
+    /**
+     * @var list<string>
+     */
     private $fallbackDirsPsr0 = array();
 
+    /** @var bool */
     private $useIncludePath = false;
+
+    /**
+     * @var array<string, string>
+     */
     private $classMap = array();
+
+    /** @var bool */
     private $classMapAuthoritative = false;
+
+    /**
+     * @var array<string, bool>
+     */
     private $missingClasses = array();
+
+    /** @var string|null */
     private $apcuPrefix;
 
+    /**
+     * @var array<string, self>
+     */
+    private static $registeredLoaders = array();
+
+    /**
+     * @param string|null $vendorDir
+     */
+    public function __construct($vendorDir = null)
+    {
+        $this->vendorDir = $vendorDir;
+        self::initializeIncludeClosure();
+    }
+
+    /**
+     * @return array<string, list<string>>
+     */
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
@@ -66,28 +121,42 @@ class ClassLoader
         return array();
     }
 
+    /**
+     * @return array<string, list<string>>
+     */
     public function getPrefixesPsr4()
     {
         return $this->prefixDirsPsr4;
     }
 
+    /**
+     * @return list<string>
+     */
     public function getFallbackDirs()
     {
         return $this->fallbackDirsPsr0;
     }
 
+    /**
+     * @return list<string>
+     */
     public function getFallbackDirsPsr4()
     {
         return $this->fallbackDirsPsr4;
     }
 
+    /**
+     * @return array<string, string> Array of classname => path
+     */
     public function getClassMap()
     {
         return $this->classMap;
     }
 
     /**
-     * @param array $classMap Class to filename map
+     * @param array<string, string> $classMap Class to filename map
+     *
+     * @return void
      */
     public function addClassMap(array $classMap)
     {
@@ -102,22 +171,25 @@ class ClassLoader
      * Registers a set of PSR-0 directories for a given prefix, either
      * appending or prepending to the ones previously set for this prefix.
      *
-     * @param string       $prefix  The prefix
-     * @param array|string $paths   The PSR-0 root directories
-     * @param bool         $prepend Whether to prepend the directories
+     * @param string              $prefix  The prefix
+     * @param list<string>|string $paths   The PSR-0 root directories
+     * @param bool                $prepend Whether to prepend the directories
+     *
+     * @return void
      */
     public function add($prefix, $paths, $prepend = false)
     {
+        $paths = (array) $paths;
         if (!$prefix) {
             if ($prepend) {
                 $this->fallbackDirsPsr0 = array_merge(
-                    (array) $paths,
+                    $paths,
                     $this->fallbackDirsPsr0
                 );
             } else {
                 $this->fallbackDirsPsr0 = array_merge(
                     $this->fallbackDirsPsr0,
-                    (array) $paths
+                    $paths
                 );
             }
 
@@ -126,19 +198,19 @@ class ClassLoader
 
         $first = $prefix[0];
         if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+            $this->prefixesPsr0[$first][$prefix] = $paths;
 
             return;
         }
         if ($prepend) {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
-                (array) $paths,
+                $paths,
                 $this->prefixesPsr0[$first][$prefix]
             );
         } else {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
                 $this->prefixesPsr0[$first][$prefix],
-                (array) $paths
+                $paths
             );
         }
     }
@@ -147,25 +219,28 @@ class ClassLoader
      * Registers a set of PSR-4 directories for a given namespace, either
      * appending or prepending to the ones previously set for this namespace.
      *
-     * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-4 base directories
-     * @param bool         $prepend Whether to prepend the directories
+     * @param string              $prefix  The prefix/namespace, with trailing '\\'
+     * @param list<string>|string $paths   The PSR-4 base directories
+     * @param bool                $prepend Whether to prepend the directories
      *
      * @throws \InvalidArgumentException
+     *
+     * @return void
      */
     public function addPsr4($prefix, $paths, $prepend = false)
     {
+        $paths = (array) $paths;
         if (!$prefix) {
             // Register directories for the root namespace.
             if ($prepend) {
                 $this->fallbackDirsPsr4 = array_merge(
-                    (array) $paths,
+                    $paths,
                     $this->fallbackDirsPsr4
                 );
             } else {
                 $this->fallbackDirsPsr4 = array_merge(
                     $this->fallbackDirsPsr4,
-                    (array) $paths
+                    $paths
                 );
             }
         } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
@@ -175,18 +250,18 @@ class ClassLoader
                 throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
             }
             $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+            $this->prefixDirsPsr4[$prefix] = $paths;
         } elseif ($prepend) {
             // Prepend directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
-                (array) $paths,
+                $paths,
                 $this->prefixDirsPsr4[$prefix]
             );
         } else {
             // Append directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
                 $this->prefixDirsPsr4[$prefix],
-                (array) $paths
+                $paths
             );
         }
     }
@@ -195,8 +270,10 @@ class ClassLoader
      * Registers a set of PSR-0 directories for a given prefix,
      * replacing any others previously set for this prefix.
      *
-     * @param string       $prefix The prefix
-     * @param array|string $paths  The PSR-0 base directories
+     * @param string              $prefix The prefix
+     * @param list<string>|string $paths  The PSR-0 base directories
+     *
+     * @return void
      */
     public function set($prefix, $paths)
     {
@@ -211,10 +288,12 @@ class ClassLoader
      * Registers a set of PSR-4 directories for a given namespace,
      * replacing any others previously set for this namespace.
      *
-     * @param string       $prefix The prefix/namespace, with trailing '\\'
-     * @param array|string $paths  The PSR-4 base directories
+     * @param string              $prefix The prefix/namespace, with trailing '\\'
+     * @param list<string>|string $paths  The PSR-4 base directories
      *
      * @throws \InvalidArgumentException
+     *
+     * @return void
      */
     public function setPsr4($prefix, $paths)
     {
@@ -234,6 +313,8 @@ class ClassLoader
      * Turns on searching the include path for class files.
      *
      * @param bool $useIncludePath
+     *
+     * @return void
      */
     public function setUseIncludePath($useIncludePath)
     {
@@ -256,6 +337,8 @@ class ClassLoader
      * that have not been registered with the class map.
      *
      * @param bool $classMapAuthoritative
+     *
+     * @return void
      */
     public function setClassMapAuthoritative($classMapAuthoritative)
     {
@@ -276,6 +359,8 @@ class ClassLoader
      * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
      *
      * @param string|null $apcuPrefix
+     *
+     * @return void
      */
     public function setApcuPrefix($apcuPrefix)
     {
@@ -296,33 +381,55 @@ class ClassLoader
      * Registers this instance as an autoloader.
      *
      * @param bool $prepend Whether to prepend the autoloader or not
+     *
+     * @return void
      */
     public function register($prepend = false)
     {
         spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+
+        if (null === $this->vendorDir) {
+            return;
+        }
+
+        if ($prepend) {
+            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
+        } else {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+            self::$registeredLoaders[$this->vendorDir] = $this;
+        }
     }
 
     /**
      * Unregisters this instance as an autoloader.
+     *
+     * @return void
      */
     public function unregister()
     {
         spl_autoload_unregister(array($this, 'loadClass'));
+
+        if (null !== $this->vendorDir) {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+        }
     }
 
     /**
      * Loads the given class or interface.
      *
      * @param  string    $class The name of the class
-     * @return bool|null True if loaded, null otherwise
+     * @return true|null True if loaded, null otherwise
      */
     public function loadClass($class)
     {
         if ($file = $this->findFile($class)) {
-            includeFile($file);
+            $includeFile = self::$includeFile;
+            $includeFile($file);
 
             return true;
         }
+
+        return null;
     }
 
     /**
@@ -367,6 +474,21 @@ class ClassLoader
         return $file;
     }
 
+    /**
+     * Returns the currently registered loaders keyed by their corresponding vendor directories.
+     *
+     * @return array<string, self>
+     */
+    public static function getRegisteredLoaders()
+    {
+        return self::$registeredLoaders;
+    }
+
+    /**
+     * @param  string       $class
+     * @param  string       $ext
+     * @return string|false
+     */
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
@@ -432,14 +554,26 @@ class ClassLoader
 
         return false;
     }
-}
 
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- */
-function includeFile($file)
-{
-    include $file;
+    /**
+     * @return void
+     */
+    private static function initializeIncludeClosure()
+    {
+        if (self::$includeFile !== null) {
+            return;
+        }
+
+        /**
+         * Scope isolated include.
+         *
+         * Prevents access to $this/self from included files.
+         *
+         * @param  string $file
+         * @return void
+         */
+        self::$includeFile = \Closure::bind(static function($file) {
+            include $file;
+        }, null, null);
+    }
 }
diff --git a/phpmailer/vendor/composer/InstalledVersions.php b/phpmailer/vendor/composer/InstalledVersions.php
new file mode 100644
index 00000000..51e734a7
--- /dev/null
+++ b/phpmailer/vendor/composer/InstalledVersions.php
@@ -0,0 +1,359 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * 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
+ *
+ * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
+ *
+ * To require its presence, you can require `composer-runtime-api ^2.0`
+ *
+ * @final
+ */
+class InstalledVersions
+{
+    /**
+     * @var mixed[]|null
+     * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
+     */
+    private static $installed;
+
+    /**
+     * @var bool|null
+     */
+    private static $canGetVendors;
+
+    /**
+     * @var array[]
+     * @psalm-var array<string, array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     */
+    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)));
+    }
+
+    /**
+     * Returns a list of all package names with a specific type e.g. 'library'
+     *
+     * @param  string   $type
+     * @return string[]
+     * @psalm-return list<string>
+     */
+    public static function getInstalledPackagesByType($type)
+    {
+        $packagesByType = array();
+
+        foreach (self::getInstalled() as $installed) {
+            foreach ($installed['versions'] as $name => $package) {
+                if (isset($package['type']) && $package['type'] === $type) {
+                    $packagesByType[] = $name;
+                }
+            }
+        }
+
+        return $packagesByType;
+    }
+
+    /**
+     * 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
+     * @param  bool   $includeDevRequirements
+     * @return bool
+     */
+    public static function isInstalled($packageName, $includeDevRequirements = true)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (isset($installed['versions'][$packageName])) {
+                return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
+            }
+        }
+
+        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((string) $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');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path.
+     */
+    public static function getInstallPath($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null;
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @return array
+     * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
+     */
+    public static function getRootPackage()
+    {
+        $installed = self::getInstalled();
+
+        return $installed[0]['root'];
+    }
+
+    /**
+     * Returns the raw installed.php data for custom implementations
+     *
+     * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
+     * @return array[]
+     * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}
+     */
+    public static function getRawData()
+    {
+        @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED);
+
+        if (null === self::$installed) {
+            // only require the installed.php file if this file is loaded from its dumped location,
+            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+            if (substr(__DIR__, -8, 1) !== 'C') {
+                self::$installed = include __DIR__ . '/installed.php';
+            } else {
+                self::$installed = array();
+            }
+        }
+
+        return self::$installed;
+    }
+
+    /**
+     * Returns the raw data of all installed.php which are currently loaded for custom implementations
+     *
+     * @return array[]
+     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     */
+    public static function getAllRawData()
+    {
+        return self::getInstalled();
+    }
+
+    /**
+     * 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, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $data
+     */
+    public static function reload($data)
+    {
+        self::$installed = $data;
+        self::$installedByVendor = array();
+    }
+
+    /**
+     * @return array[]
+     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     */
+    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')) {
+                    /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                    $required = require $vendorDir.'/composer/installed.php';
+                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
+                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
+                        self::$installed = $installed[count($installed) - 1];
+                    }
+                }
+            }
+        }
+
+        if (null === self::$installed) {
+            // only require the installed.php file if this file is loaded from its dumped location,
+            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+            if (substr(__DIR__, -8, 1) !== 'C') {
+                /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                $required = require __DIR__ . '/installed.php';
+                self::$installed = $required;
+            } else {
+                self::$installed = array();
+            }
+        }
+
+        if (self::$installed !== array()) {
+            $installed[] = self::$installed;
+        }
+
+        return $installed;
+    }
+}
diff --git a/phpmailer/vendor/composer/autoload_classmap.php b/phpmailer/vendor/composer/autoload_classmap.php
index 31c59aff..c20440c1 100644
--- a/phpmailer/vendor/composer/autoload_classmap.php
+++ b/phpmailer/vendor/composer/autoload_classmap.php
@@ -2,10 +2,11 @@
 
 // autoload_classmap.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
+    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
     'PHPMailer\\PHPMailer\\DSNConfigurator' => $vendorDir . '/phpmailer/phpmailer/src/DSNConfigurator.php',
     'PHPMailer\\PHPMailer\\Exception' => $vendorDir . '/phpmailer/phpmailer/src/Exception.php',
     'PHPMailer\\PHPMailer\\OAuth' => $vendorDir . '/phpmailer/phpmailer/src/OAuth.php',
diff --git a/phpmailer/vendor/composer/autoload_namespaces.php b/phpmailer/vendor/composer/autoload_namespaces.php
index b7fc0125..15a2ff3a 100644
--- a/phpmailer/vendor/composer/autoload_namespaces.php
+++ b/phpmailer/vendor/composer/autoload_namespaces.php
@@ -2,7 +2,7 @@
 
 // autoload_namespaces.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
diff --git a/phpmailer/vendor/composer/autoload_psr4.php b/phpmailer/vendor/composer/autoload_psr4.php
index 0706da6f..28567a00 100644
--- a/phpmailer/vendor/composer/autoload_psr4.php
+++ b/phpmailer/vendor/composer/autoload_psr4.php
@@ -2,7 +2,7 @@
 
 // autoload_psr4.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
diff --git a/phpmailer/vendor/composer/autoload_real.php b/phpmailer/vendor/composer/autoload_real.php
index e7e97ae8..65adf3da 100644
--- a/phpmailer/vendor/composer/autoload_real.php
+++ b/phpmailer/vendor/composer/autoload_real.php
@@ -22,31 +22,14 @@ class ComposerAutoloaderInitPhpMailerAddon
             return self::$loader;
         }
 
+        require __DIR__ . '/platform_check.php';
+
         spl_autoload_register(array('ComposerAutoloaderInitPhpMailerAddon', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
         spl_autoload_unregister(array('ComposerAutoloaderInitPhpMailerAddon', 'loadClassLoader'));
 
-        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
-        if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
-
-            call_user_func(\Composer\Autoload\ComposerStaticInitPhpMailerAddon::getInitializer($loader));
-        } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
-            $classMap = require __DIR__ . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
-            }
-        }
+        require __DIR__ . '/autoload_static.php';
+        call_user_func(\Composer\Autoload\ComposerStaticInitPhpMailerAddon::getInitializer($loader));
 
         $loader->register(true);
 
diff --git a/phpmailer/vendor/composer/autoload_static.php b/phpmailer/vendor/composer/autoload_static.php
index d07c239a..8fc70b40 100644
--- a/phpmailer/vendor/composer/autoload_static.php
+++ b/phpmailer/vendor/composer/autoload_static.php
@@ -21,6 +21,7 @@ class ComposerStaticInitPhpMailerAddon
     );
 
     public static $classMap = array (
+        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
         'PHPMailer\\PHPMailer\\DSNConfigurator' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/DSNConfigurator.php',
         'PHPMailer\\PHPMailer\\Exception' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/Exception.php',
         'PHPMailer\\PHPMailer\\OAuth' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/OAuth.php',
diff --git a/phpmailer/vendor/composer/installed.json b/phpmailer/vendor/composer/installed.json
index 99511ee9..142a295b 100644
--- a/phpmailer/vendor/composer/installed.json
+++ b/phpmailer/vendor/composer/installed.json
@@ -1,81 +1,90 @@
-[
-    {
-        "name": "phpmailer/phpmailer",
-        "version": "v6.9.1",
-        "version_normalized": "6.9.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/PHPMailer/PHPMailer.git",
-            "reference": "039de174cd9c17a8389754d3b877a2ed22743e18"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/039de174cd9c17a8389754d3b877a2ed22743e18",
-            "reference": "039de174cd9c17a8389754d3b877a2ed22743e18",
-            "shasum": ""
-        },
-        "require": {
-            "ext-ctype": "*",
-            "ext-filter": "*",
-            "ext-hash": "*",
-            "php": ">=5.5.0"
-        },
-        "require-dev": {
-            "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
-            "doctrine/annotations": "^1.2.6 || ^1.13.3",
-            "php-parallel-lint/php-console-highlighter": "^1.0.0",
-            "php-parallel-lint/php-parallel-lint": "^1.3.2",
-            "phpcompatibility/php-compatibility": "^9.3.5",
-            "roave/security-advisories": "dev-latest",
-            "squizlabs/php_codesniffer": "^3.7.2",
-            "yoast/phpunit-polyfills": "^1.0.4"
-        },
-        "suggest": {
-            "decomplexity/SendOauth2": "Adapter for using XOAUTH2 authentication",
-            "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses",
-            "ext-openssl": "Needed for secure SMTP sending and DKIM signing",
-            "greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication",
-            "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
-            "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
-            "psr/log": "For optional PSR-3 debug logging",
-            "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)",
-            "thenetworg/oauth2-azure": "Needed for Microsoft XOAUTH2 authentication"
-        },
-        "time": "2023-11-25T22:23:28+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "PHPMailer\\PHPMailer\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "LGPL-2.1-only"
+{
+        "packages": [
+                {
+                        "name": "phpmailer/phpmailer",
+                        "version": "v6.10.0",
+                        "version_normalized": "6.10.0.0",
+                        "source": {
+                                "type": "git",
+                                "url": "https://github.com/PHPMailer/PHPMailer.git",
+                                "reference": "bf74d75a1fde6beaa34a0ddae2ec5fce0f72a144"
+                        },
+                        "dist": {
+                                "type": "zip",
+                                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/bf74d75a1fde6beaa34a0ddae2ec5fce0f72a144",
+                                "reference": "bf74d75a1fde6beaa34a0ddae2ec5fce0f72a144",
+                                "shasum": ""
+                        },
+                        "require": {
+                                "ext-ctype": "*",
+                                "ext-filter": "*",
+                                "ext-hash": "*",
+                                "php": ">=5.5.0"
+                        },
+                        "require-dev": {
+                                "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
+                                "doctrine/annotations": "^1.2.6 || ^1.13.3",
+                                "php-parallel-lint/php-console-highlighter": "^1.0.0",
+                                "php-parallel-lint/php-parallel-lint": "^1.3.2",
+                                "phpcompatibility/php-compatibility": "^9.3.5",
+                                "roave/security-advisories": "dev-latest",
+                                "squizlabs/php_codesniffer": "^3.7.2",
+                                "yoast/phpunit-polyfills": "^1.0.4"
+                        },
+                        "suggest": {
+                                "decomplexity/SendOauth2": "Adapter for using XOAUTH2 authentication",
+                                "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses",
+                                "ext-openssl": "Needed for secure SMTP sending and DKIM signing",
+                                "greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication",
+                                "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
+                                "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
+                                "psr/log": "For optional PSR-3 debug logging",
+                                "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)",
+                                "thenetworg/oauth2-azure": "Needed for Microsoft XOAUTH2 authentication"
+                        },
+                        "time": "2025-04-24T15:19:31+00:00",
+                        "type": "library",
+                        "installation-source": "dist",
+                        "autoload": {
+                                "psr-4": {
+                                        "PHPMailer\\PHPMailer\\": "src/"
+                                }
+                        },
+                        "notification-url": "https://packagist.org/downloads/",
+                        "license": [
+                                "LGPL-2.1-only"
+                        ],
+                        "authors": [
+                                {
+                                        "name": "Marcus Bointon",
+                                        "email": "phpmailer@synchromedia.co.uk"
+                                },
+                                {
+                                        "name": "Jim Jagielski",
+                                        "email": "jimjag@gmail.com"
+                                },
+                                {
+                                        "name": "Andy Prevost",
+                                        "email": "codeworxtech@users.sourceforge.net"
+                                },
+                                {
+                                        "name": "Brent R. Matzelle"
+                                }
+                        ],
+                        "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
+                        "support": {
+                                "issues": "https://github.com/PHPMailer/PHPMailer/issues",
+                                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.10.0"
+                        },
+                        "funding": [
+                                {
+                                        "url": "https://github.com/Synchro",
+                                        "type": "github"
+                                }
+                        ],
+                        "install-path": "../phpmailer/phpmailer"
+                }
         ],
-        "authors": [
-            {
-                "name": "Marcus Bointon",
-                "email": "phpmailer@synchromedia.co.uk"
-            },
-            {
-                "name": "Jim Jagielski",
-                "email": "jimjag@gmail.com"
-            },
-            {
-                "name": "Andy Prevost",
-                "email": "codeworxtech@users.sourceforge.net"
-            },
-            {
-                "name": "Brent R. Matzelle"
-            }
-        ],
-        "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
-        "funding": [
-            {
-                "url": "https://github.com/Synchro",
-                "type": "github"
-            }
-        ]
-    }
-]
+        "dev": true,
+        "dev-package-names": []
+}
diff --git a/phpmailer/vendor/composer/installed.php b/phpmailer/vendor/composer/installed.php
new file mode 100644
index 00000000..554d2c40
--- /dev/null
+++ b/phpmailer/vendor/composer/installed.php
@@ -0,0 +1,32 @@
+<?php return array(
+    'root' => array(
+        'name' => 'friendica-addons/phpmailer',
+        'pretty_version' => 'dev-2025.07-rc',
+        'version' => 'dev-2025.07-rc',
+        'reference' => '715f70032330ad14f710284104c8593c7800e125',
+        'type' => 'friendica-addon',
+        'install_path' => __DIR__ . '/../../',
+        'aliases' => array(),
+        'dev' => true,
+    ),
+    'versions' => array(
+        'friendica-addons/phpmailer' => array(
+            'pretty_version' => 'dev-2025.07-rc',
+            'version' => 'dev-2025.07-rc',
+            'reference' => '715f70032330ad14f710284104c8593c7800e125',
+            'type' => 'friendica-addon',
+            'install_path' => __DIR__ . '/../../',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'phpmailer/phpmailer' => array(
+            'pretty_version' => 'v6.10.0',
+            'version' => '6.10.0.0',
+            'reference' => 'bf74d75a1fde6beaa34a0ddae2ec5fce0f72a144',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../phpmailer/phpmailer',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+    ),
+);
diff --git a/phpmailer/vendor/composer/platform_check.php b/phpmailer/vendor/composer/platform_check.php
new file mode 100644
index 00000000..f79e574b
--- /dev/null
+++ b/phpmailer/vendor/composer/platform_check.php
@@ -0,0 +1,26 @@
+<?php
+
+// platform_check.php @generated by Composer
+
+$issues = array();
+
+if (!(PHP_VERSION_ID >= 70000)) {
+    $issues[] = 'Your Composer dependencies require a PHP version ">= 7.0.0". You are running ' . PHP_VERSION . '.';
+}
+
+if ($issues) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
+        } elseif (!headers_sent()) {
+            echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
+        }
+    }
+    trigger_error(
+        'Composer detected issues in your platform: ' . implode(' ', $issues),
+        E_USER_ERROR
+    );
+}
diff --git a/phpmailer/vendor/phpmailer/phpmailer/.editorconfig b/phpmailer/vendor/phpmailer/phpmailer/.editorconfig
deleted file mode 100644
index a7c44ddb..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/.editorconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-indent_size = 4
-indent_style = space
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.md]
-trim_trailing_whitespace = false
-
-[*.{yml,yaml}]
-indent_size = 2
diff --git a/phpmailer/vendor/phpmailer/phpmailer/README.md b/phpmailer/vendor/phpmailer/phpmailer/README.md
index e3e4ecff..862a4e1a 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/README.md
+++ b/phpmailer/vendor/phpmailer/phpmailer/README.md
@@ -20,34 +20,35 @@
 - Multipart/alternative emails for mail clients that do not read HTML email
 - Add attachments, including inline
 - Support for UTF-8 content and 8bit, base64, binary, and quoted-printable encodings
-- SMTP authentication with LOGIN, PLAIN, CRAM-MD5, and XOAUTH2 mechanisms over SMTPS and SMTP+STARTTLS transports
+- Full UTF-8 support when using servers that support `SMTPUTF8`.
+- Support for iCal events in multiparts and attachments
+- SMTP authentication with `LOGIN`, `PLAIN`, `CRAM-MD5`, and `XOAUTH2` mechanisms over SMTPS and SMTP+STARTTLS transports
 - Validates email addresses automatically
 - Protects against header injection attacks
 - Error messages in over 50 languages!
 - DKIM and S/MIME signing support
-- Compatible with PHP 5.5 and later, including PHP 8.2
+- Compatible with PHP 5.5 and later, including PHP 8.4
 - Namespaced to prevent name clashes
 - Much more!
 
 ## Why you might need it
-Many PHP developers need to send email from their code. The only PHP function that supports this directly is [`mail()`](https://www.php.net/manual/en/function.mail.php). However, it does not provide any assistance for making use of popular features such as encryption, authentication, HTML messages, and attachments.
+Many PHP developers need to send email from their code. The only PHP function that supports this directly is [`mail()`](https://www.php.net/manual/en/function.mail.php). However, it does not provide any assistance for making use of popular features such as authentication, HTML messages, and attachments.
 
 Formatting email correctly is surprisingly difficult. There are myriad overlapping (and conflicting) standards, requiring tight adherence to horribly complicated formatting and encoding rules – the vast majority of code that you'll find online that uses the `mail()` function directly is just plain wrong, if not unsafe!
 
 The PHP `mail()` function usually sends via a local mail server, typically fronted by a `sendmail` binary on Linux, BSD, and macOS platforms, however, Windows usually doesn't include a local mail server; PHPMailer's integrated SMTP client allows email sending on all platforms without needing a local mail server. Be aware though, that the `mail()` function should be avoided when possible; it's both faster and [safer](https://exploitbox.io/paper/Pwning-PHP-Mail-Function-For-Fun-And-RCE.html) to use SMTP to localhost.
 
 *Please* don't be tempted to do it yourself – if you don't use PHPMailer, there are many other excellent libraries that
-you should look at before rolling your own. Try [SwiftMailer](https://swiftmailer.symfony.com/)
-, [Laminas/Mail](https://docs.laminas.dev/laminas-mail/), [ZetaComponents](https://github.com/zetacomponents/Mail), etc.
+you should look at before rolling your own. Try [Symfony Mailer](https://symfony.com/doc/current/mailer.html), [Laminas/Mail](https://docs.laminas.dev/laminas-mail/), [ZetaComponents](https://github.com/zetacomponents/Mail), etc.
 
 ## License
-This software is distributed under the [LGPL 2.1](http://www.gnu.org/licenses/lgpl-2.1.html) license, along with the [GPL Cooperation Commitment](https://gplcc.github.io/gplcc/). Please read [LICENSE](https://github.com/PHPMailer/PHPMailer/blob/master/LICENSE) for information on the software availability and distribution.
+This software is distributed under the [LGPL 2.1](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html) license, along with the [GPL Cooperation Commitment](https://gplcc.github.io/gplcc/). Please read [LICENSE](https://github.com/PHPMailer/PHPMailer/blob/master/LICENSE) for information on the software availability and distribution.
 
 ## Installation & loading
 PHPMailer is available on [Packagist](https://packagist.org/packages/phpmailer/phpmailer) (using semantic versioning), and installation via [Composer](https://getcomposer.org) is the recommended way to install PHPMailer. Just add this line to your `composer.json` file:
 
 ```json
-"phpmailer/phpmailer": "^6.9.1"
+"phpmailer/phpmailer": "^6.10.0"
 ```
 
 or run
@@ -74,7 +75,7 @@ require 'path/to/PHPMailer/src/PHPMailer.php';
 require 'path/to/PHPMailer/src/SMTP.php';
 ```
 
-If you're not using the `SMTP` class explicitly (you're probably not), you don't need a `use` line for the SMTP class. Even if you're not using exceptions, you do still need to load the `Exception` class as it is used internally.
+If you're not using the `SMTP` class explicitly (you're probably not), you don't need a `use` line for it. Even if you're not using exceptions, you do still need to load the `Exception` class as it is used internally.
 
 ## Legacy versions
 PHPMailer 5.2 (which is compatible with PHP 5.0 — 7.0) is no longer supported, even for security updates. You will find the latest version of 5.2 in the [5.2-stable branch](https://github.com/PHPMailer/PHPMailer/tree/5.2-stable). If you're using PHP 5.5 or later (which you should be), switch to the 6.x releases.
@@ -95,7 +96,7 @@ use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\SMTP;
 use PHPMailer\PHPMailer\Exception;
 
-//Load Composer's autoloader
+//Load Composer's autoloader (created by composer, not included with PHPMailer)
 require 'vendor/autoload.php';
 
 //Create an instance; passing `true` enables exceptions
@@ -144,7 +145,7 @@ If you are re-using the instance (e.g. when sending to a mailing list), you may
 That's it. You should now be ready to use PHPMailer!
 
 ## Localization
-PHPMailer defaults to English, but in the [language](https://github.com/PHPMailer/PHPMailer/tree/master/language/) folder, you'll find many translations for PHPMailer error messages that you may encounter. Their filenames contain [ISO 639-1](http://en.wikipedia.org/wiki/ISO_639-1) language code for the translations, for example `fr` for French. To specify a language, you need to tell PHPMailer which one to use, like this:
+PHPMailer defaults to English, but in the [language](https://github.com/PHPMailer/PHPMailer/tree/master/language/) folder, you'll find many translations for PHPMailer error messages that you may encounter. Their filenames contain [ISO 639-1](https://en.wikipedia.org/wiki/ISO_639-1) language code for the translations, for example `fr` for French. To specify a language, you need to tell PHPMailer which one to use, like this:
 
 ```php
 //To load the French version
@@ -162,9 +163,9 @@ To reduce PHPMailer's deployed code footprint, examples are not included if you
 
 Complete generated API documentation is [available online](https://phpmailer.github.io/PHPMailer/).
 
-You can generate complete API-level documentation by running `phpdoc` in the top-level folder, and documentation will appear in the `docs` folder, though you'll need to have [PHPDocumentor](http://www.phpdoc.org) installed. You may find [the unit tests](https://github.com/PHPMailer/PHPMailer/blob/master/test/PHPMailerTest.php) a good reference for how to do various operations such as encryption.
+You can generate complete API-level documentation by running `phpdoc` in the top-level folder, and documentation will appear in the `docs` folder, though you'll need to have [PHPDocumentor](https://www.phpdoc.org) installed. You may find [the unit tests](https://github.com/PHPMailer/PHPMailer/blob/master/test/PHPMailer/PHPMailerTest.php) a good reference for how to do various operations such as encryption.
 
-If the documentation doesn't cover what you need, search the [many questions on Stack Overflow](http://stackoverflow.com/questions/tagged/phpmailer), and before you ask a question about "SMTP Error: Could not connect to SMTP host.", [read the troubleshooting guide](https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting).
+If the documentation doesn't cover what you need, search the [many questions on Stack Overflow](https://stackoverflow.com/questions/tagged/phpmailer), and before you ask a question about "SMTP Error: Could not connect to SMTP host.", [read the troubleshooting guide](https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting).
 
 ## Tests
 [PHPMailer tests](https://github.com/PHPMailer/PHPMailer/tree/master/test/) use PHPUnit 9, with [a polyfill](https://github.com/Yoast/PHPUnit-Polyfills) to let 9-style tests run on older PHPUnit and PHP versions.
@@ -213,7 +214,7 @@ use. [Learn more.](https://tidelift.com/subscription/pkg/packagist-phpmailer-php
 See [changelog](changelog.md).
 
 ## History
-- PHPMailer was originally written in 2001 by Brent R. Matzelle as a [SourceForge project](http://sourceforge.net/projects/phpmailer/).
+- PHPMailer was originally written in 2001 by Brent R. Matzelle as a [SourceForge project](https://sourceforge.net/projects/phpmailer/).
 - [Marcus Bointon](https://github.com/Synchro) (`coolbru` on SF) and Andy Prevost (`codeworxtech`) took over the project in 2004.
 - Became an Apache incubator project on Google Code in 2010, managed by Jim Jagielski.
 - Marcus created [his fork on GitHub](https://github.com/Synchro/PHPMailer) in 2008.
diff --git a/phpmailer/vendor/phpmailer/phpmailer/SECURITY.md b/phpmailer/vendor/phpmailer/phpmailer/SECURITY.md
index 035a87f7..4f34026d 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/SECURITY.md
+++ b/phpmailer/vendor/phpmailer/phpmailer/SECURITY.md
@@ -13,13 +13,13 @@ PHPMailer versions 6.1.5 and earlier contain an output escaping bug that occurs
 
 PHPMailer versions prior to 6.0.6 and 5.2.27 are vulnerable to an object injection attack by passing `phar://` paths into `addAttachment()` and other functions that may receive unfiltered local paths, possibly leading to RCE. Recorded as [CVE-2018-19296](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2018-19296). See [this article](https://knasmueller.net/5-answers-about-php-phar-exploitation) for more info on this type of vulnerability. Mitigated by blocking the use of paths containing URL-protocol style prefixes such as `phar://`. Reported by Sehun Oh of cyberone.kr.
 
-PHPMailer versions prior to 5.2.24 (released July 26th 2017) have an XSS vulnerability in one of the code examples, [CVE-2017-11503](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-11503). The `code_generator.phps` example did not filter user input prior to output. This file is distributed with a `.phps` extension, so it it not normally executable unless it is explicitly renamed, and the file is not included when PHPMailer is loaded through composer, so it is safe by default. There was also an undisclosed potential XSS vulnerability in the default exception handler (unused by default). Patches for both issues kindly provided by Patrick Monnerat of the Fedora Project.
+PHPMailer versions prior to 5.2.24 (released July 26th 2017) have an XSS vulnerability in one of the code examples, [CVE-2017-11503](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-11503). The `code_generator.phps` example did not filter user input prior to output. This file is distributed with a `.phps` extension, so it is not normally executable unless it is explicitly renamed, and the file is not included when PHPMailer is loaded through composer, so it is safe by default. There was also an undisclosed potential XSS vulnerability in the default exception handler (unused by default). Patches for both issues kindly provided by Patrick Monnerat of the Fedora Project.
 
 PHPMailer versions prior to 5.2.22 (released January 9th 2017) have a local file disclosure vulnerability, [CVE-2017-5223](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-5223). If content passed into `msgHTML()` is sourced from unfiltered user input, relative paths can map to absolute local file paths and added as attachments. Also note that `addAttachment` (just like `file_get_contents`, `passthru`, `unlink`, etc) should not be passed user-sourced params either! Reported by Yongxiang Li of Asiasecurity.
 
 PHPMailer versions prior to 5.2.20 (released December 28th 2016) are vulnerable to [CVE-2016-10045](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10045) a remote code execution vulnerability, responsibly reported by [Dawid Golunski](https://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10045-Vuln-Patch-Bypass.html), and patched by Paul Buonopane (@Zenexer).
 
-PHPMailer versions prior to 5.2.18 (released December 2016) are vulnerable to [CVE-2016-10033](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10033) a remote code execution vulnerability, responsibly reported by [Dawid Golunski](http://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10033-Vuln.html).
+PHPMailer versions prior to 5.2.18 (released December 2016) are vulnerable to [CVE-2016-10033](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10033) a remote code execution vulnerability, responsibly reported by [Dawid Golunski](https://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10033-Vuln.html).
 
 PHPMailer versions prior to 5.2.14 (released November 2015) are vulnerable to [CVE-2015-8476](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-8476) an SMTP CRLF injection bug permitting arbitrary message sending.
 
diff --git a/phpmailer/vendor/phpmailer/phpmailer/SMTPUTF8.md b/phpmailer/vendor/phpmailer/phpmailer/SMTPUTF8.md
new file mode 100644
index 00000000..ca284ee2
--- /dev/null
+++ b/phpmailer/vendor/phpmailer/phpmailer/SMTPUTF8.md
@@ -0,0 +1,48 @@
+# A short history of UTF-8 in email
+
+## Background
+
+For most of its existence, SMTP has been a 7-bit channel, only supporting US-ASCII characters. This has been a problem for many languages, especially those that use non-Latin scripts, and has led to the development of various workarounds.
+
+The first major improvement, introduced in 1994 in [RFC 1652](https://www.rfc-editor.org/rfc/rfc1652) and extended in 2011 in [RFC 6152](https://www.rfc-editor.org/rfc/rfc6152), was the addition of the `8BITMIME` SMTP extension, which allowed raw 8-bit data to be included in message bodies sent over SMTP.
+This allowed the message *contents* to contain 8-bit data, including things like UTF-8 text, even though the SMTP protocol itself was still firmly 7-bit. This worked by having the server switch to 8-bit after the headers, and then back to 7-bit after the completion of a `DATA` command.
+
+From 1996, messages could support [RFC 2047 encoding](https://www.rfc-editor.org/rfc/rfc2047), which permitted inserting characters from any character set into header *values* (but not names), but only by encoding them in somewhat unreadable ways to allow them to survive passage through a 7-bit channel. An example with a subject of "Schrödinger's cat" would be:
+
+```
+Subject: =?utf-8?Q=Schr=C3=B6dinger=92s_Cat?=
+```
+
+Here the accented `ö` is encoded as `=C3=B6`, which is the UTF-8 encoding of the 2-byte character, and the whole thing is wrapped in `=?utf-8?Q?` to indicate that it uses the UTF-8 charset and `quoted-printable` encoding. This is a bit of a hack, and not very human-friendly, but it works.
+
+Similarly, 8-bit message bodies could be encoded using the same `quoted-printable` and `base64` content transfer encoding (CTE) schemes, which preserved the 8-bit content while encoding it in a format that could survive transmission through a 7-bit channel.
+
+Domain names were originally also stuck in a 7-bit world, actually even more constrained to only a subset of the US-ASCII character set. But of course, many people want to have domains in their own language/script. Internationalized domain name (IDN) permitted this, using yet another complex encoding scheme called punycode, defined for domain names in 2003 in [RFC 3492](https://www.rfc-editor.org/rfc/rfc3492). This finally allowed the domain part (after the `@`) of email addresses to contain UTF-8, though it was actually an illusion preserved by email client applications. For example, an address of
+`user@café.example.com` translates to
+`user@xn--caf-dma.example.com` in punycode, rendering it mostly unreadable, but 7-bit friendly, and remaining compatible with email clients that don't know about IDN.
+
+The one remaining part of email that could not handle UTF-8 is the local part of email addresses (the part before the `@`).
+
+I've only mentioned UTF-8 here, but most of these approaches also allowed other character sets that were popular, such as [the ISO-8859 family](https://en.wikipedia.org/wiki/ISO/IEC_8859). However, UTF-8 solves so many problems that these other character sets are gradually falling out of favour, as UTF-8 can support all languages.
+
+This patchwork of overlapping approaches has served us well, but we have to admit that it's a mess.
+
+## SMTPUTF8
+
+`SMTPUTF8` is another SMTP extension, defined in [RFC 6531](https://www.rfc-editor.org/rfc/rfc6531) in 2012. This essentially solves the whole problem, allowing the entire SMTP conversation — commands, headers, and message bodies — to be sent in raw, unencoded UTF-8.
+
+But there's a problem with this approach: adoption. If you send a UTF-8 message to a recipient whose mail server doesn't support this format, the sender has to somehow downgrade the message to make it survive a transition to 7-bit. This is a hard problem to solve, especially since there is no way to make a 7-bit system support UTF-8 in the local parts of addresses. This downgrade problem is what held up the adoption of `SMTPUTF8` in PHPMailer for many years, but in that time the *de facto* approach has become to simply fail in that situation, and tell the recipient it's time they upgraded their mail server 😅.
+
+The vast majority of large email providers (gmail, Yahoo, Microsoft, etc), mail servers (postfix, exim, IIS, etc), and mail clients (Apple Mail, Outlook, Thunderbird, etc) now all support SMTPUTF8, so the need for backward compatibility is no longer what it was.
+
+## SMTPUTF8 in PHPMailer
+
+Several other PHP email libraries have implemented a halfway solution to `SMTPUTF8`, adding only the ability to support UTF-8 in email addresses, not elsewhere in the protocol. I wanted PHPMailer to do it "the right way", and this has taken much longer. PHPMailer now supports UTF-8 everywhere, and does not need to use transfer or header encodings for UTF-8 text when connecting to an `SMTPUTF8`-capable mail server.
+
+This support is handled automatically: if you add an email address that requires UTF-8, PHPMailer will use UTF-8 for everything. If not, it will fall back to 7-bit and encode the message as necessary.
+
+The one place you will need to be careful is in the selection of the address validator. By default, PHPMailer uses PHP's built-in `filter_var` validator, which does not allow UTF-8 email addresses. When PHPMailer spots that you have submitted a UTF-8 address, but have not altered the default validator, it will automatically switch to using a UTF-8-compatible validator. As soon as you do this, any SMTP connection you make will *require* that the server you connect to supports `SMTPUTF8`. You can select this validator explicitly by setting `PHPMailer::$validator = 'eai'` (an acronym for Email Address Internationalization).
+
+### Postfix gotcha
+
+Postfix has supported `SMTPUTF8` for a long time, but it has a peculiarity that it does not always advertise that it does so. However, rather surprisingly, if you use UTF-8 in the conversation, it will work anyway.
diff --git a/phpmailer/vendor/phpmailer/phpmailer/VERSION b/phpmailer/vendor/phpmailer/phpmailer/VERSION
index dc3829f5..cf79bf90 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/VERSION
+++ b/phpmailer/vendor/phpmailer/phpmailer/VERSION
@@ -1 +1 @@
-6.9.1
+6.10.0
diff --git a/phpmailer/vendor/phpmailer/phpmailer/composer.json b/phpmailer/vendor/phpmailer/phpmailer/composer.json
index fa170a0b..7b008b7c 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/composer.json
+++ b/phpmailer/vendor/phpmailer/phpmailer/composer.json
@@ -28,7 +28,8 @@
     "config": {
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true
-        }
+        },
+        "lock": false
     },
     "require": {
         "php": ">=5.5.0",
diff --git a/phpmailer/vendor/phpmailer/phpmailer/get_oauth_token.php b/phpmailer/vendor/phpmailer/phpmailer/get_oauth_token.php
index cda0445c..0e54a00b 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/get_oauth_token.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/get_oauth_token.php
@@ -12,7 +12,7 @@
  * @copyright 2012 - 2020 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
- * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License
  * @note This program is distributed in the hope that it will be useful - WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.
@@ -36,7 +36,7 @@ namespace PHPMailer\PHPMailer;
  * Aliases for League Provider Classes
  * Make sure you have added these to your composer.json and run `composer install`
  * Plenty to choose from here:
- * @see http://oauth2-client.thephpleague.com/providers/thirdparty/
+ * @see https://oauth2-client.thephpleague.com/providers/thirdparty/
  */
 //@see https://github.com/thephpleague/oauth2-google
 use League\OAuth2\Client\Provider\Google;
@@ -178,5 +178,5 @@ if (!isset($_GET['code'])) {
     );
     //Use this to interact with an API on the users behalf
     //Use this to get a new access token if the old one expires
-    echo 'Refresh Token: ', $token->getRefreshToken();
+    echo 'Refresh Token: ', htmlspecialchars($token->getRefreshToken());
 }
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php
index 69920418..4e74bfb7 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php
@@ -5,27 +5,32 @@
  * @package PHPMailer
  * @author Matt Sturdy <matt.sturdy@gmail.com>
  * @author Crystopher Glodzienski Cardoso <crystopher.glodzienski@gmail.com>
+ * @author Daniel Cruz <danicruz0415@gmail.com>
  */
 
 $PHPMAILER_LANG['authenticate']         = 'Error SMTP: Imposible autentificar.';
+$PHPMAILER_LANG['buggy_php']            = 'Tu versión de PHP está afectada por un bug que puede resultar en mensajes corruptos. Para arreglarlo, cambia a enviar usando SMTP, deshabilita la opción mail.add_x_header en tu php.ini, cambia a MacOS o Linux, o actualiza tu PHP a la versión 7.0.17+ o 7.1.3+.';
 $PHPMAILER_LANG['connect_host']         = 'Error SMTP: Imposible conectar al servidor SMTP.';
 $PHPMAILER_LANG['data_not_accepted']    = 'Error SMTP: Datos no aceptados.';
 $PHPMAILER_LANG['empty_message']        = 'El cuerpo del mensaje está vacío.';
 $PHPMAILER_LANG['encoding']             = 'Codificación desconocida: ';
 $PHPMAILER_LANG['execute']              = 'Imposible ejecutar: ';
+$PHPMAILER_LANG['extension_missing']    = 'Extensión faltante: ';
 $PHPMAILER_LANG['file_access']          = 'Imposible acceder al archivo: ';
 $PHPMAILER_LANG['file_open']            = 'Error de Archivo: Imposible abrir el archivo: ';
 $PHPMAILER_LANG['from_failed']          = 'La(s) siguiente(s) direcciones de remitente fallaron: ';
 $PHPMAILER_LANG['instantiate']          = 'Imposible crear una instancia de la función Mail.';
 $PHPMAILER_LANG['invalid_address']      = 'Imposible enviar: dirección de email inválido: ';
+$PHPMAILER_LANG['invalid_header']       = 'Nombre o valor de encabezado no válido';
+$PHPMAILER_LANG['invalid_hostentry']    = 'Hostentry inválido: ';
+$PHPMAILER_LANG['invalid_host']         = 'Host inválido: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' mailer no está soportado.';
 $PHPMAILER_LANG['provide_address']      = 'Debe proporcionar al menos una dirección de email de destino.';
 $PHPMAILER_LANG['recipients_failed']    = 'Error SMTP: Los siguientes destinos fallaron: ';
 $PHPMAILER_LANG['signing']              = 'Error al firmar: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() falló.';
-$PHPMAILER_LANG['smtp_error']           = 'Error del servidor SMTP: ';
-$PHPMAILER_LANG['variable_set']         = 'No se pudo configurar la variable: ';
-$PHPMAILER_LANG['extension_missing']    = 'Extensión faltante: ';
 $PHPMAILER_LANG['smtp_code']            = 'Código del servidor SMTP: ';
 $PHPMAILER_LANG['smtp_code_ex']         = 'Información adicional del servidor SMTP: ';
-$PHPMAILER_LANG['invalid_header']       = 'Nombre o valor de encabezado no válido';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() falló.';
+$PHPMAILER_LANG['smtp_detail']          = 'Detalle: ';
+$PHPMAILER_LANG['smtp_error']           = 'Error del servidor SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'No se pudo configurar la variable: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php
index 0d367fcf..a6d582d8 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php
@@ -6,7 +6,6 @@
  * Some French punctuation requires a thin non-breaking space (U+202F) character before it,
  * for example before a colon or exclamation mark.
  * There is one of these characters between these quotes: " "
- * @see http://unicode.org/udhr/n/notes_fra.html
  */
 
 $PHPMAILER_LANG['authenticate']         = 'Erreur SMTP : échec de l’authentification.';
@@ -31,7 +30,7 @@ $PHPMAILER_LANG['recipients_failed']    = 'Erreur SMTP : les destinataires s
 $PHPMAILER_LANG['signing']              = 'Erreur de signature : ';
 $PHPMAILER_LANG['smtp_code']            = 'Code SMTP : ';
 $PHPMAILER_LANG['smtp_code_ex']         = 'Informations supplémentaires SMTP : ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'La fonction SMTP connect() a échouée.';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'La fonction SMTP connect() a échoué.';
 $PHPMAILER_LANG['smtp_detail']          = 'Détails : ';
 $PHPMAILER_LANG['smtp_error']           = 'Erreur du serveur SMTP : ';
 $PHPMAILER_LANG['variable_set']         = 'Impossible d’initialiser ou de réinitialiser une variable : ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php
index c76f5264..d01869ce 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php
@@ -3,27 +3,35 @@
 /**
  * Japanese PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
- * @author Mitsuhiro Yoshida <http://mitstek.com/>
+ * @author Mitsuhiro Yoshida <https://mitstek.com>
  * @author Yoshi Sakai <http://bluemooninc.jp/>
  * @author Arisophy <https://github.com/arisophy/>
+ * @author ARAKI Musashi <https://github.com/arakim/>
  */
 
 $PHPMAILER_LANG['authenticate']         = 'SMTPエラー: 認証できませんでした。';
+$PHPMAILER_LANG['buggy_php']            = 'ご利用のバージョンのPHPには不具合があり、メッセージが破損するおそれがあります。問題の解決は以下のいずれかを行ってください。SMTPでの送信に切り替える。php.iniのmail.add_x_headerをoffにする。MacOSまたはLinuxに切り替える。PHPバージョン7.0.17以降または7.1.3以降にアップグレードする。';
 $PHPMAILER_LANG['connect_host']         = 'SMTPエラー: SMTPホストに接続できませんでした。';
 $PHPMAILER_LANG['data_not_accepted']    = 'SMTPエラー: データが受け付けられませんでした。';
 $PHPMAILER_LANG['empty_message']        = 'メール本文が空です。';
 $PHPMAILER_LANG['encoding']             = '不明なエンコーディング: ';
 $PHPMAILER_LANG['execute']              = '実行できませんでした: ';
+$PHPMAILER_LANG['extension_missing']    = '拡張機能が見つかりません: ';
 $PHPMAILER_LANG['file_access']          = 'ファイルにアクセスできません: ';
 $PHPMAILER_LANG['file_open']            = 'ファイルエラー: ファイルを開けません: ';
 $PHPMAILER_LANG['from_failed']          = 'Fromアドレスを登録する際にエラーが発生しました: ';
 $PHPMAILER_LANG['instantiate']          = 'メール関数が正常に動作しませんでした。';
 $PHPMAILER_LANG['invalid_address']      = '不正なメールアドレス: ';
-$PHPMAILER_LANG['provide_address']      = '少なくとも1つメールアドレスを 指定する必要があります。';
+$PHPMAILER_LANG['invalid_header']       = '不正なヘッダー名またはその内容';
+$PHPMAILER_LANG['invalid_hostentry']    = '不正なホストエントリー: ';
+$PHPMAILER_LANG['invalid_host']         = '不正なホスト: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' メーラーがサポートされていません。';
+$PHPMAILER_LANG['provide_address']      = '少なくとも1つメールアドレスを 指定する必要があります。';
 $PHPMAILER_LANG['recipients_failed']    = 'SMTPエラー: 次の受信者アドレスに 間違いがあります: ';
 $PHPMAILER_LANG['signing']              = '署名エラー: ';
+$PHPMAILER_LANG['smtp_code']            = 'SMTPコード: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'SMTP追加情報: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP接続に失敗しました。';
+$PHPMAILER_LANG['smtp_detail']          = '詳細: ';
 $PHPMAILER_LANG['smtp_error']           = 'SMTPサーバーエラー: ';
 $PHPMAILER_LANG['variable_set']         = '変数が存在しません: ';
-$PHPMAILER_LANG['extension_missing']    = '拡張機能が見つかりません: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ku.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ku.php
new file mode 100644
index 00000000..cf3bda69
--- /dev/null
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ku.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Kurdish (Sorani) PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Halo Salman <halo@home4t.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'هەڵەی SMTP : نەتوانرا کۆدەکە پشتڕاست بکرێتەوە ';
+$PHPMAILER_LANG['connect_host']         = 'هەڵەی SMTP: نەتوانرا پەیوەندی بە سێرڤەرەوە بکات SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'هەڵەی SMTP: ئەو زانیاریانە قبوڵ نەکرا.';
+$PHPMAILER_LANG['empty_message']        = 'پەیامەکە بەتاڵە';
+$PHPMAILER_LANG['encoding']             = 'کۆدکردنی نەزانراو : ';
+$PHPMAILER_LANG['execute']              = 'ناتوانرێت جێبەجێ بکرێت: ';
+$PHPMAILER_LANG['file_access']          = 'ناتوانرێت دەستت بگات بە فایلەکە: ';
+$PHPMAILER_LANG['file_open']            = 'هەڵەی پەڕگە(فایل): ناتوانرێت بکرێتەوە: ';
+$PHPMAILER_LANG['from_failed']          = 'هەڵە لە ئاستی ناونیشانی نێرەر: ';
+$PHPMAILER_LANG['instantiate']          = 'ناتوانرێت خزمەتگوزاری پۆستە پێشکەش بکرێت.';
+$PHPMAILER_LANG['invalid_address']      = 'نەتوانرا بنێردرێت ، چونکە ناونیشانی ئیمەیڵەکە نادروستە: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' مەیلەر پشتگیری ناکات';
+$PHPMAILER_LANG['provide_address']      = 'دەبێت ناونیشانی ئیمەیڵی لانیکەم یەک وەرگر دابین بکرێت.';
+$PHPMAILER_LANG['recipients_failed']    = ' هەڵەی SMTP: ئەم هەڵانەی خوارەوەشکستی هێنا لە ناردن بۆ هەردووکیان: ';
+$PHPMAILER_LANG['signing']              = 'هەڵەی واژۆ: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect()پەیوەندی شکستی هێنا .';
+$PHPMAILER_LANG['smtp_error']           = 'هەڵەی ئاستی سێرڤەری SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'ناتوانرێت بیگۆڕیت یان دوبارە بینێریتەوە: ';
+$PHPMAILER_LANG['extension_missing']    = 'درێژکراوە نەماوە: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt.php
index f1ce946e..79a68026 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt.php
@@ -3,25 +3,32 @@
 /**
  * Portuguese (European) PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
- * @author Jonadabe <jonadabe@hotmail.com>
+ * @author João Vieira <mail@joaovieira.eu>
  */
 
-$PHPMAILER_LANG['authenticate']         = 'Erro do SMTP: Não foi possível realizar a autenticação.';
-$PHPMAILER_LANG['connect_host']         = 'Erro do SMTP: Não foi possível realizar ligação com o servidor SMTP.';
-$PHPMAILER_LANG['data_not_accepted']    = 'Erro do SMTP: Os dados foram rejeitados.';
-$PHPMAILER_LANG['empty_message']        = 'A mensagem no e-mail está vazia.';
+$PHPMAILER_LANG['authenticate']         = 'Erro SMTP: Falha na autenticação.';
+$PHPMAILER_LANG['buggy_php']            = 'A sua versão do PHP tem um bug que pode causar mensagens corrompidas. Para resolver, utilize o envio por SMTP, desative a opção mail.add_x_header no ficheiro php.ini, mude para MacOS ou Linux, ou atualize o PHP para a versão 7.0.17+ ou 7.1.3+.';
+$PHPMAILER_LANG['connect_host']         = 'Erro SMTP: Não foi possível ligar ao servidor SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Erro SMTP: Dados não aceites.';
+$PHPMAILER_LANG['empty_message']        = 'A mensagem de e-mail está vazia.';
 $PHPMAILER_LANG['encoding']             = 'Codificação desconhecida: ';
 $PHPMAILER_LANG['execute']              = 'Não foi possível executar: ';
-$PHPMAILER_LANG['file_access']          = 'Não foi possível aceder o ficheiro: ';
-$PHPMAILER_LANG['file_open']            = 'Abertura do ficheiro: Não foi possível abrir o ficheiro: ';
-$PHPMAILER_LANG['from_failed']          = 'Ocorreram falhas nos endereços dos seguintes remententes: ';
-$PHPMAILER_LANG['instantiate']          = 'Não foi possível iniciar uma instância da função mail.';
-$PHPMAILER_LANG['invalid_address']      = 'Não foi enviado nenhum e-mail para o endereço de e-mail inválido: ';
-$PHPMAILER_LANG['mailer_not_supported'] = ' mailer não é suportado.';
-$PHPMAILER_LANG['provide_address']      = 'Tem de fornecer pelo menos um endereço como destinatário do e-mail.';
-$PHPMAILER_LANG['recipients_failed']    = 'Erro do SMTP: O endereço do seguinte destinatário falhou: ';
-$PHPMAILER_LANG['signing']              = 'Erro ao assinar: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() falhou.';
-$PHPMAILER_LANG['smtp_error']           = 'Erro de servidor SMTP: ';
-$PHPMAILER_LANG['variable_set']         = 'Não foi possível definir ou redefinir a variável: ';
 $PHPMAILER_LANG['extension_missing']    = 'Extensão em falta: ';
+$PHPMAILER_LANG['file_access']          = 'Não foi possível aceder ao ficheiro: ';
+$PHPMAILER_LANG['file_open']            = 'Erro ao abrir o ficheiro: ';
+$PHPMAILER_LANG['from_failed']          = 'O envio falhou para o seguinte endereço do remetente: ';
+$PHPMAILER_LANG['instantiate']          = 'Não foi possível instanciar a função mail.';
+$PHPMAILER_LANG['invalid_address']      = 'Endereço de e-mail inválido: ';
+$PHPMAILER_LANG['invalid_header']       = 'Nome ou valor do cabeçalho inválido.';
+$PHPMAILER_LANG['invalid_hostentry']    = 'Entrada de host inválida: ';
+$PHPMAILER_LANG['invalid_host']         = 'Host inválido: ';
+$PHPMAILER_LANG['mailer_not_supported'] = 'O cliente de e-mail não é suportado.';
+$PHPMAILER_LANG['provide_address']      = 'Deve fornecer pelo menos um endereço de destinatário.';
+$PHPMAILER_LANG['recipients_failed']    = 'Erro SMTP: Falha no envio para os seguintes destinatários: ';
+$PHPMAILER_LANG['signing']              = 'Erro ao assinar: ';
+$PHPMAILER_LANG['smtp_code']            = 'Código SMTP: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'Informações adicionais SMTP: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Falha na função SMTP connect().';
+$PHPMAILER_LANG['smtp_detail']          = 'Detalhes: ';
+$PHPMAILER_LANG['smtp_error']           = 'Erro do servidor SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'Não foi possível definir ou redefinir a variável: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ru.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ru.php
index 8c8c5e81..8013f37c 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ru.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ru.php
@@ -5,24 +5,32 @@
  * @package PHPMailer
  * @author Alexey Chumakov <alex@chumakov.ru>
  * @author Foster Snowhill <i18n@forstwoof.ru>
+ * @author ProjectSoft <projectsoft2009@yandex.ru>
  */
 
-$PHPMAILER_LANG['authenticate']         = 'Ошибка SMTP: ошибка авторизации.';
+$PHPMAILER_LANG['authenticate']         = 'Ошибка SMTP: не удалось пройти аутентификацию.';
+$PHPMAILER_LANG['buggy_php']            = 'В вашей версии PHP есть ошибка, которая может привести к повреждению сообщений. Чтобы исправить, переключитесь на отправку по SMTP, отключите опцию mail.add_x_header в ваш php.ini, переключитесь на MacOS или Linux или обновите PHP до версии 7.0.17+ или 7.1.3+.';
 $PHPMAILER_LANG['connect_host']         = 'Ошибка SMTP: не удается подключиться к SMTP-серверу.';
 $PHPMAILER_LANG['data_not_accepted']    = 'Ошибка SMTP: данные не приняты.';
+$PHPMAILER_LANG['empty_message']        = 'Пустое сообщение';
 $PHPMAILER_LANG['encoding']             = 'Неизвестная кодировка: ';
 $PHPMAILER_LANG['execute']              = 'Невозможно выполнить команду: ';
+$PHPMAILER_LANG['extension_missing']    = 'Расширение отсутствует: ';
 $PHPMAILER_LANG['file_access']          = 'Нет доступа к файлу: ';
 $PHPMAILER_LANG['file_open']            = 'Файловая ошибка: не удаётся открыть файл: ';
 $PHPMAILER_LANG['from_failed']          = 'Неверный адрес отправителя: ';
 $PHPMAILER_LANG['instantiate']          = 'Невозможно запустить функцию mail().';
-$PHPMAILER_LANG['provide_address']      = 'Пожалуйста, введите хотя бы один email-адрес получателя.';
-$PHPMAILER_LANG['mailer_not_supported'] = ' — почтовый сервер не поддерживается.';
-$PHPMAILER_LANG['recipients_failed']    = 'Ошибка SMTP: не удалась отправка таким адресатам: ';
-$PHPMAILER_LANG['empty_message']        = 'Пустое сообщение';
 $PHPMAILER_LANG['invalid_address']      = 'Не отправлено из-за неправильного формата email-адреса: ';
+$PHPMAILER_LANG['invalid_header']       = 'Неверное имя или значение заголовка';
+$PHPMAILER_LANG['invalid_hostentry']    = 'Неверная запись хоста: ';
+$PHPMAILER_LANG['invalid_host']         = 'Неверный хост: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' — почтовый сервер не поддерживается.';
+$PHPMAILER_LANG['provide_address']      = 'Вы должны указать хотя бы один адрес электронной почты получателя.';
+$PHPMAILER_LANG['recipients_failed']    = 'Ошибка SMTP: Ошибка следующих получателей: ';
 $PHPMAILER_LANG['signing']              = 'Ошибка подписи: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'Ошибка соединения с SMTP-сервером';
+$PHPMAILER_LANG['smtp_code']            = 'Код SMTP: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'Дополнительная информация SMTP: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Ошибка соединения с SMTP-сервером.';
+$PHPMAILER_LANG['smtp_detail']          = 'Детали: ';
 $PHPMAILER_LANG['smtp_error']           = 'Ошибка SMTP-сервера: ';
 $PHPMAILER_LANG['variable_set']         = 'Невозможно установить или сбросить переменную: ';
-$PHPMAILER_LANG['extension_missing']    = 'Расширение отсутствует: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-tr.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-tr.php
index f938f802..3c45bc1c 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-tr.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-tr.php
@@ -11,21 +11,28 @@
  */
 
 $PHPMAILER_LANG['authenticate']         = 'SMTP Hatası: Oturum açılamadı.';
+$PHPMAILER_LANG['buggy_php']            = 'PHP sürümünüz iletilerin bozulmasına neden olabilecek bir hatadan etkileniyor. Bunu düzeltmek için, SMTP kullanarak göndermeye geçin, mail.add_x_header seçeneğini devre dışı bırakın php.ini dosyanızdaki mail.add_x_header seçeneğini devre dışı bırakın, MacOS veya Linux geçin veya PHP sürümünü 7.0.17+ veya 7.1.3+ sürümüne yükseltin,';
 $PHPMAILER_LANG['connect_host']         = 'SMTP Hatası: SMTP sunucusuna bağlanılamadı.';
 $PHPMAILER_LANG['data_not_accepted']    = 'SMTP Hatası: Veri kabul edilmedi.';
 $PHPMAILER_LANG['empty_message']        = 'Mesajın içeriği boş';
 $PHPMAILER_LANG['encoding']             = 'Bilinmeyen karakter kodlama: ';
 $PHPMAILER_LANG['execute']              = 'Çalıştırılamadı: ';
+$PHPMAILER_LANG['extension_missing']    = 'Eklenti bulunamadı: ';
 $PHPMAILER_LANG['file_access']          = 'Dosyaya erişilemedi: ';
 $PHPMAILER_LANG['file_open']            = 'Dosya Hatası: Dosya açılamadı: ';
 $PHPMAILER_LANG['from_failed']          = 'Belirtilen adreslere gönderme başarısız: ';
 $PHPMAILER_LANG['instantiate']          = 'Örnek e-posta fonksiyonu oluşturulamadı.';
 $PHPMAILER_LANG['invalid_address']      = 'Geçersiz e-posta adresi: ';
+$PHPMAILER_LANG['invalid_header']       = 'Geçersiz başlık adı veya değeri: ';
+$PHPMAILER_LANG['invalid_hostentry']    = 'Geçersiz ana bilgisayar girişi: ';
+$PHPMAILER_LANG['invalid_host']         = 'Geçersiz ana bilgisayar: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' e-posta kütüphanesi desteklenmiyor.';
 $PHPMAILER_LANG['provide_address']      = 'En az bir alıcı e-posta adresi belirtmelisiniz.';
 $PHPMAILER_LANG['recipients_failed']    = 'SMTP Hatası: Belirtilen alıcılara ulaşılamadı: ';
 $PHPMAILER_LANG['signing']              = 'İmzalama hatası: ';
+$PHPMAILER_LANG['smtp_code']            = 'SMTP kodu: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'ek SMTP bilgileri: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP connect() fonksiyonu başarısız.';
+$PHPMAILER_LANG['smtp_detail']          = 'SMTP SMTP Detayı: ';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP sunucu hatası: ';
 $PHPMAILER_LANG['variable_set']         = 'Değişken ayarlanamadı ya da sıfırlanamadı: ';
-$PHPMAILER_LANG['extension_missing']    = 'Eklenti bulunamadı: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ur.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ur.php
new file mode 100644
index 00000000..0b9de0f1
--- /dev/null
+++ b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ur.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Urdu PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Saqib Ali Siddiqui <saqibsra@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP خرابی: تصدیق کرنے سے قاصر۔';
+$PHPMAILER_LANG['connect_host']         = 'SMTP خرابی: سرور سے منسلک ہونے سے قاصر۔';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP خرابی: ڈیٹا قبول نہیں کیا گیا۔';
+$PHPMAILER_LANG['empty_message']        = 'پیغام کی باڈی خالی ہے۔';
+$PHPMAILER_LANG['encoding']             = 'نامعلوم انکوڈنگ: ';
+$PHPMAILER_LANG['execute']              = 'عمل کرنے کے قابل نہیں ';
+$PHPMAILER_LANG['file_access']          = 'فائل تک رسائی سے قاصر:';
+$PHPMAILER_LANG['file_open']            = 'فائل کی خرابی: فائل کو کھولنے سے قاصر:';
+$PHPMAILER_LANG['from_failed']          = 'درج ذیل بھیجنے والے کا پتہ ناکام ہو گیا:';
+$PHPMAILER_LANG['instantiate']          = 'میل فنکشن کی مثال بنانے سے قاصر۔';
+$PHPMAILER_LANG['invalid_address']      = 'بھیجنے سے قاصر: غلط ای میل پتہ:';
+$PHPMAILER_LANG['mailer_not_supported'] = ' میلر تعاون یافتہ نہیں ہے۔';
+$PHPMAILER_LANG['provide_address']      = 'آپ کو کم از کم ایک منزل کا ای میل پتہ فراہم کرنا چاہیے۔';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP خرابی: درج ذیل پتہ پر نہیں بھیجا جاسکا: ';
+$PHPMAILER_LANG['signing']              = 'دستخط کی خرابی: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP ملنا ناکام ہوا';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP سرور کی خرابی: ';
+$PHPMAILER_LANG['variable_set']         = 'متغیر سیٹ نہیں کیا جا سکا: ';
+$PHPMAILER_LANG['extension_missing']    = 'ایکٹینشن موجود نہیں ہے۔ ';
+$PHPMAILER_LANG['smtp_code']            = 'SMTP سرور کوڈ: ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'اضافی SMTP سرور کی معلومات:';
+$PHPMAILER_LANG['invalid_header']       = 'غلط ہیڈر کا نام یا قدر';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/DSNConfigurator.php b/phpmailer/vendor/phpmailer/phpmailer/src/DSNConfigurator.php
index 566c9618..7058c1f0 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/src/DSNConfigurator.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/src/DSNConfigurator.php
@@ -13,7 +13,7 @@
  * @copyright 2012 - 2023 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
- * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @license   https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License
  * @note      This program is distributed in the hope that it will be useful - WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/Exception.php b/phpmailer/vendor/phpmailer/phpmailer/src/Exception.php
index 52eaf951..09c1a2cf 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/src/Exception.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/src/Exception.php
@@ -13,7 +13,7 @@
  * @copyright 2012 - 2020 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
- * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @license   https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License
  * @note      This program is distributed in the hope that it will be useful - WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/OAuth.php b/phpmailer/vendor/phpmailer/phpmailer/src/OAuth.php
index c1d5b776..a7e95886 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/src/OAuth.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/src/OAuth.php
@@ -13,7 +13,7 @@
  * @copyright 2012 - 2020 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
- * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @license   https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License
  * @note      This program is distributed in the hope that it will be useful - WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.
@@ -29,7 +29,7 @@ use League\OAuth2\Client\Token\AccessToken;
  * OAuth - OAuth2 authentication wrapper class.
  * Uses the oauth2-client package from the League of Extraordinary Packages.
  *
- * @see     http://oauth2-client.thephpleague.com
+ * @see     https://oauth2-client.thephpleague.com
  *
  * @author  Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
  */
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php b/phpmailer/vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php
index 11555074..cbda1a12 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php
@@ -13,7 +13,7 @@
  * @copyright 2012 - 2020 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
- * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @license   https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License
  * @note      This program is distributed in the hope that it will be useful - WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/PHPMailer.php b/phpmailer/vendor/phpmailer/phpmailer/src/PHPMailer.php
index ba4bcd47..2444bcf3 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/src/PHPMailer.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/src/PHPMailer.php
@@ -13,7 +13,7 @@
  * @copyright 2012 - 2020 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
- * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @license   https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License
  * @note      This program is distributed in the hope that it will be useful - WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.
@@ -152,8 +152,7 @@ class PHPMailer
      * Only supported in simple alt or alt_inline message types
      * To generate iCal event structures, use classes like EasyPeasyICS or iCalcreator.
      *
-     * @see http://sprain.ch/blog/downloads/php-class-easypeasyics-create-ical-files-with-php/
-     * @see http://kigkonsult.se/iCalcreator/
+     * @see https://kigkonsult.se/iCalcreator/
      *
      * @var string
      */
@@ -254,7 +253,7 @@ class PHPMailer
      * You can set your own, but it must be in the format "<id@domain>",
      * as defined in RFC5322 section 3.6.4 or it will be ignored.
      *
-     * @see https://tools.ietf.org/html/rfc5322#section-3.6.4
+     * @see https://www.rfc-editor.org/rfc/rfc5322#section-3.6.4
      *
      * @var string
      */
@@ -358,7 +357,7 @@ class PHPMailer
     public $AuthType = '';
 
     /**
-     * SMTP SMTPXClient command attibutes
+     * SMTP SMTPXClient command attributes
      *
      * @var array
      */
@@ -388,7 +387,7 @@ class PHPMailer
      * 'DELAY'   will notify you if there is an unusual delay in delivery, but the actual
      *           delivery's outcome (success or failure) is not yet decided.
      *
-     * @see https://tools.ietf.org/html/rfc3461 See section 4.1 for more information about NOTIFY
+     * @see https://www.rfc-editor.org/rfc/rfc3461.html#section-4.1 for more information about NOTIFY
      */
     public $dsn = '';
 
@@ -468,7 +467,7 @@ class PHPMailer
      * Only applicable when sending via SMTP.
      *
      * @see https://en.wikipedia.org/wiki/Variable_envelope_return_path
-     * @see http://www.postfix.org/VERP_README.html Postfix VERP info
+     * @see https://www.postfix.org/VERP_README.html Postfix VERP info
      *
      * @var bool
      */
@@ -551,10 +550,10 @@ class PHPMailer
      * The function that handles the result of the send email action.
      * It is called out by send() for each email sent.
      *
-     * Value can be any php callable: http://www.php.net/is_callable
+     * Value can be any php callable: https://www.php.net/is_callable
      *
      * Parameters:
-     *   bool $result        result of the send action
+     *   bool $result           result of the send action
      *   array   $to            email addresses of the recipients
      *   array   $cc            cc email addresses
      *   array   $bcc           bcc email addresses
@@ -581,6 +580,10 @@ class PHPMailer
      * May be a callable to inject your own validator, but there are several built-in validators.
      * The default validator uses PHP's FILTER_VALIDATE_EMAIL filter_var option.
      *
+     * If CharSet is UTF8, the validator is left at the default value,
+     * and you send to addresses that use non-ASCII local parts, then
+     * PHPMailer automatically changes to the 'eai' validator.
+     *
      * @see PHPMailer::validateAddress()
      *
      * @var string|callable
@@ -660,6 +663,14 @@ class PHPMailer
      */
     protected $ReplyToQueue = [];
 
+    /**
+     * Whether the need for SMTPUTF8 has been detected. Set by
+     * preSend() if necessary.
+     *
+     * @var bool
+     */
+    public $UseSMTPUTF8 = false;
+
     /**
      * The array of attachments.
      *
@@ -757,7 +768,7 @@ class PHPMailer
      *
      * @var string
      */
-    const VERSION = '6.9.1';
+    const VERSION = '6.10.0';
 
     /**
      * Error severity: message only, continue processing.
@@ -903,7 +914,7 @@ class PHPMailer
         }
         //Is this a PSR-3 logger?
         if ($this->Debugoutput instanceof \Psr\Log\LoggerInterface) {
-            $this->Debugoutput->debug($str);
+            $this->Debugoutput->debug(rtrim($str, "\r\n"));
 
             return;
         }
@@ -1072,7 +1083,7 @@ class PHPMailer
      * be modified after calling this function), addition of such addresses is delayed until send().
      * Addresses that have been added already return false, but do not throw exceptions.
      *
-     * @param string $kind    One of 'to', 'cc', 'bcc', or 'ReplyTo'
+     * @param string $kind    One of 'to', 'cc', 'bcc', or 'Reply-To'
      * @param string $address The email address
      * @param string $name    An optional username associated with the address
      *
@@ -1111,19 +1122,22 @@ class PHPMailer
         $params = [$kind, $address, $name];
         //Enqueue addresses with IDN until we know the PHPMailer::$CharSet.
         //Domain is assumed to be whatever is after the last @ symbol in the address
-        if (static::idnSupported() && $this->has8bitChars(substr($address, ++$pos))) {
-            if ('Reply-To' !== $kind) {
-                if (!array_key_exists($address, $this->RecipientsQueue)) {
-                    $this->RecipientsQueue[$address] = $params;
+        if ($this->has8bitChars(substr($address, ++$pos))) {
+            if (static::idnSupported()) {
+                if ('Reply-To' !== $kind) {
+                    if (!array_key_exists($address, $this->RecipientsQueue)) {
+                        $this->RecipientsQueue[$address] = $params;
+
+                        return true;
+                    }
+                } elseif (!array_key_exists($address, $this->ReplyToQueue)) {
+                    $this->ReplyToQueue[$address] = $params;
 
                     return true;
                 }
-            } elseif (!array_key_exists($address, $this->ReplyToQueue)) {
-                $this->ReplyToQueue[$address] = $params;
-
-                return true;
             }
-
+            //We have an 8-bit domain, but we are missing the necessary extensions to support it
+            //Or we are already sending to this address
             return false;
         }
 
@@ -1161,6 +1175,15 @@ class PHPMailer
      */
     protected function addAnAddress($kind, $address, $name = '')
     {
+        if (
+            self::$validator === 'php' &&
+            ((bool) preg_match('/[\x80-\xFF]/', $address))
+        ) {
+            //The caller has not altered the validator and is sending to an address
+            //with UTF-8, so assume that they want UTF-8 support instead of failing
+            $this->CharSet = self::CHARSET_UTF8;
+            self::$validator = 'eai';
+        }
         if (!in_array($kind, ['to', 'cc', 'bcc', 'Reply-To'])) {
             $error_message = sprintf(
                 '%s: %s',
@@ -1212,7 +1235,7 @@ class PHPMailer
      * Uses the imap_rfc822_parse_adrlist function if the IMAP extension is available.
      * Note that quotes in the name part are removed.
      *
-     * @see http://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation
+     * @see https://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation
      *
      * @param string $addrstr The address list string
      * @param bool   $useimap Whether to use the IMAP extension to parse the list
@@ -1363,6 +1386,7 @@ class PHPMailer
      * * `pcre` Use old PCRE implementation;
      * * `php` Use PHP built-in FILTER_VALIDATE_EMAIL;
      * * `html5` Use the pattern given by the HTML5 spec for 'email' type form input elements.
+     * * `eai` Use a pattern similar to the HTML5 spec for 'email' and to firefox, extended to support EAI (RFC6530).
      * * `noregex` Don't use a regex: super fast, really dumb.
      * Alternatively you may pass in a callable to inject your own validator, for example:
      *
@@ -1407,7 +1431,6 @@ class PHPMailer
                  *  * IPv6 literals: 'first.last@[IPv6:a1::]'
                  * Not all of these will necessarily work for sending!
                  *
-                 * @see       http://squiloople.com/2009/12/20/email-address-validation/
                  * @copyright 2009-2010 Michael Rushton
                  * Feel free to use and redistribute this code. But please keep this copyright notice.
                  */
@@ -1434,6 +1457,24 @@ class PHPMailer
                     '[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/sD',
                     $address
                 );
+            case 'eai':
+                /*
+                 * This is the pattern used in the HTML5 spec for validation of 'email' type
+                 * form input elements (as above), modified to accept Unicode email addresses.
+                 * This is also more lenient than Firefox' html5 spec, in order to make the regex faster.
+                 * 'eai' is an acronym for Email Address Internationalization.
+                 * This validator is selected automatically if you attempt to use recipient addresses
+                 * that contain Unicode characters in the local part.
+                 *
+                 * @see https://html.spec.whatwg.org/#e-mail-state-(type=email)
+                 * @see https://en.wikipedia.org/wiki/International_email
+                 */
+                return (bool) preg_match(
+                    '/^[-\p{L}\p{N}\p{M}.!#$%&\'*+\/=?^_`{|}~]+@[\p{L}\p{N}\p{M}](?:[\p{L}\p{N}\p{M}-]{0,61}' .
+                    '[\p{L}\p{N}\p{M}])?(?:\.[\p{L}\p{N}\p{M}]' .
+                    '(?:[-\p{L}\p{N}\p{M}]{0,61}[\p{L}\p{N}\p{M}])?)*$/usD',
+                    $address
+                );
             case 'php':
             default:
                 return filter_var($address, FILTER_VALIDATE_EMAIL) !== false;
@@ -1567,9 +1608,26 @@ class PHPMailer
             $this->error_count = 0; //Reset errors
             $this->mailHeader = '';
 
+            //The code below tries to support full use of Unicode,
+            //while remaining compatible with legacy SMTP servers to
+            //the greatest degree possible: If the message uses
+            //Unicode in the local parts of any addresses, it is sent
+            //using SMTPUTF8. If not, it it sent using
+            //punycode-encoded domains and plain SMTP.
+            if (
+                static::CHARSET_UTF8 === strtolower($this->CharSet) &&
+                ($this->anyAddressHasUnicodeLocalPart($this->RecipientsQueue) ||
+                 $this->anyAddressHasUnicodeLocalPart(array_keys($this->all_recipients)) ||
+                 $this->anyAddressHasUnicodeLocalPart($this->ReplyToQueue) ||
+                 $this->addressHasUnicodeLocalPart($this->From))
+            ) {
+                $this->UseSMTPUTF8 = true;
+            }
             //Dequeue recipient and Reply-To addresses with IDN
             foreach (array_merge($this->RecipientsQueue, $this->ReplyToQueue) as $params) {
-                $params[1] = $this->punyencodeAddress($params[1]);
+                if (!$this->UseSMTPUTF8) {
+                    $params[1] = $this->punyencodeAddress($params[1]);
+                }
                 call_user_func_array([$this, 'addAnAddress'], $params);
             }
             if (count($this->to) + count($this->cc) + count($this->bcc) < 1) {
@@ -1734,9 +1792,8 @@ class PHPMailer
         //This sets the SMTP envelope sender which gets turned into a return-path header by the receiver
         //A space after `-f` is optional, but there is a long history of its presence
         //causing problems, so we don't use one
-        //Exim docs: http://www.exim.org/exim-html-current/doc/html/spec_html/ch-the_exim_command_line.html
-        //Sendmail docs: http://www.sendmail.org/~ca/email/man/sendmail.html
-        //Qmail docs: http://www.qmail.org/man/man8/qmail-inject.html
+        //Exim docs: https://www.exim.org/exim-html-current/doc/html/spec_html/ch-the_exim_command_line.html
+        //Sendmail docs: https://www.sendmail.org/~ca/email/man/sendmail.html
         //Example problem: https://www.drupal.org/node/1057954
 
         //PHP 5.6 workaround
@@ -1874,7 +1931,7 @@ class PHPMailer
      */
     protected static function isPermittedPath($path)
     {
-        //Matches scheme definition from https://tools.ietf.org/html/rfc3986#section-3.1
+        //Matches scheme definition from https://www.rfc-editor.org/rfc/rfc3986#section-3.1
         return !preg_match('#^[a-z][a-z\d+.-]*://#i', $path);
     }
 
@@ -1901,7 +1958,7 @@ class PHPMailer
     /**
      * Send mail using the PHP mail() function.
      *
-     * @see http://www.php.net/manual/en/book.mail.php
+     * @see https://www.php.net/manual/en/book.mail.php
      *
      * @param string $header The message headers
      * @param string $body   The message body
@@ -1931,9 +1988,8 @@ class PHPMailer
         //This sets the SMTP envelope sender which gets turned into a return-path header by the receiver
         //A space after `-f` is optional, but there is a long history of its presence
         //causing problems, so we don't use one
-        //Exim docs: http://www.exim.org/exim-html-current/doc/html/spec_html/ch-the_exim_command_line.html
-        //Sendmail docs: http://www.sendmail.org/~ca/email/man/sendmail.html
-        //Qmail docs: http://www.qmail.org/man/man8/qmail-inject.html
+        //Exim docs: https://www.exim.org/exim-html-current/doc/html/spec_html/ch-the_exim_command_line.html
+        //Sendmail docs: https://www.sendmail.org/~ca/email/man/sendmail.html
         //Example problem: https://www.drupal.org/node/1057954
         //CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
 
@@ -2062,6 +2118,11 @@ class PHPMailer
         if (!$this->smtpConnect($this->SMTPOptions)) {
             throw new Exception($this->lang('smtp_connect_failed'), self::STOP_CRITICAL);
         }
+        //If we have recipient addresses that need Unicode support,
+        //but the server doesn't support it, stop here
+        if ($this->UseSMTPUTF8 && !$this->smtp->getServerExt('SMTPUTF8')) {
+            throw new Exception($this->lang('no_smtputf8'), self::STOP_CRITICAL);
+        }
         //Sender already validated in preSend()
         if ('' === $this->Sender) {
             $smtp_from = $this->From;
@@ -2163,6 +2224,7 @@ class PHPMailer
         $this->smtp->setDebugLevel($this->SMTPDebug);
         $this->smtp->setDebugOutput($this->Debugoutput);
         $this->smtp->setVerp($this->do_verp);
+        $this->smtp->setSMTPUTF8($this->UseSMTPUTF8);
         if ($this->Host === null) {
             $this->Host = 'localhost';
         }
@@ -2360,6 +2422,7 @@ class PHPMailer
             'smtp_detail' => 'Detail: ',
             'smtp_error' => 'SMTP server error: ',
             'variable_set' => 'Cannot set or reset variable: ',
+            'no_smtputf8' => 'Server does not support SMTPUTF8 needed to send to Unicode addresses',
         ];
         if (empty($lang_path)) {
             //Calculate an absolute path so it can work if CWD is not here
@@ -2709,7 +2772,7 @@ class PHPMailer
         }
 
         //Only allow a custom message ID if it conforms to RFC 5322 section 3.6.4
-        //https://tools.ietf.org/html/rfc5322#section-3.6.4
+        //https://www.rfc-editor.org/rfc/rfc5322#section-3.6.4
         if (
             '' !== $this->MessageID &&
             preg_match(
@@ -2874,7 +2937,9 @@ class PHPMailer
         $bodyEncoding = $this->Encoding;
         $bodyCharSet = $this->CharSet;
         //Can we do a 7-bit downgrade?
-        if (static::ENCODING_8BIT === $bodyEncoding && !$this->has8bitChars($this->Body)) {
+        if ($this->UseSMTPUTF8) {
+            $bodyEncoding = static::ENCODING_8BIT;
+        } elseif (static::ENCODING_8BIT === $bodyEncoding && !$this->has8bitChars($this->Body)) {
             $bodyEncoding = static::ENCODING_7BIT;
             //All ISO 8859, Windows codepage and UTF-8 charsets are ascii compatible up to 7-bit
             $bodyCharSet = static::CHARSET_ASCII;
@@ -3511,7 +3576,8 @@ class PHPMailer
     /**
      * Encode a header value (not including its label) optimally.
      * Picks shortest of Q, B, or none. Result includes folding if needed.
-     * See RFC822 definitions for phrase, comment and text positions.
+     * See RFC822 definitions for phrase, comment and text positions,
+     * and RFC2047 for inline encodings.
      *
      * @param string $str      The header value to encode
      * @param string $position What context the string will be used in
@@ -3520,6 +3586,11 @@ class PHPMailer
      */
     public function encodeHeader($str, $position = 'text')
     {
+        $position = strtolower($position);
+        if ($this->UseSMTPUTF8 && !("comment" === $position)) {
+            return trim(static::normalizeBreaks($str));
+        }
+
         $matchcount = 0;
         switch (strtolower($position)) {
             case 'phrase':
@@ -3634,7 +3705,7 @@ class PHPMailer
      * without breaking lines within a character.
      * Adapted from a function by paravoid.
      *
-     * @see http://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283
+     * @see https://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283
      *
      * @param string $str       multi-byte text to wrap encode
      * @param string $linebreak string to use as linefeed/end-of-line
@@ -3690,7 +3761,7 @@ class PHPMailer
     /**
      * Encode a string using Q encoding.
      *
-     * @see http://tools.ietf.org/html/rfc2047#section-4.2
+     * @see https://www.rfc-editor.org/rfc/rfc2047#section-4.2
      *
      * @param string $str      the text to encode
      * @param string $position Where the text is going to be used, see the RFC for what that means
@@ -4184,7 +4255,7 @@ class PHPMailer
         if ('smtp' === $this->Mailer && null !== $this->smtp) {
             $lasterror = $this->smtp->getError();
             if (!empty($lasterror['error'])) {
-                $msg .= $this->lang('smtp_error') . $lasterror['error'];
+                $msg .= ' ' . $this->lang('smtp_error') . $lasterror['error'];
                 if (!empty($lasterror['detail'])) {
                     $msg .= ' ' . $this->lang('smtp_detail') . $lasterror['detail'];
                 }
@@ -4228,7 +4299,7 @@ class PHPMailer
             $result = $_SERVER['SERVER_NAME'];
         } elseif (function_exists('gethostname') && gethostname() !== false) {
             $result = gethostname();
-        } elseif (php_uname('n') !== false) {
+        } elseif (php_uname('n') !== '') {
             $result = php_uname('n');
         }
         if (!static::isValidHost($result)) {
@@ -4253,7 +4324,7 @@ class PHPMailer
             empty($host)
             || !is_string($host)
             || strlen($host) > 256
-            || !preg_match('/^([a-zA-Z\d.-]*|\[[a-fA-F\d:]+\])$/', $host)
+            || !preg_match('/^([a-z\d.-]*|\[[a-f\d:]+\])$/i', $host)
         ) {
             return false;
         }
@@ -4267,10 +4338,49 @@ class PHPMailer
             //Is it a valid IPv4 address?
             return filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false;
         }
-        //Is it a syntactically valid hostname (when embeded in a URL)?
-        return filter_var('http://' . $host, FILTER_VALIDATE_URL) !== false;
+        //Is it a syntactically valid hostname (when embedded in a URL)?
+        return filter_var('https://' . $host, FILTER_VALIDATE_URL) !== false;
     }
 
+    /**
+     * Check whether the supplied address uses Unicode in the local part.
+     *
+     * @return bool
+     */
+    protected function addressHasUnicodeLocalPart($address)
+    {
+        return (bool) preg_match('/[\x80-\xFF].*@/', $address);
+    }
+
+    /**
+     * Check whether any of the supplied addresses use Unicode in the local part.
+     *
+     * @return bool
+     */
+    protected function anyAddressHasUnicodeLocalPart($addresses)
+    {
+        foreach ($addresses as $address) {
+            if (is_array($address)) {
+                $address = $address[0];
+            }
+            if ($this->addressHasUnicodeLocalPart($address)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Check whether the message requires SMTPUTF8 based on what's known so far.
+     *
+     * @return bool
+     */
+    public function needsSMTPUTF8()
+    {
+        return $this->UseSMTPUTF8;
+    }
+
+
     /**
      * Get an error message in the current language.
      *
@@ -4679,7 +4789,7 @@ class PHPMailer
      * Multi-byte-safe pathinfo replacement.
      * Drop-in replacement for pathinfo(), but multibyte- and cross-platform-safe.
      *
-     * @see http://www.php.net/manual/en/function.pathinfo.php#107461
+     * @see https://www.php.net/manual/en/function.pathinfo.php#107461
      *
      * @param string     $path    A filename or path, does not need to exist as a file
      * @param int|string $options Either a PATHINFO_* constant,
@@ -4914,7 +5024,7 @@ class PHPMailer
      * Uses the 'relaxed' algorithm from RFC6376 section 3.4.2.
      * Canonicalized headers should *always* use CRLF, regardless of mailer setting.
      *
-     * @see https://tools.ietf.org/html/rfc6376#section-3.4.2
+     * @see https://www.rfc-editor.org/rfc/rfc6376#section-3.4.2
      *
      * @param string $signHeader Header
      *
@@ -4926,7 +5036,7 @@ class PHPMailer
         $signHeader = static::normalizeBreaks($signHeader, self::CRLF);
         //Unfold header lines
         //Note PCRE \s is too broad a definition of whitespace; RFC5322 defines it as `[ \t]`
-        //@see https://tools.ietf.org/html/rfc5322#section-2.2
+        //@see https://www.rfc-editor.org/rfc/rfc5322#section-2.2
         //That means this may break if you do something daft like put vertical tabs in your headers.
         $signHeader = preg_replace('/\r\n[ \t]+/', ' ', $signHeader);
         //Break headers out into an array
@@ -4958,7 +5068,7 @@ class PHPMailer
      * Uses the 'simple' algorithm from RFC6376 section 3.4.3.
      * Canonicalized bodies should *always* use CRLF, regardless of mailer setting.
      *
-     * @see https://tools.ietf.org/html/rfc6376#section-3.4.3
+     * @see https://www.rfc-editor.org/rfc/rfc6376#section-3.4.3
      *
      * @param string $body Message Body
      *
@@ -4994,7 +5104,7 @@ class PHPMailer
         $DKIMquery = 'dns/txt'; //Query method
         $DKIMtime = time();
         //Always sign these headers without being asked
-        //Recommended list from https://tools.ietf.org/html/rfc6376#section-5.4.1
+        //Recommended list from https://www.rfc-editor.org/rfc/rfc6376#section-5.4.1
         $autoSignHeaders = [
             'from',
             'to',
@@ -5100,7 +5210,7 @@ class PHPMailer
         }
         //The DKIM-Signature header is included in the signature *except for* the value of the `b` tag
         //which is appended after calculating the signature
-        //https://tools.ietf.org/html/rfc6376#section-3.5
+        //https://www.rfc-editor.org/rfc/rfc6376#section-3.5
         $dkimSignatureHeader = 'DKIM-Signature: v=1;' .
             ' d=' . $this->DKIM_domain . ';' .
             ' s=' . $this->DKIM_selector . ';' . static::$LE .
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/POP3.php b/phpmailer/vendor/phpmailer/phpmailer/src/POP3.php
index 7b25fdd7..1190a1e2 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/src/POP3.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/src/POP3.php
@@ -13,7 +13,7 @@
  * @copyright 2012 - 2020 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
- * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @license   https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License
  * @note      This program is distributed in the hope that it will be useful - WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.
@@ -46,7 +46,7 @@ class POP3
      *
      * @var string
      */
-    const VERSION = '6.9.1';
+    const VERSION = '6.10.0';
 
     /**
      * Default POP3 port number.
@@ -250,7 +250,9 @@ class POP3
 
         //On Windows this will raise a PHP Warning error if the hostname doesn't exist.
         //Rather than suppress it with @fsockopen, capture it cleanly instead
-        set_error_handler([$this, 'catchWarning']);
+        set_error_handler(function () {
+            call_user_func_array([$this, 'catchWarning'], func_get_args());
+        });
 
         if (false === $port) {
             $port = static::DEFAULT_PORT;
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/SMTP.php b/phpmailer/vendor/phpmailer/phpmailer/src/SMTP.php
index 1b5b0077..7226ee93 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/src/SMTP.php
+++ b/phpmailer/vendor/phpmailer/phpmailer/src/SMTP.php
@@ -13,7 +13,7 @@
  * @copyright 2012 - 2020 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
- * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @license   https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License
  * @note      This program is distributed in the hope that it will be useful - WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.
@@ -35,7 +35,7 @@ class SMTP
      *
      * @var string
      */
-    const VERSION = '6.9.1';
+    const VERSION = '6.10.0';
 
     /**
      * SMTP line break constant.
@@ -62,7 +62,7 @@ class SMTP
      * The maximum line length allowed by RFC 5321 section 4.5.3.1.6,
      * *excluding* a trailing CRLF break.
      *
-     * @see https://tools.ietf.org/html/rfc5321#section-4.5.3.1.6
+     * @see https://www.rfc-editor.org/rfc/rfc5321#section-4.5.3.1.6
      *
      * @var int
      */
@@ -72,7 +72,7 @@ class SMTP
      * The maximum line length allowed for replies in RFC 5321 section 4.5.3.1.5,
      * *including* a trailing CRLF line break.
      *
-     * @see https://tools.ietf.org/html/rfc5321#section-4.5.3.1.5
+     * @see https://www.rfc-editor.org/rfc/rfc5321#section-4.5.3.1.5
      *
      * @var int
      */
@@ -152,19 +152,28 @@ class SMTP
     /**
      * Whether to use VERP.
      *
-     * @see http://en.wikipedia.org/wiki/Variable_envelope_return_path
-     * @see http://www.postfix.org/VERP_README.html Info on VERP
+     * @see https://en.wikipedia.org/wiki/Variable_envelope_return_path
+     * @see https://www.postfix.org/VERP_README.html Info on VERP
      *
      * @var bool
      */
     public $do_verp = false;
 
+    /**
+     * Whether to use SMTPUTF8.
+     *
+     * @see https://www.rfc-editor.org/rfc/rfc6531
+     *
+     * @var bool
+     */
+    public $do_smtputf8 = false;
+
     /**
      * The timeout value for connection, in seconds.
      * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2.
      * This needs to be quite high to function correctly with hosts using greetdelay as an anti-spam measure.
      *
-     * @see http://tools.ietf.org/html/rfc2821#section-4.5.3.2
+     * @see https://www.rfc-editor.org/rfc/rfc2821#section-4.5.3.2
      *
      * @var int
      */
@@ -187,12 +196,12 @@ class SMTP
      */
     protected $smtp_transaction_id_patterns = [
         'exim' => '/[\d]{3} OK id=(.*)/',
-        'sendmail' => '/[\d]{3} 2.0.0 (.*) Message/',
-        'postfix' => '/[\d]{3} 2.0.0 Ok: queued as (.*)/',
-        'Microsoft_ESMTP' => '/[0-9]{3} 2.[\d].0 (.*)@(?:.*) Queued mail for delivery/',
+        'sendmail' => '/[\d]{3} 2\.0\.0 (.*) Message/',
+        'postfix' => '/[\d]{3} 2\.0\.0 Ok: queued as (.*)/',
+        'Microsoft_ESMTP' => '/[0-9]{3} 2\.[\d]\.0 (.*)@(?:.*) Queued mail for delivery/',
         'Amazon_SES' => '/[\d]{3} Ok (.*)/',
         'SendGrid' => '/[\d]{3} Ok: queued as (.*)/',
-        'CampaignMonitor' => '/[\d]{3} 2.0.0 OK:([a-zA-Z\d]{48})/',
+        'CampaignMonitor' => '/[\d]{3} 2\.0\.0 OK:([a-zA-Z\d]{48})/',
         'Haraka' => '/[\d]{3} Message Queued \((.*)\)/',
         'ZoneMTA' => '/[\d]{3} Message queued as (.*)/',
         'Mailjet' => '/[\d]{3} OK queued as (.*)/',
@@ -280,7 +289,8 @@ class SMTP
         }
         //Is this a PSR-3 logger?
         if ($this->Debugoutput instanceof \Psr\Log\LoggerInterface) {
-            $this->Debugoutput->debug($str);
+            //Remove trailing line breaks potentially added by calls to SMTP::client_send()
+            $this->Debugoutput->debug(rtrim($str, "\r\n"));
 
             return;
         }
@@ -293,6 +303,7 @@ class SMTP
         switch ($this->Debugoutput) {
             case 'error_log':
                 //Don't output, just log
+                /** @noinspection ForgottenDebugOutputInspection */
                 error_log($str);
                 break;
             case 'html':
@@ -371,7 +382,7 @@ class SMTP
         }
         //Anything other than a 220 response means something went wrong
         //RFC 5321 says the server will wait for us to send a QUIT in response to a 554 error
-        //https://tools.ietf.org/html/rfc5321#section-3.1
+        //https://www.rfc-editor.org/rfc/rfc5321#section-3.1
         if ($responseCode === 554) {
             $this->quit();
         }
@@ -404,7 +415,9 @@ class SMTP
         $errstr = '';
         if ($streamok) {
             $socket_context = stream_context_create($options);
-            set_error_handler([$this, 'errorHandler']);
+            set_error_handler(function () {
+                call_user_func_array([$this, 'errorHandler'], func_get_args());
+            });
             $connection = stream_socket_client(
                 $host . ':' . $port,
                 $errno,
@@ -419,7 +432,9 @@ class SMTP
                 'Connection: stream_socket_client not available, falling back to fsockopen',
                 self::DEBUG_CONNECTION
             );
-            set_error_handler([$this, 'errorHandler']);
+            set_error_handler(function () {
+                call_user_func_array([$this, 'errorHandler'], func_get_args());
+            });
             $connection = fsockopen(
                 $host,
                 $port,
@@ -483,7 +498,9 @@ class SMTP
         }
 
         //Begin encrypted connection
-        set_error_handler([$this, 'errorHandler']);
+            set_error_handler(function () {
+                call_user_func_array([$this, 'errorHandler'], func_get_args());
+            });
         $crypto_ok = stream_socket_enable_crypto(
             $this->smtp_conn,
             true,
@@ -574,7 +591,7 @@ class SMTP
                 }
                 //Send encoded username and password
                 if (
-                    //Format from https://tools.ietf.org/html/rfc4616#section-2
+                    //Format from https://www.rfc-editor.org/rfc/rfc4616#section-2
                     //We skip the first field (it's forgery), so the string starts with a null byte
                     !$this->sendCommand(
                         'User & Password',
@@ -648,7 +665,7 @@ class SMTP
         }
 
         //The following borrowed from
-        //http://php.net/manual/en/function.mhash.php#27225
+        //https://www.php.net/manual/en/function.mhash.php#27225
 
         //RFC 2104 HMAC implementation for php.
         //Creates an md5 HMAC.
@@ -787,7 +804,7 @@ class SMTP
             //Send the lines to the server
             foreach ($lines_out as $line_out) {
                 //Dot-stuffing as per RFC5321 section 4.5.2
-                //https://tools.ietf.org/html/rfc5321#section-4.5.2
+                //https://www.rfc-editor.org/rfc/rfc5321#section-4.5.2
                 if (!empty($line_out) && $line_out[0] === '.') {
                     $line_out = '.' . $line_out;
                 }
@@ -905,7 +922,15 @@ class SMTP
      * $from. Returns true if successful or false otherwise. If True
      * the mail transaction is started and then one or more recipient
      * commands may be called followed by a data command.
-     * Implements RFC 821: MAIL <SP> FROM:<reverse-path> <CRLF>.
+     * Implements RFC 821: MAIL <SP> FROM:<reverse-path> <CRLF> and
+     * two extensions, namely XVERP and SMTPUTF8.
+     *
+     * The server's EHLO response is not checked. If use of either
+     * extensions is enabled even though the server does not support
+     * that, mail submission will fail.
+     *
+     * XVERP is documented at https://www.postfix.org/VERP_README.html
+     * and SMTPUTF8 is specified in RFC 6531.
      *
      * @param string $from Source address of this message
      *
@@ -914,10 +939,11 @@ class SMTP
     public function mail($from)
     {
         $useVerp = ($this->do_verp ? ' XVERP' : '');
+        $useSmtputf8 = ($this->do_smtputf8 ? ' SMTPUTF8' : '');
 
         return $this->sendCommand(
             'MAIL FROM',
-            'MAIL FROM:<' . $from . '>' . $useVerp,
+            'MAIL FROM:<' . $from . '>' . $useSmtputf8 . $useVerp,
             250
         );
     }
@@ -1162,7 +1188,9 @@ class SMTP
         } else {
             $this->edebug('CLIENT -> SERVER: ' . $data, self::DEBUG_CLIENT);
         }
-        set_error_handler([$this, 'errorHandler']);
+        set_error_handler(function () {
+            call_user_func_array([$this, 'errorHandler'], func_get_args());
+        });
         $result = fwrite($this->smtp_conn, $data);
         restore_error_handler();
 
@@ -1265,7 +1293,9 @@ class SMTP
         while (is_resource($this->smtp_conn) && !feof($this->smtp_conn)) {
             //Must pass vars in here as params are by reference
             //solution for signals inspired by https://github.com/symfony/symfony/pull/6540
-            set_error_handler([$this, 'errorHandler']);
+            set_error_handler(function () {
+                call_user_func_array([$this, 'errorHandler'], func_get_args());
+            });
             $n = stream_select($selR, $selW, $selW, $this->Timelimit);
             restore_error_handler();
 
@@ -1352,6 +1382,26 @@ class SMTP
         return $this->do_verp;
     }
 
+    /**
+     * Enable or disable use of SMTPUTF8.
+     *
+     * @param bool $enabled
+     */
+    public function setSMTPUTF8($enabled = false)
+    {
+        $this->do_smtputf8 = $enabled;
+    }
+
+    /**
+     * Get SMTPUTF8 use.
+     *
+     * @return bool
+     */
+    public function getSMTPUTF8()
+    {
+        return $this->do_smtputf8;
+    }
+
     /**
      * Set error messages and codes.
      *

From b39ab36cee46dfd59f41e9fda3d4c152ff156540 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 29 Jul 2025 21:23:57 +0000
Subject: [PATCH 293/294] Issue 15048: Support addon filters via API

---
 advancedcontentfilter/advancedcontentfilter.php |  9 +++++----
 langfilter/langfilter.php                       | 14 +++++++-------
 nsfw/nsfw.php                                   |  7 ++++---
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index aeeff77c..d19cd9df 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -120,21 +120,22 @@ function advancedcontentfilter_prepare_body_content_filter(&$hook_data)
 		$expressionLanguage = new ExpressionLanguage\ExpressionLanguage();
 	}
 
-	if (!DI::userSession()->getLocalUserId()) {
+	$uid = $hook_data['uid'] ?: DI::userSession()->getLocalUserId();
+	if (!$uid) {
 		return;
 	}
 
 	$vars = advancedcontentfilter_get_filter_fields($hook_data['item']);
 
-	$rules = DI::cache()->get('rules_' . DI::userSession()->getLocalUserId());
+	$rules = DI::cache()->get('rules_' . $uid);
 	if (!isset($rules)) {
 		$rules = DBA::toArray(DBA::select(
 			'advancedcontentfilter_rules',
 			['name', 'expression', 'serialized'],
-			['uid' => DI::userSession()->getLocalUserId(), 'active' => true]
+			['uid' => $uid, 'active' => true]
 		));
 
-		DI::cache()->set('rules_' . DI::userSession()->getLocalUserId(), $rules);
+		DI::cache()->set('rules_' . $uid, $rules);
 	}
 
 	if ($rules) {
diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php
index 2bf986f0..82ec244b 100644
--- a/langfilter/langfilter.php
+++ b/langfilter/langfilter.php
@@ -99,8 +99,8 @@ function langfilter_addon_settings_post(array &$b)
 
 function langfilter_prepare_body_content_filter(&$hook_data)
 {
-	$logged_user = DI::userSession()->getLocalUserId();
-	if (!$logged_user) {
+	$uid = $hook_data['uid'] ?: DI::userSession()->getLocalUserId();
+	if (!$uid) {
 		return;
 	}
 
@@ -112,8 +112,8 @@ function langfilter_prepare_body_content_filter(&$hook_data)
 	}
 
 	// Don't filter if language filter is disabled
-	if (!DI::pConfig()->get($logged_user, 'langfilter', 'enable',
-		!DI::pConfig()->get($logged_user, 'langfilter', 'disable'))
+	if (!DI::pConfig()->get($uid, 'langfilter', 'enable',
+		!DI::pConfig()->get($uid, 'langfilter', 'disable'))
 	) {
 		return;
 	}
@@ -127,7 +127,7 @@ function langfilter_prepare_body_content_filter(&$hook_data)
 	$naked_body = preg_replace('#\s+#', ' ', trim($naked_body));
 
 	// Don't filter if body lenght is below minimum
-	$minlen = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'minlength', 32);
+	$minlen = DI::pConfig()->get($uid, 'langfilter', 'minlength', 32);
 	if (!$minlen) {
 		$minlen = 32;
 	}
@@ -136,8 +136,8 @@ function langfilter_prepare_body_content_filter(&$hook_data)
 		return;
 	}
 
-	$read_languages_string = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'languages');
-	$minconfidence = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'minconfidence');
+	$read_languages_string = DI::pConfig()->get($uid, 'langfilter', 'languages');
+	$minconfidence = DI::pConfig()->get($uid, 'langfilter', 'minconfidence');
 
 	// Don't filter if no spoken languages are configured
 	if (!$read_languages_string) {
diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index 674fc201..1479b477 100644
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -104,12 +104,13 @@ function nsfw_addon_settings_post(array &$b)
 function nsfw_prepare_body_content_filter(&$hook_data)
 {
 	$words = null;
-	if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'nsfw', 'disable')) {
+	$uid = $hook_data['uid'] ?: DI::userSession()->getLocalUserId();
+	if (DI::pConfig()->get($uid, 'nsfw', 'disable')) {
 		return;
 	}
 
-	if (DI::userSession()->getLocalUserId()) {
-		$words = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'nsfw', 'words');
+	if ($uid) {
+		$words = DI::pConfig()->get($uid, 'nsfw', 'words');
 	}
 
 	if ($words) {

From 1cc54a83a9192db34466771984d80945234cd837 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 4 Aug 2025 20:48:06 +0000
Subject: [PATCH 294/294] Fix several warnings

---
 advancedcontentfilter/advancedcontentfilter.php | 2 +-
 langfilter/langfilter.php                       | 2 +-
 nsfw/nsfw.php                                   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index d19cd9df..53cb9ebe 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -120,7 +120,7 @@ function advancedcontentfilter_prepare_body_content_filter(&$hook_data)
 		$expressionLanguage = new ExpressionLanguage\ExpressionLanguage();
 	}
 
-	$uid = $hook_data['uid'] ?: DI::userSession()->getLocalUserId();
+	$uid = $hook_data['uid'] ?? DI::userSession()->getLocalUserId();
 	if (!$uid) {
 		return;
 	}
diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php
index 82ec244b..3a202fcd 100644
--- a/langfilter/langfilter.php
+++ b/langfilter/langfilter.php
@@ -99,7 +99,7 @@ function langfilter_addon_settings_post(array &$b)
 
 function langfilter_prepare_body_content_filter(&$hook_data)
 {
-	$uid = $hook_data['uid'] ?: DI::userSession()->getLocalUserId();
+	$uid = $hook_data['uid'] ?? DI::userSession()->getLocalUserId();
 	if (!$uid) {
 		return;
 	}
diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index 1479b477..37d34d7d 100644
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -104,7 +104,7 @@ function nsfw_addon_settings_post(array &$b)
 function nsfw_prepare_body_content_filter(&$hook_data)
 {
 	$words = null;
-	$uid = $hook_data['uid'] ?: DI::userSession()->getLocalUserId();
+	$uid = $hook_data['uid'] ?? DI::userSession()->getLocalUserId();
 	if (DI::pConfig()->get($uid, 'nsfw', 'disable')) {
 		return;
 	}
@@ -137,10 +137,10 @@ function nsfw_prepare_body_content_filter(&$hook_data)
 					break;
 				case '#': // Hashtag-only search
 					$tag_search = true;
-					$found = nsfw_find_word_in_item_tags($hook_data['item']['hashtags'], substr($word, 1));
+					$found = nsfw_find_word_in_item_tags($hook_data['item']['hashtags'] ?? [], substr($word, 1));
 					break;
 				default:
-					$found = strpos($body, $word) !== false || nsfw_find_word_in_item_tags($hook_data['item']['tags'], $word);
+					$found = strpos($body, $word) !== false || nsfw_find_word_in_item_tags($hook_data['item']['tags'] ?? [], $word);
 					break;
 			}