diff --git a/composer.json b/composer.json
index 1cb791ae..0621a3cb 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,7 @@
 
 	"require-dev" : {
 		"phpunit/phpunit" : "^9.0",
-		"friendsofphp/php-cs-fixer" : "^3.4"
+		"friendsofphp/php-cs-fixer" : "^3.12"
 	},
 	"suggest": {
 		"ext-memcache": "memcache caching",
diff --git a/composer.lock b/composer.lock
index b5bd335a..c66147f8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7fa1634834197de7e5325d494f20278e",
+    "content-hash": "1defc6707b75497831fd6281035c721c",
     "packages": [
         {
             "name": "bower-asset/jquery",
@@ -50,7 +50,7 @@
             "version": "v2.2.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/js-cookie/js-cookie.git",
+                "url": "git@github.com:js-cookie/js-cookie.git",
                 "reference": "54962f884e9ae33f93e13ac903ffaf1d5a523598"
             },
             "dist": {
@@ -119,16 +119,16 @@
         },
         {
             "name": "enshrined/svg-sanitize",
-            "version": "0.15.0",
+            "version": "0.15.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/darylldoyle/svg-sanitizer.git",
-                "reference": "17e12ba9c2881caa6b167d0fbea555c11207fbb0"
+                "reference": "e50b83a2f1f296ca61394fe88fbfe3e896a84cf4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/17e12ba9c2881caa6b167d0fbea555c11207fbb0",
-                "reference": "17e12ba9c2881caa6b167d0fbea555c11207fbb0",
+                "url": "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/e50b83a2f1f296ca61394fe88fbfe3e896a84cf4",
+                "reference": "e50b83a2f1f296ca61394fe88fbfe3e896a84cf4",
                 "shasum": ""
             },
             "require": {
@@ -137,7 +137,6 @@
                 "php": "^7.0 || ^8.0"
             },
             "require-dev": {
-                "codeclimate/php-test-reporter": "^0.1.2",
                 "phpunit/phpunit": "^6.5 || ^8.5"
             },
             "type": "library",
@@ -159,9 +158,9 @@
             "description": "An SVG sanitizer for PHP",
             "support": {
                 "issues": "https://github.com/darylldoyle/svg-sanitizer/issues",
-                "source": "https://github.com/darylldoyle/svg-sanitizer/tree/0.15.0"
+                "source": "https://github.com/darylldoyle/svg-sanitizer/tree/0.15.4"
             },
-            "time": "2022-02-13T00:42:56+00:00"
+            "time": "2022-02-21T09:13:59+00:00"
         },
         {
             "name": "flexihash/flexihash",
@@ -488,27 +487,27 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "1bbc34bff31a65639963abbda90ce220e783cb2b"
+                "reference": "3c1d8cab02839e7d1b342ce9c73a391f1c23ab85"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/1bbc34bff31a65639963abbda90ce220e783cb2b",
-                "reference": "1bbc34bff31a65639963abbda90ce220e783cb2b",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/3c1d8cab02839e7d1b342ce9c73a391f1c23ab85",
+                "reference": "3c1d8cab02839e7d1b342ce9c73a391f1c23ab85",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.2 || ^7.0 || ^8.0"
+                "php": "^7.4 || ^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1",
+                "phpstan/phpstan": "^1.3",
                 "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
+                "symfony/phpunit-bridge": "^5"
             },
             "default-branch": true,
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.x-dev"
+                    "dev-main": "3.x-dev"
                 }
             },
             "autoload": {
@@ -552,7 +551,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-06T20:05:46+00:00"
+            "time": "2022-06-23T12:35:40+00:00"
         },
         {
             "name": "composer/semver",
@@ -560,19 +559,19 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "83e511e247de329283478496f7a1e114c9517506"
+                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/83e511e247de329283478496f7a1e114c9517506",
-                "reference": "83e511e247de329283478496f7a1e114c9517506",
+                "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9",
+                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.2 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^0.12.54",
+                "phpstan/phpstan": "^1.4",
                 "symfony/phpunit-bridge": "^4.2 || ^5"
             },
             "default-branch": true,
@@ -618,7 +617,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.2.6"
+                "source": "https://github.com/composer/semver/tree/3.3.2"
             },
             "funding": [
                 {
@@ -634,31 +633,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-25T11:34:17+00:00"
+            "time": "2022-04-01T19:23:25+00:00"
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "2.0.3",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "6555461e76962fd0379c444c46fd558a0fcfb65e"
+                "reference": "ced299686f41dce890debac69273b47ffe98a40c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6555461e76962fd0379c444c46fd558a0fcfb65e",
-                "reference": "6555461e76962fd0379c444c46fd558a0fcfb65e",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c",
+                "reference": "ced299686f41dce890debac69273b47ffe98a40c",
                 "shasum": ""
             },
             "require": {
-                "composer/pcre": "^1",
-                "php": "^5.3.2 || ^7.0 || ^8.0",
+                "composer/pcre": "^1 || ^2 || ^3",
+                "php": "^7.2.5 || ^8.0",
                 "psr/log": "^1 || ^2 || ^3"
             },
             "require-dev": {
                 "phpstan/phpstan": "^1.0",
                 "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0"
+                "symfony/phpunit-bridge": "^6.0"
             },
             "type": "library",
             "autoload": {
@@ -684,7 +683,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/2.0.3"
+                "source": "https://github.com/composer/xdebug-handler/tree/3.0.3"
             },
             "funding": [
                 {
@@ -700,7 +699,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-08T13:07:32+00:00"
+            "time": "2022-02-25T21:32:43+00:00"
         },
         {
             "name": "doctrine/annotations",
@@ -708,12 +707,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/annotations.git",
-                "reference": "2da982ad3c26da81b91db8d7b54abf3a5922e73c"
+                "reference": "8708a312e86218d1e597bffbb1e4bbd5f04daa08"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/2da982ad3c26da81b91db8d7b54abf3a5922e73c",
-                "reference": "2da982ad3c26da81b91db8d7b54abf3a5922e73c",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/8708a312e86218d1e597bffbb1e4bbd5f04daa08",
+                "reference": "8708a312e86218d1e597bffbb1e4bbd5f04daa08",
                 "shasum": ""
             },
             "require": {
@@ -724,12 +723,15 @@
             },
             "require-dev": {
                 "doctrine/cache": "^1.11 || ^2.0",
-                "doctrine/coding-standard": "^6.0 || ^8.1",
-                "phpstan/phpstan": "^0.12.20",
-                "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5",
-                "symfony/cache": "^4.4 || ^5.2",
+                "doctrine/coding-standard": "^9 || ^10",
+                "phpstan/phpstan": "~1.4.10 || ^1.8.0",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "symfony/cache": "^4.4 || ^5.4 || ^6",
                 "vimeo/psalm": "^4.10"
             },
+            "suggest": {
+                "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations"
+            },
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -773,7 +775,7 @@
                 "issues": "https://github.com/doctrine/annotations/issues",
                 "source": "https://github.com/doctrine/annotations/tree/1.14.x"
             },
-            "time": "2021-10-15T21:17:00+00:00"
+            "time": "2022-10-12T16:24:37+00:00"
         },
         {
             "name": "doctrine/instantiator",
@@ -781,25 +783,26 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "6410c4b8352cb64218641457cef64997e6b784fb"
+                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/6410c4b8352cb64218641457cef64997e6b784fb",
-                "reference": "6410c4b8352cb64218641457cef64997e6b784fb",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc",
+                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^8.0",
+                "doctrine/coding-standard": "^9",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpbench/phpbench": "^0.13 || 1.0.0-alpha2",
-                "phpstan/phpstan": "^0.12",
-                "phpstan/phpstan-phpunit": "^0.12",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
+                "phpbench/phpbench": "^0.16 || ^1",
+                "phpstan/phpstan": "^1.4",
+                "phpstan/phpstan-phpunit": "^1",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "vimeo/psalm": "^4.22"
             },
             "type": "library",
             "autoload": {
@@ -842,7 +845,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-11-10T19:05:51+00:00"
+            "time": "2022-03-03T08:28:38+00:00"
         },
         {
             "name": "doctrine/lexer",
@@ -850,21 +853,22 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/lexer.git",
-                "reference": "59bfb3b9be04237be4cd1afea9bbb58794c25ce8"
+                "reference": "ff0bfc39c3cce1cc0aa69471235194c6f104384d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/59bfb3b9be04237be4cd1afea9bbb58794c25ce8",
-                "reference": "59bfb3b9be04237be4cd1afea9bbb58794c25ce8",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/ff0bfc39c3cce1cc0aa69471235194c6f104384d",
+                "reference": "ff0bfc39c3cce1cc0aa69471235194c6f104384d",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^8.0",
-                "phpstan/phpstan": "^0.12",
-                "phpunit/phpunit": "^8.2 || ^9.4"
+                "doctrine/coding-standard": "^9.0",
+                "phpstan/phpstan": "^1.3",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "vimeo/psalm": "^4.11"
             },
             "type": "library",
             "autoload": {
@@ -917,56 +921,56 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-20T07:15:06+00:00"
+            "time": "2022-02-28T11:12:09+00:00"
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.4.0",
+            "version": "v3.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "47177af1cfb9dab5d1cc4daf91b7179c2efe7fad"
+                "reference": "eae11d945e2885d86e1c080eec1bb30a2aa27998"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/47177af1cfb9dab5d1cc4daf91b7179c2efe7fad",
-                "reference": "47177af1cfb9dab5d1cc4daf91b7179c2efe7fad",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/eae11d945e2885d86e1c080eec1bb30a2aa27998",
+                "reference": "eae11d945e2885d86e1c080eec1bb30a2aa27998",
                 "shasum": ""
             },
             "require": {
                 "composer/semver": "^3.2",
-                "composer/xdebug-handler": "^2.0",
-                "doctrine/annotations": "^1.12",
+                "composer/xdebug-handler": "^3.0.3",
+                "doctrine/annotations": "^1.13",
                 "ext-json": "*",
                 "ext-tokenizer": "*",
-                "php": "^7.2.5 || ^8.0",
-                "php-cs-fixer/diff": "^2.0",
-                "symfony/console": "^4.4.20 || ^5.1.3 || ^6.0",
-                "symfony/event-dispatcher": "^4.4.20 || ^5.0 || ^6.0",
-                "symfony/filesystem": "^4.4.20 || ^5.0 || ^6.0",
-                "symfony/finder": "^4.4.20 || ^5.0 || ^6.0",
-                "symfony/options-resolver": "^4.4.20 || ^5.0 || ^6.0",
+                "php": "^7.4 || ^8.0",
+                "sebastian/diff": "^4.0",
+                "symfony/console": "^5.4 || ^6.0",
+                "symfony/event-dispatcher": "^5.4 || ^6.0",
+                "symfony/filesystem": "^5.4 || ^6.0",
+                "symfony/finder": "^5.4 || ^6.0",
+                "symfony/options-resolver": "^5.4 || ^6.0",
                 "symfony/polyfill-mbstring": "^1.23",
-                "symfony/polyfill-php80": "^1.23",
-                "symfony/polyfill-php81": "^1.23",
-                "symfony/process": "^4.4.20 || ^5.0 || ^6.0",
-                "symfony/stopwatch": "^4.4.20 || ^5.0 || ^6.0"
+                "symfony/polyfill-php80": "^1.25",
+                "symfony/polyfill-php81": "^1.25",
+                "symfony/process": "^5.4 || ^6.0",
+                "symfony/stopwatch": "^5.4 || ^6.0"
             },
             "require-dev": {
                 "justinrainbow/json-schema": "^5.2",
                 "keradus/cli-executor": "^1.5",
-                "mikey179/vfsstream": "^1.6.8",
+                "mikey179/vfsstream": "^1.6.10",
                 "php-coveralls/php-coveralls": "^2.5.2",
                 "php-cs-fixer/accessible-object": "^1.1",
                 "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
                 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1",
                 "phpspec/prophecy": "^1.15",
-                "phpspec/prophecy-phpunit": "^1.1 || ^2.0",
-                "phpunit/phpunit": "^8.5.21 || ^9.5",
-                "phpunitgoodpractices/polyfill": "^1.5",
-                "phpunitgoodpractices/traits": "^1.9.1",
-                "symfony/phpunit-bridge": "^5.2.4 || ^6.0",
-                "symfony/yaml": "^4.4.20 || ^5.0 || ^6.0"
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpunit/phpunit": "^9.5",
+                "phpunitgoodpractices/polyfill": "^1.6",
+                "phpunitgoodpractices/traits": "^1.9.2",
+                "symfony/phpunit-bridge": "^6.0",
+                "symfony/yaml": "^5.4 || ^6.0"
             },
             "suggest": {
                 "ext-dom": "For handling output formats in XML",
@@ -998,7 +1002,7 @@
             "description": "A tool to automatically fix PHP code style",
             "support": {
                 "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
-                "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.4.0"
+                "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.12.0"
             },
             "funding": [
                 {
@@ -1006,7 +1010,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-12-11T16:25:08+00:00"
+            "time": "2022-10-12T14:20:51+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -1014,34 +1018,35 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220"
+                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220",
-                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
+                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
-            "replace": {
-                "myclabs/deep-copy": "self.version"
+            "conflict": {
+                "doctrine/collections": "<1.6.8",
+                "doctrine/common": "<2.13.3 || >=3,<3.2.2"
             },
             "require-dev": {
-                "doctrine/collections": "^1.0",
-                "doctrine/common": "^2.6",
-                "phpunit/phpunit": "^7.1"
+                "doctrine/collections": "^1.6.8",
+                "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
             },
             "default-branch": true,
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "DeepCopy\\": "src/DeepCopy/"
-                },
                 "files": [
                     "src/DeepCopy/deep_copy.php"
-                ]
+                ],
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1057,7 +1062,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
             },
             "funding": [
                 {
@@ -1065,20 +1070,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-11-13T09:40:50+00:00"
+            "time": "2022-03-03T13:19:32+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.13.2",
+            "version": "4.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "210577fe3cf7badcc5814d99455df46564f3c077"
+                "reference": "2f1fd784fe5560675722a1e5cbbcece5f43bf3a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077",
-                "reference": "210577fe3cf7badcc5814d99455df46564f3c077",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/2f1fd784fe5560675722a1e5cbbcece5f43bf3a0",
+                "reference": "2f1fd784fe5560675722a1e5cbbcece5f43bf3a0",
                 "shasum": ""
             },
             "require": {
@@ -1119,9 +1124,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/4.x"
             },
-            "time": "2021-11-30T19:35:32+00:00"
+            "time": "2022-09-10T20:41:13+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -1129,16 +1134,17 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
+                "reference": "36d8a21e851a9512db2b086dc5ac2c61308f0138"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/36d8a21e851a9512db2b086dc5ac2c61308f0138",
+                "reference": "36d8a21e851a9512db2b086dc5ac2c61308f0138",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
+                "ext-libxml": "*",
                 "ext-phar": "*",
                 "ext-xmlwriter": "*",
                 "phar-io/version": "^3.0.1",
@@ -1180,22 +1186,28 @@
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
             "support": {
                 "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
+                "source": "https://github.com/phar-io/manifest/tree/master"
             },
-            "time": "2021-07-20T11:28:43+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-02-21T19:55:33+00:00"
         },
         {
             "name": "phar-io/version",
-            "version": "3.1.0",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/version.git",
-                "reference": "bae7c545bef187884426f042434e561ab1ddb182"
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182",
-                "reference": "bae7c545bef187884426f042434e561ab1ddb182",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
                 "shasum": ""
             },
             "require": {
@@ -1231,291 +1243,9 @@
             "description": "Library for handling version information and constraints",
             "support": {
                 "issues": "https://github.com/phar-io/version/issues",
-                "source": "https://github.com/phar-io/version/tree/3.1.0"
+                "source": "https://github.com/phar-io/version/tree/3.2.1"
             },
-            "time": "2021-02-23T14:00:09+00:00"
-        },
-        {
-            "name": "php-cs-fixer/diff",
-            "version": "v2.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PHP-CS-Fixer/diff.git",
-                "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/29dc0d507e838c4580d018bd8b5cb412474f7ec3",
-                "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0",
-                "symfony/process": "^3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                }
-            ],
-            "description": "sebastian/diff v3 backport support for PHP 5.6+",
-            "homepage": "https://github.com/PHP-CS-Fixer",
-            "keywords": [
-                "diff"
-            ],
-            "support": {
-                "issues": "https://github.com/PHP-CS-Fixer/diff/issues",
-                "source": "https://github.com/PHP-CS-Fixer/diff/tree/v2.0.2"
-            },
-            "time": "2020-10-14T08:32:19+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "a0eeab580cbdf4414fef6978732510a36ed0a9d6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/a0eeab580cbdf4414fef6978732510a36ed0a9d6",
-                "reference": "a0eeab580cbdf4414fef6978732510a36ed0a9d6",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/master"
-            },
-            "time": "2021-06-25T13:47:51+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
-                "shasum": ""
-            },
-            "require": {
-                "ext-filter": "*",
-                "php": "^7.2 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.2",
-                "phpdocumentor/type-resolver": "^1.3",
-                "webmozart/assert": "^1.9.1"
-            },
-            "require-dev": {
-                "mockery/mockery": "~1.3.2",
-                "psalm/phar": "^4.8"
-            },
-            "default-branch": true,
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                },
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "account@ijaap.nl"
-                }
-            ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0"
-            },
-            "time": "2021-10-19T17:43:47+00:00"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "1.x-dev",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "f8ec4ab631de5a97769e66b13418c3b8b24e81f4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/f8ec4ab631de5a97769e66b13418c3b8b24e81f4",
-                "reference": "f8ec4ab631de5a97769e66b13418c3b8b24e81f4",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.0"
-            },
-            "require-dev": {
-                "ext-tokenizer": "*",
-                "psalm/phar": "^4.8"
-            },
-            "default-branch": true,
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-1.x": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.x"
-            },
-            "time": "2021-11-24T08:29:39+00:00"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.2",
-                "php": "^7.2 || ~8.0, <8.2",
-                "phpdocumentor/reflection-docblock": "^5.2",
-                "sebastian/comparator": "^3.0 || ^4.0",
-                "sebastian/recursion-context": "^3.0 || ^4.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^6.0 || ^7.0",
-                "phpunit/phpunit": "^8.0 || ^9.0"
-            },
-            "default-branch": true,
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Prophecy\\": "src/Prophecy"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "support": {
-                "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/v1.15.0"
-            },
-            "time": "2021-12-08T12:19:24+00:00"
+            "time": "2022-02-21T01:04:05+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -1523,19 +1253,19 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "747f93928bcac855054f2781c209ec80d469fe14"
+                "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/747f93928bcac855054f2781c209ec80d469fe14",
-                "reference": "747f93928bcac855054f2781c209ec80d469fe14",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/12fddc491826940cf9b7e88ad9664cf51f0f6d0a",
+                "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.13.0",
+                "nikic/php-parser": "^4.14",
                 "php": ">=7.3",
                 "phpunit/php-file-iterator": "^3.0.3",
                 "phpunit/php-text-template": "^2.0.2",
@@ -1592,7 +1322,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-12-13T15:03:35+00:00"
+            "time": "2022-10-27T13:35:33+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -1600,12 +1330,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
+                "reference": "38b24367e1b340aa78b96d7cab042942d917bb84"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
-                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/38b24367e1b340aa78b96d7cab042942d917bb84",
+                "reference": "38b24367e1b340aa78b96d7cab042942d917bb84",
                 "shasum": ""
             },
             "require": {
@@ -1652,7 +1382,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-12-02T12:48:52+00:00"
+            "time": "2022-02-11T16:23:04+00:00"
         },
         {
             "name": "phpunit/php-invoker",
@@ -1841,12 +1571,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "09f082e2c7564dc3a889e73015c65b836e2303a0"
+                "reference": "7847a4a920f686db261da1ccc92120800822661f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/09f082e2c7564dc3a889e73015c65b836e2303a0",
-                "reference": "09f082e2c7564dc3a889e73015c65b836e2303a0",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7847a4a920f686db261da1ccc92120800822661f",
+                "reference": "7847a4a920f686db261da1ccc92120800822661f",
                 "shasum": ""
             },
             "require": {
@@ -1861,28 +1591,23 @@
                 "phar-io/manifest": "^2.0.3",
                 "phar-io/version": "^3.0.2",
                 "php": ">=7.3",
-                "phpspec/prophecy": "^1.12.1",
-                "phpunit/php-code-coverage": "^9.2.7",
+                "phpunit/php-code-coverage": "^9.2.13",
                 "phpunit/php-file-iterator": "^3.0.5",
                 "phpunit/php-invoker": "^3.1.1",
                 "phpunit/php-text-template": "^2.0.3",
                 "phpunit/php-timer": "^5.0.2",
                 "sebastian/cli-parser": "^1.0.1",
                 "sebastian/code-unit": "^1.0.6",
-                "sebastian/comparator": "^4.0.5",
+                "sebastian/comparator": "^4.0.8",
                 "sebastian/diff": "^4.0.3",
                 "sebastian/environment": "^5.1.3",
-                "sebastian/exporter": "^4.0.3",
+                "sebastian/exporter": "^4.0.5",
                 "sebastian/global-state": "^5.0.1",
                 "sebastian/object-enumerator": "^4.0.3",
                 "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^2.3.4",
+                "sebastian/type": "^3.2",
                 "sebastian/version": "^3.0.2"
             },
-            "require-dev": {
-                "ext-pdo": "*",
-                "phpspec/prophecy-phpunit": "^2.0.1"
-            },
             "suggest": {
                 "ext-soap": "*",
                 "ext-xdebug": "*"
@@ -1897,11 +1622,11 @@
                 }
             },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ],
                 "files": [
                     "src/Framework/Assert/Functions.php"
+                ],
+                "classmap": [
+                    "src/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1934,9 +1659,13 @@
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2021-12-13T14:59:17+00:00"
+            "time": "2022-10-19T10:44:50+00:00"
         },
         {
             "name": "psr/cache",
@@ -2041,12 +1770,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/event-dispatcher.git",
-                "reference": "aa4f89e91c423b516ff226c50dc83f824011c253"
+                "reference": "e275e2d67d53964a3f13e056886ecd769edee021"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/aa4f89e91c423b516ff226c50dc83f824011c253",
-                "reference": "aa4f89e91c423b516ff226c50dc83f824011c253",
+                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/e275e2d67d53964a3f13e056886ecd769edee021",
+                "reference": "e275e2d67d53964a3f13e056886ecd769edee021",
                 "shasum": ""
             },
             "require": {
@@ -2086,7 +1815,7 @@
             "support": {
                 "source": "https://github.com/php-fig/event-dispatcher/tree/master"
             },
-            "time": "2021-02-08T21:15:39+00:00"
+            "time": "2022-06-29T17:22:39+00:00"
         },
         {
             "name": "psr/log",
@@ -2307,16 +2036,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "4.0.6",
+            "version": "4.0.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "55f4261989e546dc112258c7a75935a81a7ce382"
+                "reference": "b247957a1c8dc81a671770f74b479c0a78a818f1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382",
-                "reference": "55f4261989e546dc112258c7a75935a81a7ce382",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/b247957a1c8dc81a671770f74b479c0a78a818f1",
+                "reference": "b247957a1c8dc81a671770f74b479c0a78a818f1",
                 "shasum": ""
             },
             "require": {
@@ -2369,7 +2098,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0"
             },
             "funding": [
                 {
@@ -2377,7 +2106,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T15:49:45+00:00"
+            "time": "2022-09-14T12:46:14+00:00"
         },
         {
             "name": "sebastian/complexity",
@@ -2504,16 +2233,16 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "5.1.3",
+            "version": "5.1.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "388b6ced16caa751030f6a69e588299fa09200ac"
+                "reference": "3fade0c8462024d0426a00dc1ad0a2fda0df733f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac",
-                "reference": "388b6ced16caa751030f6a69e588299fa09200ac",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/3fade0c8462024d0426a00dc1ad0a2fda0df733f",
+                "reference": "3fade0c8462024d0426a00dc1ad0a2fda0df733f",
                 "shasum": ""
             },
             "require": {
@@ -2555,7 +2284,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3"
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1"
             },
             "funding": [
                 {
@@ -2563,7 +2292,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:52:38+00:00"
+            "time": "2022-04-14T11:24:33+00:00"
         },
         {
             "name": "sebastian/exporter",
@@ -2571,12 +2300,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9"
+                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9",
-                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
+                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
                 "shasum": ""
             },
             "require": {
@@ -2640,20 +2369,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-11-11T14:18:36+00:00"
+            "time": "2022-09-14T06:03:37+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "5.0.3",
+            "version": "5.0.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49"
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/23bd5951f7ff26f12d4e3242864df3e08dec4e49",
-                "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
                 "shasum": ""
             },
             "require": {
@@ -2696,7 +2425,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.3"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
             },
             "funding": [
                 {
@@ -2704,7 +2433,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-06-11T13:31:12+00:00"
+            "time": "2022-02-14T08:28:10+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
@@ -2877,16 +2606,16 @@
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "4.0.4",
+            "version": "4.0.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
+                "reference": "e3a614438af7f71eaa6fc8e406be8a3aa5c34595"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
-                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e3a614438af7f71eaa6fc8e406be8a3aa5c34595",
+                "reference": "e3a614438af7f71eaa6fc8e406be8a3aa5c34595",
                 "shasum": ""
             },
             "require": {
@@ -2925,10 +2654,10 @@
                 }
             ],
             "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "homepage": "https://github.com/sebastianbergmann/recursion-context",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0"
             },
             "funding": [
                 {
@@ -2936,20 +2665,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:17:30+00:00"
+            "time": "2022-07-30T08:13:09+00:00"
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "dev-master",
+            "version": "dev-main",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
+                "reference": "b7a390ae3651f7ba3675d8364bff396e87931554"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
-                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/b7a390ae3651f7ba3675d8364bff396e87931554",
+                "reference": "b7a390ae3651f7ba3675d8364bff396e87931554",
                 "shasum": ""
             },
             "require": {
@@ -2962,7 +2691,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -2983,8 +2712,7 @@
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/main"
             },
             "funding": [
                 {
@@ -2992,32 +2720,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T06:45:17+00:00"
+            "time": "2022-06-14T05:05:56+00:00"
         },
         {
             "name": "sebastian/type",
-            "version": "2.3.x-dev",
+            "version": "3.2.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "f24cbc541026c3bb7d27c647f0f9ea337135b22a"
+                "reference": "4d34b23933f255b0822758a44272222cac593eb4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/f24cbc541026c3bb7d27c647f0f9ea337135b22a",
-                "reference": "f24cbc541026c3bb7d27c647f0f9ea337135b22a",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/4d34b23933f255b0822758a44272222cac593eb4",
+                "reference": "4d34b23933f255b0822758a44272222cac593eb4",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^9.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.3-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
@@ -3040,7 +2768,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/2.3"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.2"
             },
             "funding": [
                 {
@@ -3048,7 +2776,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-06-18T06:28:45+00:00"
+            "time": "2022-10-01T05:56:17+00:00"
         },
         {
             "name": "sebastian/version",
@@ -3109,12 +2837,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4"
+                "reference": "ea59bb0edfaf9f28d18d8791410ee0355f317669"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4",
-                "reference": "9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4",
+                "url": "https://api.github.com/repos/symfony/console/zipball/ea59bb0edfaf9f28d18d8791410ee0355f317669",
+                "reference": "ea59bb0edfaf9f28d18d8791410ee0355f317669",
                 "shasum": ""
             },
             "require": {
@@ -3152,7 +2880,6 @@
                 "symfony/lock": "",
                 "symfony/process": ""
             },
-            "default-branch": true,
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -3185,7 +2912,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.1"
+                "source": "https://github.com/symfony/console/tree/5.4"
             },
             "funding": [
                 {
@@ -3201,7 +2928,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-09T11:22:43+00:00"
+            "time": "2022-10-26T21:41:52+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -3209,12 +2936,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8"
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8",
-                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
                 "shasum": ""
             },
             "require": {
@@ -3252,7 +2979,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/main"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/2.5"
             },
             "funding": [
                 {
@@ -3268,7 +2995,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-12T14:48:14+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -3276,12 +3003,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "27d39ae126352b9fa3be5e196ccf4617897be3eb"
+                "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/27d39ae126352b9fa3be5e196ccf4617897be3eb",
-                "reference": "27d39ae126352b9fa3be5e196ccf4617897be3eb",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc",
+                "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc",
                 "shasum": ""
             },
             "require": {
@@ -3338,7 +3065,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.0"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.9"
             },
             "funding": [
                 {
@@ -3354,7 +3081,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-23T10:19:22+00:00"
+            "time": "2022-05-05T16:45:39+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -3362,12 +3089,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a"
+                "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/66bea3b09be61613cd3b4043a65a8ec48cfa6d2a",
-                "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1",
+                "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1",
                 "shasum": ""
             },
             "require": {
@@ -3433,7 +3160,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-12T14:48:14+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
         },
         {
             "name": "symfony/filesystem",
@@ -3441,12 +3168,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "731f917dc31edcffec2c6a777f3698c33bea8f01"
+                "reference": "ac09569844a9109a5966b9438fc29113ce77cf51"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/731f917dc31edcffec2c6a777f3698c33bea8f01",
-                "reference": "731f917dc31edcffec2c6a777f3698c33bea8f01",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/ac09569844a9109a5966b9438fc29113ce77cf51",
+                "reference": "ac09569844a9109a5966b9438fc29113ce77cf51",
                 "shasum": ""
             },
             "require": {
@@ -3455,7 +3182,6 @@
                 "symfony/polyfill-mbstring": "~1.8",
                 "symfony/polyfill-php80": "^1.16"
             },
-            "default-branch": true,
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -3482,7 +3208,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v5.4.0"
+                "source": "https://github.com/symfony/filesystem/tree/5.4"
             },
             "funding": [
                 {
@@ -3498,7 +3224,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-28T13:39:27+00:00"
+            "time": "2022-09-21T19:53:16+00:00"
         },
         {
             "name": "symfony/finder",
@@ -3506,12 +3232,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "d2f29dac98e96a98be467627bd49c2efb1bc2590"
+                "reference": "7872a66f57caffa2916a584db1aa7f12adc76f8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/d2f29dac98e96a98be467627bd49c2efb1bc2590",
-                "reference": "d2f29dac98e96a98be467627bd49c2efb1bc2590",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/7872a66f57caffa2916a584db1aa7f12adc76f8c",
+                "reference": "7872a66f57caffa2916a584db1aa7f12adc76f8c",
                 "shasum": ""
             },
             "require": {
@@ -3519,7 +3245,6 @@
                 "symfony/deprecation-contracts": "^2.1|^3",
                 "symfony/polyfill-php80": "^1.16"
             },
-            "default-branch": true,
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -3546,7 +3271,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v5.4.0"
+                "source": "https://github.com/symfony/finder/tree/5.4"
             },
             "funding": [
                 {
@@ -3562,7 +3287,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-28T15:25:38+00:00"
+            "time": "2022-07-29T07:37:50+00:00"
         },
         {
             "name": "symfony/options-resolver",
@@ -3570,12 +3295,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "b0fb78576487af19c500aaddb269fd36701d4847"
+                "reference": "54f14e36aa73cb8f7261d7686691fd4d75ea2690"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/b0fb78576487af19c500aaddb269fd36701d4847",
-                "reference": "b0fb78576487af19c500aaddb269fd36701d4847",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/54f14e36aa73cb8f7261d7686691fd4d75ea2690",
+                "reference": "54f14e36aa73cb8f7261d7686691fd4d75ea2690",
                 "shasum": ""
             },
             "require": {
@@ -3584,7 +3309,6 @@
                 "symfony/polyfill-php73": "~1.0",
                 "symfony/polyfill-php80": "^1.16"
             },
-            "default-branch": true,
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -3616,7 +3340,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v5.4.0"
+                "source": "https://github.com/symfony/options-resolver/tree/5.4"
             },
             "funding": [
                 {
@@ -3632,7 +3356,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-23T10:19:22+00:00"
+            "time": "2022-07-20T13:00:38+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -3640,12 +3364,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab"
+                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
+                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
                 "shasum": ""
             },
             "require": {
@@ -3661,7 +3385,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3669,12 +3393,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -3699,7 +3423,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/main"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -3715,7 +3439,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-20T20:35:02+00:00"
+            "time": "2022-05-24T11:49:31+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
@@ -3723,12 +3447,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "81b86b50cf841a64252b439e738e97f4a34e2783"
+                "reference": "433d05519ce6990bf3530fba6957499d327395c2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783",
-                "reference": "81b86b50cf841a64252b439e738e97f4a34e2783",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2",
+                "reference": "433d05519ce6990bf3530fba6957499d327395c2",
                 "shasum": ""
             },
             "require": {
@@ -3741,7 +3465,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3749,12 +3473,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -3781,7 +3505,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/main"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -3797,7 +3521,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-23T21:10:46+00:00"
+            "time": "2022-05-24T11:49:31+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
@@ -3805,12 +3529,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8"
+                "reference": "219aa369ceff116e673852dce47c3a41794c14bd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8",
-                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd",
+                "reference": "219aa369ceff116e673852dce47c3a41794c14bd",
                 "shasum": ""
             },
             "require": {
@@ -3823,7 +3547,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3831,12 +3555,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -3866,7 +3590,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -3882,7 +3606,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-19T12:13:01+00:00"
+            "time": "2022-05-24T11:49:31+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
@@ -3890,12 +3614,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825"
+                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825",
-                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
+                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
                 "shasum": ""
             },
             "require": {
@@ -3911,7 +3635,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3919,12 +3643,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -3950,7 +3674,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/main"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -3966,7 +3690,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-30T18:21:41+00:00"
+            "time": "2022-05-24T11:49:31+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
@@ -3974,12 +3698,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5"
+                "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5",
-                "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85",
+                "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85",
                 "shasum": ""
             },
             "require": {
@@ -3989,7 +3713,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3997,12 +3721,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php73\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php73\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -4030,7 +3754,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php73/tree/main"
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -4046,7 +3770,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-06-05T21:20:04+00:00"
+            "time": "2022-05-24T11:49:31+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
@@ -4054,12 +3778,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9"
+                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9",
-                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace",
+                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace",
                 "shasum": ""
             },
             "require": {
@@ -4069,7 +3793,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -4077,12 +3801,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -4114,7 +3838,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/main"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -4130,7 +3854,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-13T13:58:33+00:00"
+            "time": "2022-05-10T07:21:04+00:00"
         },
         {
             "name": "symfony/polyfill-php81",
@@ -4138,12 +3862,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php81.git",
-                "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f"
+                "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/5de4ba2d41b15f9bd0e19b2ab9674135813ec98f",
-                "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1",
+                "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1",
                 "shasum": ""
             },
             "require": {
@@ -4153,7 +3877,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -4161,12 +3885,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php81\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php81\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -4194,7 +3918,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/main"
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -4210,7 +3934,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-13T13:58:11+00:00"
+            "time": "2022-05-24T11:49:31+00:00"
         },
         {
             "name": "symfony/process",
@@ -4218,19 +3942,18 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "bf0e245dd8f115502d11df04cdb91c49abbc83ec"
+                "reference": "6e75fe6874cbc7e4773d049616ab450eff537bf1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/bf0e245dd8f115502d11df04cdb91c49abbc83ec",
-                "reference": "bf0e245dd8f115502d11df04cdb91c49abbc83ec",
+                "url": "https://api.github.com/repos/symfony/process/zipball/6e75fe6874cbc7e4773d049616ab450eff537bf1",
+                "reference": "6e75fe6874cbc7e4773d049616ab450eff537bf1",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
                 "symfony/polyfill-php80": "^1.16"
             },
-            "default-branch": true,
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -4273,7 +3996,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-11T16:33:38+00:00"
+            "time": "2022-06-27T16:58:25+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -4281,12 +4004,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "034c73d5dd4c05c71a27f05b3c43c0f2fcc8985a"
+                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/034c73d5dd4c05c71a27f05b3c43c0f2fcc8985a",
-                "reference": "034c73d5dd4c05c71a27f05b3c43c0f2fcc8985a",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
+                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
                 "shasum": ""
             },
             "require": {
@@ -4356,7 +4079,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-23T10:19:22+00:00"
+            "time": "2022-05-30T19:17:29+00:00"
         },
         {
             "name": "symfony/stopwatch",
@@ -4364,19 +4087,18 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "208ef96122bfed82a8f3a61458a07113a08bdcfe"
+                "reference": "6df7a3effde34d81717bbef4591e5ffe32226d69"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/208ef96122bfed82a8f3a61458a07113a08bdcfe",
-                "reference": "208ef96122bfed82a8f3a61458a07113a08bdcfe",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/6df7a3effde34d81717bbef4591e5ffe32226d69",
+                "reference": "6df7a3effde34d81717bbef4591e5ffe32226d69",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
                 "symfony/service-contracts": "^1|^2|^3"
             },
-            "default-branch": true,
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -4403,7 +4125,7 @@
             "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v5.4.0"
+                "source": "https://github.com/symfony/stopwatch/tree/5.4"
             },
             "funding": [
                 {
@@ -4419,7 +4141,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-23T10:19:22+00:00"
+            "time": "2022-09-28T13:19:49+00:00"
         },
         {
             "name": "symfony/string",
@@ -4427,12 +4149,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "1a03b5bab07779e5f23f8b60ba76ccb7662ffcf6"
+                "reference": "089e7237497fae7a9c404d0c3aeb8db3254733e4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/1a03b5bab07779e5f23f8b60ba76ccb7662ffcf6",
-                "reference": "1a03b5bab07779e5f23f8b60ba76ccb7662ffcf6",
+                "url": "https://api.github.com/repos/symfony/string/zipball/089e7237497fae7a9c404d0c3aeb8db3254733e4",
+                "reference": "089e7237497fae7a9c404d0c3aeb8db3254733e4",
                 "shasum": ""
             },
             "require": {
@@ -4452,15 +4174,14 @@
                 "symfony/translation-contracts": "^1.1|^2",
                 "symfony/var-exporter": "^4.4|^5.0|^6.0"
             },
-            "default-branch": true,
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\String\\": ""
-                },
                 "files": [
                     "Resources/functions.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Component\\String\\": ""
+                },
                 "exclude-from-classmap": [
                     "/Tests/"
                 ]
@@ -4506,7 +4227,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-11T13:33:37+00:00"
+            "time": "2022-10-05T15:16:54+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -4557,65 +4278,6 @@
                 }
             ],
             "time": "2021-07-28T10:34:58+00:00"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozarts/assert.git",
-                "reference": "b419d648592b0b8911cbbe10d450fe314f4fd262"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/b419d648592b0b8911cbbe10d450fe314f4fd262",
-                "reference": "b419d648592b0b8911cbbe10d450fe314f4fd262",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0",
-                "symfony/polyfill-ctype": "^1.8"
-            },
-            "conflict": {
-                "phpstan/phpstan": "<0.12.20",
-                "vimeo/psalm": "<4.6.1 || 4.6.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^8.5.13"
-            },
-            "default-branch": true,
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.10-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "support": {
-                "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/master"
-            },
-            "time": "2021-06-19T13:45:26+00:00"
         }
     ],
     "aliases": [],
@@ -4633,5 +4295,5 @@
     "platform-overrides": {
         "php": "7.4.0"
     },
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }
diff --git a/core/polyfills.php b/core/polyfills.php
index 818bd3eb..039da3c1 100644
--- a/core/polyfills.php
+++ b/core/polyfills.php
@@ -522,14 +522,15 @@ function parse_shorthand_int(string $limit): int
             switch (strtolower($m[2])) {
                 /** @noinspection PhpMissingBreakStatementInspection */
                 case 't': $value *= 1024;  // fall through
-                /** @noinspection PhpMissingBreakStatementInspection */
+                    /** @noinspection PhpMissingBreakStatementInspection */
                 // no break
                 case 'g': $value *= 1024;  // fall through
-                /** @noinspection PhpMissingBreakStatementInspection */
+                    /** @noinspection PhpMissingBreakStatementInspection */
                 // no break
                 case 'm': $value *= 1024;  // fall through
                 // no break
-                case 'k': $value *= 1024; break;
+                case 'k': $value *= 1024;
+                break;
                 default: $value = -1;
             }
         }
diff --git a/core/util.php b/core/util.php
index 2e27e16f..60596f0c 100644
--- a/core/util.php
+++ b/core/util.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 use MicroHTML\HTMLElement;
+
 use function MicroHTML\emptyHTML;
 use function MicroHTML\rawHTML;
 use function MicroHTML\FORM;
diff --git a/ext/artists/main.php b/ext/artists/main.php
index e53cd1c1..fa64a9e7 100644
--- a/ext/artists/main.php
+++ b/ext/artists/main.php
@@ -163,256 +163,256 @@ class Artists extends Extension
             switch ($event->get_arg(0)) {
                 //*************ARTIST SECTION**************
                 case "list":
-                {
-                    $this->get_listing($page, $event);
-                    $this->theme->sidebar_options("neutral");
-                    break;
-                }
+                    {
+                        $this->get_listing($page, $event);
+                        $this->theme->sidebar_options("neutral");
+                        break;
+                    }
                 case "new":
-                {
-                    if (!$user->is_anonymous()) {
-                        $this->theme->new_artist_composer();
-                    } else {
-                        $this->theme->display_error(401, "Error", "You must be registered and logged in to create a new artist.");
-                    }
-                    break;
-                }
-                case "new_artist":
-                {
-                    $page->set_mode(PageMode::REDIRECT);
-                    $page->set_redirect(make_link("artist/new"));
-                    break;
-                }
-                case "create":
-                {
-                    if (!$user->is_anonymous()) {
-                        $newArtistID = $this->add_artist();
-                        if ($newArtistID == -1) {
-                            $this->theme->display_error(400, "Error", "Error when entering artist data.");
+                    {
+                        if (!$user->is_anonymous()) {
+                            $this->theme->new_artist_composer();
                         } else {
-                            $page->set_mode(PageMode::REDIRECT);
-                            $page->set_redirect(make_link("artist/view/".$newArtistID));
+                            $this->theme->display_error(401, "Error", "You must be registered and logged in to create a new artist.");
                         }
-                    } else {
-                        $this->theme->display_error(401, "Error", "You must be registered and logged in to create a new artist.");
+                        break;
+                    }
+                case "new_artist":
+                    {
+                        $page->set_mode(PageMode::REDIRECT);
+                        $page->set_redirect(make_link("artist/new"));
+                        break;
+                    }
+                case "create":
+                    {
+                        if (!$user->is_anonymous()) {
+                            $newArtistID = $this->add_artist();
+                            if ($newArtistID == -1) {
+                                $this->theme->display_error(400, "Error", "Error when entering artist data.");
+                            } else {
+                                $page->set_mode(PageMode::REDIRECT);
+                                $page->set_redirect(make_link("artist/view/".$newArtistID));
+                            }
+                        } else {
+                            $this->theme->display_error(401, "Error", "You must be registered and logged in to create a new artist.");
+                        }
+                        break;
                     }
-                    break;
-                }
 
                 case "view":
-                {
-                    $artistID = int_escape($event->get_arg(1));
-                    $artist = $this->get_artist($artistID);
-                    $aliases = $this->get_alias($artist['id']);
-                    $members = $this->get_members($artist['id']);
-                    $urls = $this->get_urls($artist['id']);
+                    {
+                        $artistID = int_escape($event->get_arg(1));
+                        $artist = $this->get_artist($artistID);
+                        $aliases = $this->get_alias($artist['id']);
+                        $members = $this->get_members($artist['id']);
+                        $urls = $this->get_urls($artist['id']);
 
-                    $userIsLogged = !$user->is_anonymous();
-                    $userIsAdmin = $user->can(Permissions::ARTISTS_ADMIN);
+                        $userIsLogged = !$user->is_anonymous();
+                        $userIsAdmin = $user->can(Permissions::ARTISTS_ADMIN);
 
-                    $images = Image::find_images(0, 4, Tag::explode($artist['name']));
+                        $images = Image::find_images(0, 4, Tag::explode($artist['name']));
 
-                    $this->theme->show_artist($artist, $aliases, $members, $urls, $images, $userIsLogged, $userIsAdmin);
-                    /*
-                    if ($userIsLogged) {
-                        $this->theme->show_new_alias_composer($artistID);
-                        $this->theme->show_new_member_composer($artistID);
-                        $this->theme->show_new_url_composer($artistID);
+                        $this->theme->show_artist($artist, $aliases, $members, $urls, $images, $userIsLogged, $userIsAdmin);
+                        /*
+                        if ($userIsLogged) {
+                            $this->theme->show_new_alias_composer($artistID);
+                            $this->theme->show_new_member_composer($artistID);
+                            $this->theme->show_new_url_composer($artistID);
+                        }
+                        */
+
+                        $this->theme->sidebar_options("editor", $artistID, $userIsAdmin);
+
+                        break;
                     }
-                    */
-
-                    $this->theme->sidebar_options("editor", $artistID, $userIsAdmin);
-
-                    break;
-                }
 
                 case "edit":
-                {
-                    $artistID = int_escape($event->get_arg(1));
-                    $artist = $this->get_artist($artistID);
-                    $aliases = $this->get_alias($artistID);
-                    $members = $this->get_members($artistID);
-                    $urls = $this->get_urls($artistID);
+                    {
+                        $artistID = int_escape($event->get_arg(1));
+                        $artist = $this->get_artist($artistID);
+                        $aliases = $this->get_alias($artistID);
+                        $members = $this->get_members($artistID);
+                        $urls = $this->get_urls($artistID);
 
-                    if (!$user->is_anonymous()) {
-                        $this->theme->show_artist_editor($artist, $aliases, $members, $urls);
+                        if (!$user->is_anonymous()) {
+                            $this->theme->show_artist_editor($artist, $aliases, $members, $urls);
 
-                        $userIsAdmin = $user->can(Permissions::ARTISTS_ADMIN);
-                        $this->theme->sidebar_options("editor", $artistID, $userIsAdmin);
-                    } else {
-                        $this->theme->display_error(401, "Error", "You must be registered and logged in to edit an artist.");
+                            $userIsAdmin = $user->can(Permissions::ARTISTS_ADMIN);
+                            $this->theme->sidebar_options("editor", $artistID, $userIsAdmin);
+                        } else {
+                            $this->theme->display_error(401, "Error", "You must be registered and logged in to edit an artist.");
+                        }
+                        break;
                     }
-                    break;
-                }
                 case "edit_artist":
-                {
-                    $artistID = $_POST['artist_id'];
-                    $page->set_mode(PageMode::REDIRECT);
-                    $page->set_redirect(make_link("artist/edit/".$artistID));
-                    break;
-                }
+                    {
+                        $artistID = $_POST['artist_id'];
+                        $page->set_mode(PageMode::REDIRECT);
+                        $page->set_redirect(make_link("artist/edit/".$artistID));
+                        break;
+                    }
                 case "edited":
-                {
-                    $artistID = int_escape($_POST['id']);
-                    $this->update_artist();
-                    $page->set_mode(PageMode::REDIRECT);
-                    $page->set_redirect(make_link("artist/view/".$artistID));
-                    break;
-                }
+                    {
+                        $artistID = int_escape($_POST['id']);
+                        $this->update_artist();
+                        $page->set_mode(PageMode::REDIRECT);
+                        $page->set_redirect(make_link("artist/view/".$artistID));
+                        break;
+                    }
                 case "nuke_artist":
-                {
-                    $artistID = $_POST['artist_id'];
-                    $page->set_mode(PageMode::REDIRECT);
-                    $page->set_redirect(make_link("artist/nuke/".$artistID));
-                    break;
-                }
+                    {
+                        $artistID = $_POST['artist_id'];
+                        $page->set_mode(PageMode::REDIRECT);
+                        $page->set_redirect(make_link("artist/nuke/".$artistID));
+                        break;
+                    }
                 case "nuke":
-                {
-                    $artistID = int_escape($event->get_arg(1));
-                    $this->delete_artist($artistID); // this will delete the artist, its alias, its urls and its members
-                    $page->set_mode(PageMode::REDIRECT);
-                    $page->set_redirect(make_link("artist/list"));
-                    break;
-                }
+                    {
+                        $artistID = int_escape($event->get_arg(1));
+                        $this->delete_artist($artistID); // this will delete the artist, its alias, its urls and its members
+                        $page->set_mode(PageMode::REDIRECT);
+                        $page->set_redirect(make_link("artist/list"));
+                        break;
+                    }
                 case "add_alias":
-                {
-                    $artistID = $_POST['artist_id'];
-                    $this->theme->show_new_alias_composer($artistID);
-                    break;
-                }
+                    {
+                        $artistID = $_POST['artist_id'];
+                        $this->theme->show_new_alias_composer($artistID);
+                        break;
+                    }
                 case "add_member":
-                {
-                    $artistID = $_POST['artist_id'];
-                    $this->theme->show_new_member_composer($artistID);
-                    break;
-                }
+                    {
+                        $artistID = $_POST['artist_id'];
+                        $this->theme->show_new_member_composer($artistID);
+                        break;
+                    }
                 case "add_url":
-                {
-                    $artistID = $_POST['artist_id'];
-                    $this->theme->show_new_url_composer($artistID);
-                    break;
-                }
-                //***********ALIAS SECTION ***********************
+                    {
+                        $artistID = $_POST['artist_id'];
+                        $this->theme->show_new_url_composer($artistID);
+                        break;
+                    }
+                    //***********ALIAS SECTION ***********************
                 case "alias":
-                {
-                    switch ($event->get_arg(1)) {
-                        case "add":
-                        {
-                            $artistID = $_POST['artistID'];
-                            $this->add_alias();
-                            $page->set_mode(PageMode::REDIRECT);
-                            $page->set_redirect(make_link("artist/view/".$artistID));
-                            break;
-                        }
-                        case "delete":
-                        {
-                            $aliasID = int_escape($event->get_arg(2));
-                            $artistID = $this->get_artistID_by_aliasID($aliasID);
-                            $this->delete_alias($aliasID);
-                            $page->set_mode(PageMode::REDIRECT);
-                            $page->set_redirect(make_link("artist/view/".$artistID));
-                            break;
-                        }
-                        case "edit":
-                        {
-                            $aliasID = int_escape($event->get_arg(2));
-                            $alias = $this->get_alias_by_id($aliasID);
-                            $this->theme->show_alias_editor($alias);
-                            break;
-                        }
-                        case "edited":
-                        {
-                            $this->update_alias();
-                            $aliasID = int_escape($_POST['aliasID']);
-                            $artistID = $this->get_artistID_by_aliasID($aliasID);
-                            $page->set_mode(PageMode::REDIRECT);
-                            $page->set_redirect(make_link("artist/view/".$artistID));
-                            break;
+                    {
+                        switch ($event->get_arg(1)) {
+                            case "add":
+                                {
+                                    $artistID = $_POST['artistID'];
+                                    $this->add_alias();
+                                    $page->set_mode(PageMode::REDIRECT);
+                                    $page->set_redirect(make_link("artist/view/".$artistID));
+                                    break;
+                                }
+                            case "delete":
+                                {
+                                    $aliasID = int_escape($event->get_arg(2));
+                                    $artistID = $this->get_artistID_by_aliasID($aliasID);
+                                    $this->delete_alias($aliasID);
+                                    $page->set_mode(PageMode::REDIRECT);
+                                    $page->set_redirect(make_link("artist/view/".$artistID));
+                                    break;
+                                }
+                            case "edit":
+                                {
+                                    $aliasID = int_escape($event->get_arg(2));
+                                    $alias = $this->get_alias_by_id($aliasID);
+                                    $this->theme->show_alias_editor($alias);
+                                    break;
+                                }
+                            case "edited":
+                                {
+                                    $this->update_alias();
+                                    $aliasID = int_escape($_POST['aliasID']);
+                                    $artistID = $this->get_artistID_by_aliasID($aliasID);
+                                    $page->set_mode(PageMode::REDIRECT);
+                                    $page->set_redirect(make_link("artist/view/".$artistID));
+                                    break;
+                                }
                         }
+                        break; // case: alias
                     }
-                    break; // case: alias
-                }
 
-                //**************** URLS SECTION **********************
+                    //**************** URLS SECTION **********************
                 case "url":
-                {
-                    switch ($event->get_arg(1)) {
-                        case "add":
-                        {
-                            $artistID = $_POST['artistID'];
-                            $this->add_urls();
-                            $page->set_mode(PageMode::REDIRECT);
-                            $page->set_redirect(make_link("artist/view/".$artistID));
-                            break;
-                        }
-                        case "delete":
-                        {
-                            $urlID = int_escape($event->get_arg(2));
-                            $artistID = $this->get_artistID_by_urlID($urlID);
-                            $this->delete_url($urlID);
-                            $page->set_mode(PageMode::REDIRECT);
-                            $page->set_redirect(make_link("artist/view/".$artistID));
-                            break;
-                        }
-                        case "edit":
-                        {
-                            $urlID = int_escape($event->get_arg(2));
-                            $url = $this->get_url_by_id($urlID);
-                            $this->theme->show_url_editor($url);
-                            break;
-                        }
-                        case "edited":
-                        {
-                            $this->update_url();
-                            $urlID = int_escape($_POST['urlID']);
-                            $artistID = $this->get_artistID_by_urlID($urlID);
-                            $page->set_mode(PageMode::REDIRECT);
-                            $page->set_redirect(make_link("artist/view/".$artistID));
-                            break;
+                    {
+                        switch ($event->get_arg(1)) {
+                            case "add":
+                                {
+                                    $artistID = $_POST['artistID'];
+                                    $this->add_urls();
+                                    $page->set_mode(PageMode::REDIRECT);
+                                    $page->set_redirect(make_link("artist/view/".$artistID));
+                                    break;
+                                }
+                            case "delete":
+                                {
+                                    $urlID = int_escape($event->get_arg(2));
+                                    $artistID = $this->get_artistID_by_urlID($urlID);
+                                    $this->delete_url($urlID);
+                                    $page->set_mode(PageMode::REDIRECT);
+                                    $page->set_redirect(make_link("artist/view/".$artistID));
+                                    break;
+                                }
+                            case "edit":
+                                {
+                                    $urlID = int_escape($event->get_arg(2));
+                                    $url = $this->get_url_by_id($urlID);
+                                    $this->theme->show_url_editor($url);
+                                    break;
+                                }
+                            case "edited":
+                                {
+                                    $this->update_url();
+                                    $urlID = int_escape($_POST['urlID']);
+                                    $artistID = $this->get_artistID_by_urlID($urlID);
+                                    $page->set_mode(PageMode::REDIRECT);
+                                    $page->set_redirect(make_link("artist/view/".$artistID));
+                                    break;
+                                }
                         }
+                        break; // case: urls
                     }
-                    break; // case: urls
-                }
-                //******************* MEMBERS SECTION *********************
+                    //******************* MEMBERS SECTION *********************
                 case "member":
-                {
-                    switch ($event->get_arg(1)) {
-                        case "add":
-                        {
-                            $artistID = $_POST['artistID'];
-                            $this->add_members();
-                            $page->set_mode(PageMode::REDIRECT);
-                            $page->set_redirect(make_link("artist/view/".$artistID));
-                            break;
-                        }
-                        case "delete":
-                        {
-                            $memberID = int_escape($event->get_arg(2));
-                            $artistID = $this->get_artistID_by_memberID($memberID);
-                            $this->delete_member($memberID);
-                            $page->set_mode(PageMode::REDIRECT);
-                            $page->set_redirect(make_link("artist/view/".$artistID));
-                            break;
-                        }
-                        case "edit":
-                        {
-                            $memberID = int_escape($event->get_arg(2));
-                            $member = $this->get_member_by_id($memberID);
-                            $this->theme->show_member_editor($member);
-                            break;
-                        }
-                        case "edited":
-                        {
-                            $this->update_member();
-                            $memberID = int_escape($_POST['memberID']);
-                            $artistID = $this->get_artistID_by_memberID($memberID);
-                            $page->set_mode(PageMode::REDIRECT);
-                            $page->set_redirect(make_link("artist/view/".$artistID));
-                            break;
+                    {
+                        switch ($event->get_arg(1)) {
+                            case "add":
+                                {
+                                    $artistID = $_POST['artistID'];
+                                    $this->add_members();
+                                    $page->set_mode(PageMode::REDIRECT);
+                                    $page->set_redirect(make_link("artist/view/".$artistID));
+                                    break;
+                                }
+                            case "delete":
+                                {
+                                    $memberID = int_escape($event->get_arg(2));
+                                    $artistID = $this->get_artistID_by_memberID($memberID);
+                                    $this->delete_member($memberID);
+                                    $page->set_mode(PageMode::REDIRECT);
+                                    $page->set_redirect(make_link("artist/view/".$artistID));
+                                    break;
+                                }
+                            case "edit":
+                                {
+                                    $memberID = int_escape($event->get_arg(2));
+                                    $member = $this->get_member_by_id($memberID);
+                                    $this->theme->show_member_editor($member);
+                                    break;
+                                }
+                            case "edited":
+                                {
+                                    $this->update_member();
+                                    $memberID = int_escape($_POST['memberID']);
+                                    $artistID = $this->get_artistID_by_memberID($memberID);
+                                    $page->set_mode(PageMode::REDIRECT);
+                                    $page->set_redirect(make_link("artist/view/".$artistID));
+                                    break;
+                                }
                         }
+                        break; //case: members
                     }
-                    break; //case: members
-                }
             }
         }
     }
diff --git a/ext/auto_tagger/main.php b/ext/auto_tagger/main.php
index 3ffd75ea..40350fff 100644
--- a/ext/auto_tagger/main.php
+++ b/ext/auto_tagger/main.php
@@ -210,23 +210,23 @@ class AutoTagger extends Extension
     private function add_auto_tag(string $tag, string $additional_tags)
     {
         global $database;
-		$existing_tags = $database->get_one("SELECT additional_tags FROM auto_tag WHERE LOWER(tag)=LOWER(:tag)", ["tag"=>$tag]);
-        if (!is_null($existing_tags)) { 
-			// Auto Tags already exist, so we will append new tags to the existing one
-			$tag = Tag::sanitize($tag);
+        $existing_tags = $database->get_one("SELECT additional_tags FROM auto_tag WHERE LOWER(tag)=LOWER(:tag)", ["tag"=>$tag]);
+        if (!is_null($existing_tags)) {
+            // Auto Tags already exist, so we will append new tags to the existing one
+            $tag = Tag::sanitize($tag);
             $additional_tags = Tag::explode($additional_tags);
-			$existing_tags = Tag::explode($existing_tags);
-			foreach ($additional_tags as $t) {
-				if (!in_array(strtolower($t), $existing_tags)) {
-					array_push($existing_tags, strtolower($t));
-				}
-			}
-			
-			$database->execute(
+            $existing_tags = Tag::explode($existing_tags);
+            foreach ($additional_tags as $t) {
+                if (!in_array(strtolower($t), $existing_tags)) {
+                    array_push($existing_tags, strtolower($t));
+                }
+            }
+
+            $database->execute(
                 "UPDATE auto_tag set additional_tags=:existing_tags where tag=:tag",
                 ["tag"=>$tag, "existing_tags"=>Tag::implode($existing_tags)]
             );
-			log_info(
+            log_info(
                 AutoTaggerInfo::KEY,
                 "Updated auto-tag for {$tag} -> {".implode(" ", $additional_tags)."}"
             );
@@ -244,8 +244,8 @@ class AutoTagger extends Extension
                 "Added auto-tag for {$tag} -> {".implode(" ", $additional_tags)."}"
             );
         }
-		// Now we apply it to existing items
-		$this->apply_new_auto_tag($tag);
+        // Now we apply it to existing items
+        $this->apply_new_auto_tag($tag);
     }
 
     private function update_auto_tag(string $tag, string $additional_tags): bool
diff --git a/ext/comment/main.php b/ext/comment/main.php
index e48c0bab..fb197b86 100644
--- a/ext/comment/main.php
+++ b/ext/comment/main.php
@@ -171,11 +171,16 @@ class CommentList extends Extension
     {
         if ($event->page_matches("comment")) {
             switch ($event->get_arg(0)) {
-                case "add": $this->onPageRequest_add(); break;
-                case "delete": $this->onPageRequest_delete($event); break;
-                case "bulk_delete": $this->onPageRequest_bulk_delete(); break;
-                case "list": $this->onPageRequest_list($event); break;
-                case "beta-search": $this->onPageRequest_beta_search($event); break;
+                case "add": $this->onPageRequest_add();
+                break;
+                case "delete": $this->onPageRequest_delete($event);
+                break;
+                case "bulk_delete": $this->onPageRequest_bulk_delete();
+                break;
+                case "list": $this->onPageRequest_list($event);
+                break;
+                case "beta-search": $this->onPageRequest_beta_search($event);
+                break;
             }
         }
     }
diff --git a/ext/favorites/theme.php b/ext/favorites/theme.php
index 1ff79b97..4499f81e 100644
--- a/ext/favorites/theme.php
+++ b/ext/favorites/theme.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 use MicroHTML\HTMLElement;
+
 use function MicroHTML\INPUT;
 
 class FavoritesTheme extends Themelet
diff --git a/ext/log_db/main.php b/ext/log_db/main.php
index 440f516f..efbd145a 100644
--- a/ext/log_db/main.php
+++ b/ext/log_db/main.php
@@ -8,6 +8,7 @@ use MicroCRUD\Column;
 use MicroCRUD\DateTimeColumn;
 use MicroCRUD\TextColumn;
 use MicroCRUD\Table;
+
 use function MicroHTML\A;
 use function MicroHTML\SPAN;
 use function MicroHTML\emptyHTML;
@@ -161,11 +162,16 @@ class MessageColumn extends Column
     {
         $c = "#000";
         switch ($row['priority']) {
-            case SCORE_LOG_DEBUG: $c = "#999"; break;
-            case SCORE_LOG_INFO: $c = "#000"; break;
-            case SCORE_LOG_WARNING: $c = "#800"; break;
-            case SCORE_LOG_ERROR: $c = "#C00"; break;
-            case SCORE_LOG_CRITICAL: $c = "#F00"; break;
+            case SCORE_LOG_DEBUG: $c = "#999";
+            break;
+            case SCORE_LOG_INFO: $c = "#000";
+            break;
+            case SCORE_LOG_WARNING: $c = "#800";
+            break;
+            case SCORE_LOG_ERROR: $c = "#C00";
+            break;
+            case SCORE_LOG_CRITICAL: $c = "#F00";
+            break;
         }
         return SPAN(["style"=>"color: $c"], rawHTML($this->scan_entities($row[$this->name])));
     }
diff --git a/ext/media/main.php b/ext/media/main.php
index 3fd8b3af..88608179 100644
--- a/ext/media/main.php
+++ b/ext/media/main.php
@@ -790,8 +790,7 @@ class Media extends Extension
 
                     imagedestroy($image_resized);
                     $image_resized = $new_image;
-                break;
-
+                    break;
             }
 
             switch ($output_mime) {
diff --git a/ext/mime/mime_type.php b/ext/mime/mime_type.php
index b7424007..b85ac1d8 100644
--- a/ext/mime/mime_type.php
+++ b/ext/mime/mime_type.php
@@ -247,7 +247,7 @@ class MimeType
                     case FileExtension::PPM:
                         $output = MimeType::PPM;
                         break;
-// TODO: There is no uniquely defined Mime type for the cursor format. Need to figure this out.
+                        // TODO: There is no uniquely defined Mime type for the cursor format. Need to figure this out.
 //                    case FileExtension::CUR:
 //                        $output = MimeType::CUR;
 //                        break;
diff --git a/ext/pools/main.php b/ext/pools/main.php
index 90ee31ba..37cdcc4a 100644
--- a/ext/pools/main.php
+++ b/ext/pools/main.php
@@ -325,37 +325,35 @@ class Pools extends Extension
                         }
                     }
                     break;
-				case "reverse":
-					if ($this->have_permission($user, $pool)) {
-						$result = $database->execute(
-                                "SELECT image_id FROM pool_images WHERE pool_id=:pid ORDER BY image_order DESC",
-                                ["pid" => $pool_id]
-                            );
-						$image_order = 1;
-						try {
-							$database->begin_transaction();
-							while ($row = $result->fetch()) {
-								$database->execute(
-										"
+                case "reverse":
+                    if ($this->have_permission($user, $pool)) {
+                        $result = $database->execute(
+                            "SELECT image_id FROM pool_images WHERE pool_id=:pid ORDER BY image_order DESC",
+                            ["pid" => $pool_id]
+                        );
+                        $image_order = 1;
+                        try {
+                            $database->begin_transaction();
+                            while ($row = $result->fetch()) {
+                                $database->execute(
+                                    "
 										UPDATE pool_images 
 										SET image_order=:ord 
 										WHERE pool_id = :pid AND image_id = :iid",
-										["ord" => $image_order, "pid" => $pool_id, "iid" => (int)$row['image_id']]
-									);
-									$image_order = $image_order + 1;
-							}
-							$database->commit();
-						}
-						catch (Exception $e) {
-							$database->rollback();
-						}
-						$page->set_mode(PageMode::REDIRECT);
-						$page->set_redirect(make_link("pool/view/" . $pool_id));
-					}
-					else {
-						$this->theme->display_error(403, "Permission Denied", "You do not have permission to access this page");
-					}
-					break;
+                                    ["ord" => $image_order, "pid" => $pool_id, "iid" => (int)$row['image_id']]
+                                );
+                                $image_order = $image_order + 1;
+                            }
+                            $database->commit();
+                        } catch (Exception $e) {
+                            $database->rollback();
+                        }
+                        $page->set_mode(PageMode::REDIRECT);
+                        $page->set_redirect(make_link("pool/view/" . $pool_id));
+                    } else {
+                        $this->theme->display_error(403, "Permission Denied", "You do not have permission to access this page");
+                    }
+                    break;
                 case "import":
                     if ($this->have_permission($user, $pool)) {
                         $images = Image::find_images(
@@ -522,7 +520,6 @@ class Pools extends Extension
             $poolID = str_replace("_", " ", $matches[1]);
             $event->add_querylet(new Querylet("images.id IN (SELECT DISTINCT image_id FROM pool_images WHERE pool_id = $poolID)"));
         }
-		
     }
 
     public function onTagTermCheck(TagTermCheckEvent $event)
diff --git a/ext/rating/main.php b/ext/rating/main.php
index 86bae7ff..6ca026b0 100644
--- a/ext/rating/main.php
+++ b/ext/rating/main.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
- /**
- * @global ImageRating[] $_shm_ratings
- */
+/**
+* @global ImageRating[] $_shm_ratings
+*/
 global $_shm_ratings;
 $_shm_ratings = [];
 
diff --git a/ext/regen_thumb/main.php b/ext/regen_thumb/main.php
index 5dd22aa0..064b32c3 100644
--- a/ext/regen_thumb/main.php
+++ b/ext/regen_thumb/main.php
@@ -101,7 +101,7 @@ class RegenThumb extends Extension
         global $page;
         switch ($event->action) {
             case "regen_thumbs":
-            $event->redirect = true;
+                $event->redirect = true;
                 $force = false;
                 if (isset($_POST["regen_thumb_force"])&&$_POST["regen_thumb_force"]=="true") {
                     $force=true;
diff --git a/ext/resize/main.php b/ext/resize/main.php
index 3d34237d..155da809 100644
--- a/ext/resize/main.php
+++ b/ext/resize/main.php
@@ -134,10 +134,8 @@ class ResizeImage extends Extension
             if (is_null($image)) {
                 $this->theme->display_error(404, "Post not found", "No image in the database has the ID #$image_id");
             } else {
-
                 /* Check if options were given to resize an image. */
                 if (isset($_POST['resize_width']) || isset($_POST['resize_height'])) {
-
                     /* get options */
 
                     $width = $height = 0;
diff --git a/ext/rotate/main.php b/ext/rotate/main.php
index a5820b15..197f3549 100644
--- a/ext/rotate/main.php
+++ b/ext/rotate/main.php
@@ -65,10 +65,8 @@ class RotateImage extends Extension
             if (is_null($image)) {
                 $this->theme->display_error(404, "Post not found", "No image in the database has the ID #$image_id");
             } else {
-
                 /* Check if options were given to rotate an image. */
                 if (isset($_POST['rotate_deg'])) {
-
                     /* get options */
 
                     $deg = 0;
@@ -153,13 +151,18 @@ class RotateImage extends Extension
 
         /* Output to the same format as the original image */
         switch ($info[2]) {
-          case IMAGETYPE_GIF:   $result = imagegif($image_rotated, $tmp_filename);      break;
-          case IMAGETYPE_JPEG:  $result = imagejpeg($image_rotated, $tmp_filename);     break;
-          case IMAGETYPE_PNG:   $result = imagepng($image_rotated, $tmp_filename, 9);    break;
-          case IMAGETYPE_WEBP:  $result = imagewebp($image_rotated, $tmp_filename);     break;
-          case IMAGETYPE_BMP:   $result = imagebmp($image_rotated, $tmp_filename, true); break;
-          default:
-            throw new ImageRotateException("Unsupported image type.");
+            case IMAGETYPE_GIF:   $result = imagegif($image_rotated, $tmp_filename);
+            break;
+            case IMAGETYPE_JPEG:  $result = imagejpeg($image_rotated, $tmp_filename);
+            break;
+            case IMAGETYPE_PNG:   $result = imagepng($image_rotated, $tmp_filename, 9);
+            break;
+            case IMAGETYPE_WEBP:  $result = imagewebp($image_rotated, $tmp_filename);
+            break;
+            case IMAGETYPE_BMP:   $result = imagebmp($image_rotated, $tmp_filename, true);
+            break;
+            default:
+                throw new ImageRotateException("Unsupported image type.");
         }
 
         if ($result===false) {
diff --git a/ext/setup/main.php b/ext/setup/main.php
index 9833bbc5..43af95e8 100644
--- a/ext/setup/main.php
+++ b/ext/setup/main.php
@@ -396,10 +396,14 @@ class Setup extends Extension
                 $type = $_POST["_type_$name"];
                 $value = isset($_POST["_config_$name"]) ? $_POST["_config_$name"] : null;
                 switch ($type) {
-                    case "string": $config->set_string($name, $value); break;
-                    case "int":    $config->set_int($name, parse_shorthand_int((string)$value));    break;
-                    case "bool":   $config->set_bool($name, bool_escape($value));   break;
-                    case "array":  $config->set_array($name, $value);  break;
+                    case "string": $config->set_string($name, $value);
+                    break;
+                    case "int":    $config->set_int($name, parse_shorthand_int((string)$value));
+                    break;
+                    case "bool":   $config->set_bool($name, bool_escape($value));
+                    break;
+                    case "array":  $config->set_array($name, $value);
+                    break;
                 }
             }
         }
diff --git a/ext/tag_editcloud/main.php b/ext/tag_editcloud/main.php
index 9dd38e69..58369aa4 100644
--- a/ext/tag_editcloud/main.php
+++ b/ext/tag_editcloud/main.php
@@ -96,7 +96,7 @@ class TagEditCloud extends Extension
                     ["tag_min1" => $tags_min, "tag_min2" => $tags_min, "limit" => $max_count, "relevant_tags"=>$relevant_tags]
                 );
                 break;
-            /** @noinspection PhpMissingBreakStatementInspection */
+                /** @noinspection PhpMissingBreakStatementInspection */
             case 'c':
                 if (Extension::is_enabled(TagCategoriesInfo::KEY)) {
                     $tag_data = $database->get_all(
diff --git a/ext/transcode/main.php b/ext/transcode/main.php
index 90255c58..2c53c289 100644
--- a/ext/transcode/main.php
+++ b/ext/transcode/main.php
@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 require_once "config.php";
- /*
- * This is used by the image transcoding code when there is an error while transcoding
- */
+/*
+* This is used by the image transcoding code when there is an error while transcoding
+*/
 class ImageTranscodeException extends SCoreException
 {
 }
diff --git a/ext/transcode_video/main.php b/ext/transcode_video/main.php
index 4065a3b6..cf333c83 100644
--- a/ext/transcode_video/main.php
+++ b/ext/transcode_video/main.php
@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 require_once "config.php";
- /*
- * This is used by the image transcoding code when there is an error while transcoding
- */
+/*
+* This is used by the image transcoding code when there is an error while transcoding
+*/
 class VideoTranscodeException extends SCoreException
 {
 }
diff --git a/ext/upload/theme.php b/ext/upload/theme.php
index 07bcd08f..80627010 100644
--- a/ext/upload/theme.php
+++ b/ext/upload/theme.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use MicroHTML\HTMLElement;
+
 use function MicroHTML\TABLE;
 use function MicroHTML\TR;
 use function MicroHTML\TD;
diff --git a/ext/user/main.php b/ext/user/main.php
index 703b56ac..198abb9d 100644
--- a/ext/user/main.php
+++ b/ext/user/main.php
@@ -11,6 +11,7 @@ use MicroCRUD\IntegerColumn;
 use MicroCRUD\TextColumn;
 use MicroCRUD\DateColumn;
 use MicroCRUD\Table;
+
 use function MicroHTML\A;
 
 class UserNameColumn extends TextColumn
diff --git a/ext/user/theme.php b/ext/user/theme.php
index cb7281c4..d983db57 100644
--- a/ext/user/theme.php
+++ b/ext/user/theme.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 use MicroHTML\HTMLElement;
+
 use function MicroHTML\emptyHTML;
 use function MicroHTML\rawHTML;
 use function MicroHTML\TABLE;
diff --git a/ext/wiki/main.php b/ext/wiki/main.php
index e92f8c79..d894cf9d 100644
--- a/ext/wiki/main.php
+++ b/ext/wiki/main.php
@@ -490,14 +490,14 @@ class Wiki extends Extension
         $out        = "";
 
         while (
-                $c1 < $max1                 # have next line in left
-                and
-                $c2 < $max2                 # have next line in right
-                and
-                ($stop++) < 1000            # don-t have more then 1000 ( loop-stopper )
-                and
-                $outcount < 20              # output count is less then 20
-              ) {
+            $c1 < $max1                 # have next line in left
+            and
+            $c2 < $max2                 # have next line in right
+            and
+            ($stop++) < 1000            # don-t have more then 1000 ( loop-stopper )
+            and
+            $outcount < 20              # output count is less then 20
+        ) {
             /**
             *   is the trimmed line of the current left and current right line
             *   the same ? then this is a hit (no difference)
@@ -544,15 +544,14 @@ class Wiki extends Extension
 
                 #fast search in on both sides for next match.
                 while (
-                        $found == 0             # search until we find a pair
-                        and
-                        ($c1 + $s1 <= $max1)  # and we are inside of the left lines
-                        and
-                        ($c2 + $s2 <= $max2)  # and we are inside of the right lines
-                        and
-                        $fstop++  < 10          # and the distance is lower than 10 lines
-                      ) {
-
+                    $found == 0             # search until we find a pair
+                    and
+                    ($c1 + $s1 <= $max1)  # and we are inside of the left lines
+                    and
+                    ($c2 + $s2 <= $max2)  # and we are inside of the right lines
+                    and
+                    $fstop++  < 10          # and the distance is lower than 10 lines
+                ) {
                     /**
                     *   test the left side for a hit
                     *
diff --git a/themes/rule34v2/upload.theme.php b/themes/rule34v2/upload.theme.php
index 42b2e903..95d310d3 100644
--- a/themes/rule34v2/upload.theme.php
+++ b/themes/rule34v2/upload.theme.php
@@ -1,6 +1,7 @@
 <?php
 
 use MicroHTML\HTMLElement;
+
 use function MicroHTML\A;
 
 class CustomUploadTheme extends UploadTheme