diff --git a/composer.json b/composer.json
index 2c162c2..a91c88a 100644
--- a/composer.json
+++ b/composer.json
@@ -8,11 +8,11 @@
 		}
 	],
 	"require": {
-		"php": ">=7.2 <8.3",
+		"php": ">=7.4 <8.3",
 		"nette/php-generator": "3.6.9",
 		"symfony/yaml": "5.4.35",
 		"symfony/serializer": "5.4.36",
-		"psr/http-message": "^1.0"
+		"psr/http-message": "^1.1 || ^2.0"
 	},
 	"require-dev": {
 		"roave/security-advisories": "dev-latest"
diff --git a/composer.lock b/composer.lock
index 79401da..06bd0fb 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": "94068558cf668dcb0793376793ab3eb2",
+    "content-hash": "4c324d6cfcfc2b1af66ea4b1ec70b6ba",
     "packages": [
         {
             "name": "nette/php-generator",
@@ -162,25 +162,25 @@
         },
         {
             "name": "psr/http-message",
-            "version": "1.0.1",
+            "version": "2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-message.git",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -195,7 +195,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for HTTP messages",
@@ -208,29 +208,32 @@
                 "request",
                 "response"
             ],
-            "time": "2016-08-06T14:39:51+00:00"
+            "support": {
+                "source": "https://github.com/php-fig/http-message/tree/2.0"
+            },
+            "time": "2023-04-04T09:54:51+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.4.0",
+            "version": "v2.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"
+                "reference": "80d075412b557d41002320b96a096ca65aa2c98d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",
-                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/80d075412b557d41002320b96a096ca65aa2c98d",
+                "reference": "80d075412b557d41002320b96a096ca65aa2c98d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.4-dev"
+                    "dev-main": "2.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -259,7 +262,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.3"
             },
             "funding": [
                 {
@@ -275,20 +278,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-23T14:45:45+00:00"
+            "time": "2023-01-24T14:02:46+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.29.0",
+            "version": "v1.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
+                "reference": "0424dff1c58f028c451efff2045f5d92410bd540"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
-                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540",
+                "reference": "0424dff1c58f028c451efff2045f5d92410bd540",
                 "shasum": ""
             },
             "require": {
@@ -338,7 +341,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0"
             },
             "funding": [
                 {
@@ -354,20 +357,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-05-31T15:07:36+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.29.0",
+            "version": "v1.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
+                "reference": "77fa7995ac1b21ab60769b7323d600a991a90433"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
-                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433",
+                "reference": "77fa7995ac1b21ab60769b7323d600a991a90433",
                 "shasum": ""
             },
             "require": {
@@ -418,7 +421,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0"
             },
             "funding": [
                 {
@@ -434,7 +437,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-05-31T15:07:36+00:00"
         },
         {
             "name": "symfony/serializer",
@@ -622,19 +625,24 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Roave/SecurityAdvisories.git",
-                "reference": "ff52ee3ee2d26fca50036c28a1505c154fdcb613"
+                "reference": "f6f9a938afd75c2344952b0566983700829c7440"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/ff52ee3ee2d26fca50036c28a1505c154fdcb613",
-                "reference": "ff52ee3ee2d26fca50036c28a1505c154fdcb613",
+                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/f6f9a938afd75c2344952b0566983700829c7440",
+                "reference": "f6f9a938afd75c2344952b0566983700829c7440",
                 "shasum": ""
             },
             "conflict": {
                 "3f/pygmentize": "<1.2",
-                "admidio/admidio": "<4.2.13",
+                "admidio/admidio": "<4.3.10",
                 "adodb/adodb-php": "<=5.20.20|>=5.21,<=5.21.3",
                 "aheinze/cockpit": "<2.2",
+                "aimeos/ai-admin-graphql": ">=2022.04.1,<2022.10.10|>=2023.04.1,<2023.10.6|>=2024.04.1,<2024.04.6",
+                "aimeos/ai-admin-jsonadm": "<2020.10.13|>=2021.04.1,<2021.10.6|>=2022.04.1,<2022.10.3|>=2023.04.1,<2023.10.4|==2024.04.1",
+                "aimeos/ai-client-html": ">=2020.04.1,<2020.10.27|>=2021.04.1,<2021.10.22|>=2022.04.1,<2022.10.13|>=2023.04.1,<2023.10.15|>=2024.04.1,<2024.04.7",
+                "aimeos/ai-controller-frontend": "<2020.10.15|>=2021.04.1,<2021.10.8|>=2022.04.1,<2022.10.8|>=2023.04.1,<2023.10.9",
+                "aimeos/aimeos-core": ">=2022.04.1,<2022.10.17|>=2023.04.1,<2023.10.17|>=2024.04.1,<2024.04.7",
                 "aimeos/aimeos-typo3": "<19.10.12|>=20,<20.10.5",
                 "airesvsg/acf-to-rest-api": "<=3.1",
                 "akaunting/akaunting": "<2.1.13",
@@ -643,7 +651,7 @@
                 "alterphp/easyadmin-extension-bundle": ">=1.2,<1.2.11|>=1.3,<1.3.1",
                 "amazing/media2click": ">=1,<1.3.3",
                 "amphp/artax": "<1.0.6|>=2,<2.0.6",
-                "amphp/http": "<1.0.1",
+                "amphp/http": "<=1.7.2|>=2,<=2.1",
                 "amphp/http-client": ">=4,<4.4",
                 "anchorcms/anchor-cms": "<=0.12.7",
                 "andreapollastri/cipi": "<=3.1.15",
@@ -659,11 +667,13 @@
                 "athlon1600/php-proxy": "<=5.1",
                 "athlon1600/php-proxy-app": "<=3",
                 "austintoddj/canvas": "<=3.4.2",
-                "automad/automad": "<=1.10.9",
+                "auth0/wordpress": "<=4.6",
+                "automad/automad": "<2.0.0.0-alpha5",
+                "automattic/jetpack": "<9.8",
                 "awesome-support/awesome-support": "<=6.0.7",
                 "aws/aws-sdk-php": "<3.288.1",
                 "azuracast/azuracast": "<0.18.3",
-                "backdrop/backdrop": "<1.24.2",
+                "backdrop/backdrop": "<1.27.3|>=1.28,<1.28.2",
                 "backpack/crud": "<3.4.9",
                 "bacula-web/bacula-web": "<8.0.0.0-RC2-dev",
                 "badaso/core": "<2.7",
@@ -674,12 +684,17 @@
                 "barzahlen/barzahlen-php": "<2.0.1",
                 "baserproject/basercms": "<5.0.9",
                 "bassjobsen/bootstrap-3-typeahead": ">4.0.2",
+                "bbpress/bbpress": "<2.6.5",
+                "bcosca/fatfree": "<3.7.2",
+                "bedita/bedita": "<4",
                 "bigfork/silverstripe-form-capture": ">=3,<3.1.1",
-                "billz/raspap-webgui": "<2.9.5",
+                "billz/raspap-webgui": "<=3.1.4",
                 "bk2k/bootstrap-package": ">=7.1,<7.1.2|>=8,<8.0.8|>=9,<9.0.4|>=9.1,<9.1.3|>=10,<10.0.10|>=11,<11.0.3",
+                "blueimp/jquery-file-upload": "==6.4.4",
                 "bmarshall511/wordpress_zero_spam": "<5.2.13",
                 "bolt/bolt": "<3.7.2",
                 "bolt/core": "<=4.2",
+                "born05/craft-twofactorauthentication": "<3.3.4",
                 "bottelet/flarepoint": "<2.2.1",
                 "bref/bref": "<2.1.17",
                 "brightlocal/phpwhois": "<=4.2.5",
@@ -695,6 +710,7 @@
                 "cardgate/magento2": "<2.0.33",
                 "cardgate/woocommerce": "<=3.1.15",
                 "cart2quote/module-quotation": ">=4.1.6,<=4.4.5|>=5,<5.4.4",
+                "cart2quote/module-quotation-encoded": ">=4.1.6,<=4.4.5|>=5,<5.4.4",
                 "cartalyst/sentry": "<=2.1.6",
                 "catfan/medoo": "<1.7.5",
                 "causal/oidc": "<2.1",
@@ -704,56 +720,60 @@
                 "chriskacerguis/codeigniter-restserver": "<=2.7.1",
                 "civicrm/civicrm-core": ">=4.2,<4.2.9|>=4.3,<4.3.3",
                 "ckeditor/ckeditor": "<4.24",
-                "cockpit-hq/cockpit": "<=2.6.3|==2.7",
+                "cockpit-hq/cockpit": "<2.7|==2.7",
                 "codeception/codeception": "<3.1.3|>=4,<4.1.22",
                 "codeigniter/framework": "<3.1.9",
                 "codeigniter4/framework": "<4.4.7",
                 "codeigniter4/shield": "<1.0.0.0-beta8",
                 "codiad/codiad": "<=2.8.4",
-                "composer/composer": "<1.10.27|>=2,<2.2.23|>=2.3,<2.7",
-                "concrete5/concrete5": "<9.2.7",
+                "composer/composer": "<1.10.27|>=2,<2.2.24|>=2.3,<2.7.7",
+                "concrete5/concrete5": "<9.3.3",
                 "concrete5/core": "<8.5.8|>=9,<9.1",
                 "contao-components/mediaelement": ">=2.14.2,<2.21.1",
-                "contao/contao": ">=4,<4.4.56|>=4.5,<4.9.40|>=4.10,<4.11.7|>=4.13,<4.13.21|>=5.1,<5.1.4",
-                "contao/core": ">=2,<3.5.39",
-                "contao/core-bundle": ">=3,<3.5.35|>=4,<4.9.42|>=4.10,<4.13.28|>=5,<5.1.10",
-                "contao/listing-bundle": ">=4,<4.4.8",
+                "contao/comments-bundle": ">=2,<4.13.40|>=5.0.0.0-RC1-dev,<5.3.4",
+                "contao/contao": ">=3,<3.5.37|>=4,<4.4.56|>=4.5,<4.9.40|>=4.10,<4.11.7|>=4.13,<4.13.21|>=5.1,<5.1.4",
+                "contao/core": "<3.5.39",
+                "contao/core-bundle": "<4.13.40|>=5,<5.3.4",
+                "contao/listing-bundle": ">=3,<=3.5.30|>=4,<4.4.8",
                 "contao/managed-edition": "<=1.5",
                 "corveda/phpsandbox": "<1.3.5",
                 "cosenary/instagram": "<=2.3",
-                "craftcms/cms": "<4.6.2",
+                "craftcms/cms": "<4.6.2|>=5.0.0.0-beta1,<=5.2.2",
                 "croogo/croogo": "<4",
                 "cuyz/valinor": "<0.12",
                 "czproject/git-php": "<4.0.3",
+                "dapphp/securimage": "<3.6.6",
                 "darylldoyle/safe-svg": "<1.9.10",
                 "datadog/dd-trace": ">=0.30,<0.30.2",
                 "datatables/datatables": "<1.10.10",
                 "david-garcia/phpwhois": "<=4.3.1",
                 "dbrisinajumi/d2files": "<1",
-                "dcat/laravel-admin": "<=2.1.3.0-beta",
+                "dcat/laravel-admin": "<=2.1.3",
                 "derhansen/fe_change_pwd": "<2.0.5|>=3,<3.0.3",
                 "derhansen/sf_event_mgt": "<4.3.1|>=5,<5.1.1|>=7,<7.4",
                 "desperado/xml-bundle": "<=0.1.7",
+                "devgroup/dotplant": "<2020.09.14-dev",
                 "directmailteam/direct-mail": "<6.0.3|>=7,<7.0.3|>=8,<9.5.2",
                 "doctrine/annotations": "<1.2.7",
                 "doctrine/cache": ">=1,<1.3.2|>=1.4,<1.4.2",
                 "doctrine/common": "<2.4.3|>=2.5,<2.5.1",
                 "doctrine/dbal": ">=2,<2.0.8|>=2.1,<2.1.2|>=3,<3.1.4",
                 "doctrine/doctrine-bundle": "<1.5.2",
-                "doctrine/doctrine-module": "<=0.7.1",
+                "doctrine/doctrine-module": "<0.7.2",
                 "doctrine/mongodb-odm": "<1.0.2",
                 "doctrine/mongodb-odm-bundle": "<3.0.1",
-                "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1|>=2.8.3,<2.8.4",
-                "dolibarr/dolibarr": "<18.0.2",
+                "doctrine/orm": ">=1,<1.2.4|>=2,<2.4.8|>=2.5,<2.5.1|>=2.8.3,<2.8.4",
+                "dolibarr/dolibarr": "<19.0.2",
                 "dompdf/dompdf": "<2.0.4",
                 "doublethreedigital/guest-entries": "<3.1.2",
                 "drupal/core": ">=6,<6.38|>=7,<7.96|>=8,<10.1.8|>=10.2,<10.2.2",
                 "drupal/drupal": ">=5,<5.11|>=6,<6.38|>=7,<7.80|>=8,<8.9.16|>=9,<9.1.12|>=9.2,<9.2.4",
                 "duncanmcclean/guest-entries": "<3.1.2",
                 "dweeves/magmi": "<=0.7.24",
-                "ec-cube/ec-cube": "<2.4.4",
+                "ec-cube/ec-cube": "<2.4.4|>=2.11,<=2.17.1|>=3,<=3.0.18.0-patch4|>=4,<=4.1.2",
                 "ecodev/newsletter": "<=4",
                 "ectouch/ectouch": "<=2.7.2",
+                "egroupware/egroupware": "<23.1.20240624",
                 "elefant/cms": "<2.0.7",
                 "elgg/elgg": "<3.3.24|>=4,<4.0.5",
                 "elijaa/phpmemcacheadmin": "<=1.3",
@@ -771,12 +791,12 @@
                 "ezsystems/ezdemo-ls-extension": ">=5.4,<5.4.2.1-dev",
                 "ezsystems/ezfind-ls": ">=5.3,<5.3.6.1-dev|>=5.4,<5.4.11.1-dev|>=2017.12,<2017.12.0.1-dev",
                 "ezsystems/ezplatform": "<=1.13.6|>=2,<=2.5.24",
-                "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.6|>=1.5,<1.5.29|>=2.3,<2.3.26",
+                "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.6|>=1.5,<1.5.29|>=2.3,<2.3.26|>=3.3,<3.3.39",
                 "ezsystems/ezplatform-admin-ui-assets": ">=4,<4.2.1|>=5,<5.0.1|>=5.1,<5.1.1",
                 "ezsystems/ezplatform-graphql": ">=1.0.0.0-RC1-dev,<1.0.13|>=2.0.0.0-beta1,<2.3.12",
                 "ezsystems/ezplatform-kernel": "<1.2.5.1-dev|>=1.3,<1.3.35",
                 "ezsystems/ezplatform-rest": ">=1.2,<=1.2.2|>=1.3,<1.3.8",
-                "ezsystems/ezplatform-richtext": ">=2.3,<2.3.7.1-dev",
+                "ezsystems/ezplatform-richtext": ">=2.3,<2.3.7.1-dev|>=3.3,<3.3.40",
                 "ezsystems/ezplatform-solr-search-engine": ">=1.7,<1.7.12|>=2,<2.0.2|>=3.3,<3.3.15",
                 "ezsystems/ezplatform-user": ">=1,<1.0.1",
                 "ezsystems/ezpublish-kernel": "<6.13.8.2-dev|>=7,<7.5.31",
@@ -786,14 +806,19 @@
                 "ezyang/htmlpurifier": "<4.1.1",
                 "facade/ignition": "<1.16.15|>=2,<2.4.2|>=2.5,<2.5.2",
                 "facturascripts/facturascripts": "<=2022.08",
+                "fastly/magento2": "<1.2.26",
                 "feehi/cms": "<=2.1.1",
                 "feehi/feehicms": "<=2.1.1",
                 "fenom/fenom": "<=2.12.1",
                 "filegator/filegator": "<7.8",
+                "filp/whoops": "<2.1.13",
+                "fineuploader/php-traditional-server": "<=1.2.2",
                 "firebase/php-jwt": "<6",
+                "fisharebest/webtrees": "<=2.1.18",
                 "fixpunkt/fp-masterquiz": "<2.2.1|>=3,<3.5.2",
                 "fixpunkt/fp-newsletter": "<1.1.1|>=2,<2.1.2|>=2.2,<3.2.6",
                 "flarum/core": "<1.8.5",
+                "flarum/flarum": "<0.1.0.0-beta8",
                 "flarum/framework": "<1.8.5",
                 "flarum/mentions": "<1.6.3",
                 "flarum/sticky": ">=0.1.0.0-beta14,<=0.1.0.0-beta15",
@@ -806,34 +831,37 @@
                 "fooman/tcpdf": "<6.2.22",
                 "forkcms/forkcms": "<5.11.1",
                 "fossar/tcpdf-parser": "<6.2.22",
-                "francoisjacquet/rosariosis": "<11",
+                "francoisjacquet/rosariosis": "<=11.5.1",
                 "frappant/frp-form-answers": "<3.1.2|>=4,<4.0.2",
                 "friendsofsymfony/oauth2-php": "<1.3",
                 "friendsofsymfony/rest-bundle": ">=1.2,<1.2.2",
-                "friendsofsymfony/user-bundle": ">=1.2,<1.3.5",
+                "friendsofsymfony/user-bundle": ">=1,<1.3.5",
+                "friendsofsymfony1/swiftmailer": ">=4,<5.4.13|>=6,<6.2.5",
                 "friendsofsymfony1/symfony1": ">=1.1,<1.5.19",
                 "friendsoftypo3/mediace": ">=7.6.2,<7.6.5",
                 "friendsoftypo3/openid": ">=4.5,<4.5.31|>=4.7,<4.7.16|>=6,<6.0.11|>=6.1,<6.1.6",
                 "froala/wysiwyg-editor": "<3.2.7|>=4.0.1,<=4.1.3",
-                "froxlor/froxlor": "<=2.1.1",
+                "froxlor/froxlor": "<=2.2.0.0-RC3",
+                "frozennode/administrator": "<=5.0.12",
                 "fuel/core": "<1.8.1",
                 "funadmin/funadmin": "<=3.2|>=3.3.2,<=3.3.3",
                 "gaoming13/wechat-php-sdk": "<=1.10.2",
                 "genix/cms": "<=1.1.11",
-                "getgrav/grav": "<1.7.45",
+                "getformwork/formwork": "<1.13.1|==2.0.0.0-beta1",
+                "getgrav/grav": "<1.7.46",
                 "getkirby/cms": "<4.1.1",
                 "getkirby/kirby": "<=2.5.12",
                 "getkirby/panel": "<2.5.14",
                 "getkirby/starterkit": "<=3.7.0.2",
                 "gilacms/gila": "<=1.15.4",
-                "gleez/cms": "<=1.2|==2",
+                "gleez/cms": "<=1.3|==2",
                 "globalpayments/php-sdk": "<2",
                 "gogentooss/samlbase": "<1.2.7",
                 "google/protobuf": "<3.15",
                 "gos/web-socket-bundle": "<1.10.4|>=2,<2.6.1|>=3,<3.3",
                 "gree/jose": "<2.2.1",
                 "gregwar/rst": "<1.0.3",
-                "grumpydictator/firefly-iii": "<6.1.7",
+                "grumpydictator/firefly-iii": "<6.1.17",
                 "gugoan/economizzer": "<=0.9.0.0-beta1",
                 "guzzlehttp/guzzle": "<6.5.8|>=7,<7.4.5",
                 "guzzlehttp/psr7": "<1.9.1|>=2,<2.4.5",
@@ -847,8 +875,9 @@
                 "hov/jobfair": "<1.0.13|>=2,<2.0.2",
                 "httpsoft/http-message": "<1.0.12",
                 "hyn/multi-tenant": ">=5.6,<5.7.2",
-                "ibexa/admin-ui": ">=4.2,<4.2.3",
+                "ibexa/admin-ui": ">=4.2,<4.2.3|>=4.6.0.0-beta1,<4.6.9",
                 "ibexa/core": ">=4,<4.0.7|>=4.1,<4.1.4|>=4.2,<4.2.3|>=4.5,<4.5.6|>=4.6,<4.6.2",
+                "ibexa/fieldtype-richtext": ">=4.6,<4.6.10",
                 "ibexa/graphql": ">=2.5,<2.5.31|>=3.3,<3.3.28|>=4.2,<4.2.3",
                 "ibexa/post-install": "<=1.0.4",
                 "ibexa/solr": ">=4.5,<4.5.4",
@@ -857,17 +886,21 @@
                 "idno/known": "<=1.3.1",
                 "ilicmiljan/secure-props": ">=1.2,<1.2.2",
                 "illuminate/auth": "<5.5.10",
-                "illuminate/cookie": ">=4,<=4.0.11|>=4.1,<=4.1.99999|>=4.2,<=4.2.99999|>=5,<=5.0.99999|>=5.1,<=5.1.99999|>=5.2,<=5.2.99999|>=5.3,<=5.3.99999|>=5.4,<=5.4.99999|>=5.5,<=5.5.49|>=5.6,<=5.6.99999|>=5.7,<=5.7.99999|>=5.8,<=5.8.99999|>=6,<6.18.31|>=7,<7.22.4",
+                "illuminate/cookie": ">=4,<=4.0.11|>=4.1,<6.18.31|>=7,<7.22.4",
                 "illuminate/database": "<6.20.26|>=7,<7.30.5|>=8,<8.40",
                 "illuminate/encryption": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.40|>=5.6,<5.6.15",
                 "illuminate/view": "<6.20.42|>=7,<7.30.6|>=8,<8.75",
+                "imdbphp/imdbphp": "<=5.1.1",
                 "impresscms/impresscms": "<=1.4.5",
                 "impresspages/impresspages": "<=1.0.12",
                 "in2code/femanager": "<5.5.3|>=6,<6.3.4|>=7,<7.2.3",
                 "in2code/ipandlanguageredirect": "<5.1.2",
                 "in2code/lux": "<17.6.1|>=18,<24.0.2",
+                "in2code/powermail": "<7.5|>=8,<8.5|>=9,<10.9|>=12,<12.4",
                 "innologi/typo3-appointments": "<2.0.6",
                 "intelliants/subrion": "<4.2.2",
+                "inter-mediator/inter-mediator": "==5.5",
+                "ipl/web": "<0.10.1",
                 "islandora/islandora": ">=2,<2.4.1",
                 "ivankristianto/phpwhois": "<=4.3",
                 "jackalope/jackalope-doctrine-dbal": "<1.7.4",
@@ -888,51 +921,57 @@
                 "jsdecena/laracom": "<2.0.9",
                 "jsmitty12/phpwhois": "<5.1",
                 "juzaweb/cms": "<=3.4",
+                "jweiland/events2": "<8.3.8|>=9,<9.0.6",
                 "kazist/phpwhois": "<=4.2.6",
                 "kelvinmo/simplexrd": "<3.1.1",
                 "kevinpapst/kimai2": "<1.16.7",
                 "khodakhah/nodcms": "<=3",
-                "kimai/kimai": "<2.13",
+                "kimai/kimai": "<2.16",
                 "kitodo/presentation": "<3.2.3|>=3.3,<3.3.4",
                 "klaviyo/magento2-extension": ">=1,<3",
                 "knplabs/knp-snappy": "<=1.4.2",
                 "kohana/core": "<3.3.3",
                 "krayin/laravel-crm": "<1.2.2",
                 "kreait/firebase-php": ">=3.2,<3.8.1",
+                "kumbiaphp/kumbiapp": "<=1.1.1",
                 "la-haute-societe/tcpdf": "<6.2.22",
                 "laminas/laminas-diactoros": "<2.18.1|==2.19|==2.20|==2.21|==2.22|==2.23|>=2.24,<2.24.2|>=2.25,<2.25.2",
                 "laminas/laminas-form": "<2.17.1|>=3,<3.0.2|>=3.1,<3.1.1",
                 "laminas/laminas-http": "<2.14.2",
                 "laravel/fortify": "<1.11.1",
                 "laravel/framework": "<6.20.44|>=7,<7.30.6|>=8,<8.75",
-                "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10",
+                "laravel/laravel": ">=5.4,<5.4.22",
+                "laravel/socialite": ">=1,<2.0.10",
                 "latte/latte": "<2.10.8",
-                "lavalite/cms": "<=9",
+                "lavalite/cms": "<=9|==10.1",
                 "lcobucci/jwt": ">=3.4,<3.4.6|>=4,<4.0.4|>=4.1,<4.1.5",
                 "league/commonmark": "<0.18.3",
                 "league/flysystem": "<1.1.4|>=2,<2.1.1",
                 "league/oauth2-server": ">=8.3.2,<8.4.2|>=8.5,<8.5.3",
                 "lexik/jwt-authentication-bundle": "<2.10.7|>=2.11,<2.11.3",
+                "libreform/libreform": ">=2,<=2.0.8",
                 "librenms/librenms": "<2017.08.18",
                 "liftkit/database": "<2.13.2",
+                "lightsaml/lightsaml": "<1.3.5",
                 "limesurvey/limesurvey": "<3.27.19",
                 "livehelperchat/livehelperchat": "<=3.91",
                 "livewire/livewire": ">2.2.4,<2.2.6|>=3.3.5,<3.4.9",
                 "lms/routes": "<2.1.1",
                 "localizationteam/l10nmgr": "<7.4|>=8,<8.7|>=9,<9.2",
                 "luyadev/yii-helpers": "<1.2.1",
-                "magento/community-edition": "<2.4.3.0-patch3|>=2.4.4,<2.4.5",
+                "magento/community-edition": "<2.4.5|==2.4.5|>=2.4.5.0-patch1,<2.4.5.0-patch8|==2.4.6|>=2.4.6.0-patch1,<2.4.6.0-patch6|==2.4.7",
                 "magento/core": "<=1.9.4.5",
                 "magento/magento1ce": "<1.9.4.3-dev",
                 "magento/magento1ee": ">=1,<1.14.4.3-dev",
-                "magento/product-community-edition": ">=2,<2.2.10|>=2.3,<2.3.2.0-patch2",
+                "magento/product-community-edition": "<2.4.4.0-patch9|>=2.4.5,<2.4.5.0-patch8|>=2.4.6,<2.4.6.0-patch6|>=2.4.7,<2.4.7.0-patch1",
                 "magneto/core": "<1.9.4.4-dev",
                 "maikuolan/phpmussel": ">=1,<1.6",
                 "mainwp/mainwp": "<=4.4.3.3",
-                "mantisbt/mantisbt": "<2.26.1",
+                "mantisbt/mantisbt": "<2.26.2",
                 "marcwillmann/turn": "<0.3.3",
                 "matyhtf/framework": "<3.0.6",
-                "mautic/core": "<4.3",
+                "mautic/core": "<4.4.12|>=5.0.0.0-alpha,<5.0.4",
+                "mdanter/ecc": "<2",
                 "mediawiki/core": "<1.36.2",
                 "mediawiki/matomo": "<2.4.3",
                 "mediawiki/semantic-media-wiki": "<4.0.2",
@@ -944,7 +983,8 @@
                 "microsoft/microsoft-graph": ">=1.16,<1.109.1|>=2,<2.0.1",
                 "microsoft/microsoft-graph-beta": "<2.0.1",
                 "microsoft/microsoft-graph-core": "<2.0.2",
-                "microweber/microweber": "<=2.0.4",
+                "microweber/microweber": "<=2.0.16",
+                "mikehaertl/php-shellcommand": "<1.6.1",
                 "miniorange/miniorange-saml": "<1.4.3",
                 "mittwald/typo3_forum": "<1.2.1",
                 "mobiledetect/mobiledetectlib": "<2.8.32",
@@ -952,13 +992,17 @@
                 "mojo42/jirafeau": "<4.4",
                 "mongodb/mongodb": ">=1,<1.9.2",
                 "monolog/monolog": ">=1.8,<1.12",
-                "moodle/moodle": "<=4.3.3",
+                "moodle/moodle": "<4.3.5|>=4.4.0.0-beta,<4.4.1",
                 "mos/cimage": "<0.7.19",
                 "movim/moxl": ">=0.8,<=0.10",
+                "movingbytes/social-network": "<=1.2.1",
                 "mpdf/mpdf": "<=7.1.7",
                 "munkireport/comment": "<4.1",
                 "munkireport/managedinstalls": "<2.6",
+                "munkireport/munki_facts": "<1.5",
                 "munkireport/munkireport": ">=2.5.3,<5.6.3",
+                "munkireport/reportdata": "<3.5",
+                "munkireport/softwareupdate": "<1.6",
                 "mustache/mustache": ">=2,<2.14.1",
                 "namshi/jose": "<2.2",
                 "neoan3-apps/template": "<1.1.1",
@@ -966,8 +1010,8 @@
                 "neos/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.12|>=3.1,<3.1.10|>=3.2,<3.2.13|>=3.3,<3.3.13|>=4,<4.0.6",
                 "neos/form": ">=1.2,<4.3.3|>=5,<5.0.9|>=5.1,<5.1.3",
                 "neos/media-browser": "<7.3.19|>=8,<8.0.16|>=8.1,<8.1.11|>=8.2,<8.2.11|>=8.3,<8.3.9",
-                "neos/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.9.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<5.3.10|>=7,<7.0.9|>=7.1,<7.1.7|>=7.2,<7.2.6|>=7.3,<7.3.4|>=8,<8.0.2",
-                "neos/swiftmailer": ">=4.1,<4.1.99|>=5.4,<5.4.5",
+                "neos/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<5.3.10|>=7,<7.0.9|>=7.1,<7.1.7|>=7.2,<7.2.6|>=7.3,<7.3.4|>=8,<8.0.2",
+                "neos/swiftmailer": "<5.4.5",
                 "netgen/tagsbundle": ">=3.4,<3.4.11|>=4,<4.0.15",
                 "nette/application": ">=2,<2.0.19|>=2.1,<2.1.13|>=2.2,<2.2.10|>=2.3,<2.3.14|>=2.4,<2.4.16|>=3,<3.0.6",
                 "nette/nette": ">=2,<2.0.19|>=2.1,<2.1.13",
@@ -975,22 +1019,25 @@
                 "nonfiction/nterchange": "<4.1.1",
                 "notrinos/notrinos-erp": "<=0.7",
                 "noumo/easyii": "<=0.9",
+                "novaksolutions/infusionsoft-php-sdk": "<1",
                 "nukeviet/nukeviet": "<4.5.02",
                 "nyholm/psr7": "<1.6.1",
                 "nystudio107/craft-seomatic": "<3.4.12",
+                "nzedb/nzedb": "<0.8",
                 "nzo/url-encryptor-bundle": ">=4,<4.3.2|>=5,<5.0.1",
                 "october/backend": "<1.1.2",
                 "october/cms": "<1.0.469|==1.0.469|==1.0.471|==1.1.1",
                 "october/october": "<=3.4.4",
                 "october/rain": "<1.0.472|>=1.1,<1.1.2",
-                "october/system": "<1.0.476|>=1.1,<1.1.12|>=2,<2.2.34|>=3,<3.5.2",
+                "october/system": "<1.0.476|>=1.1,<1.1.12|>=2,<2.2.34|>=3,<3.5.15",
                 "omeka/omeka-s": "<4.0.3",
                 "onelogin/php-saml": "<2.10.4",
                 "oneup/uploader-bundle": ">=1,<1.9.3|>=2,<2.1.5",
                 "open-web-analytics/open-web-analytics": "<1.7.4",
-                "opencart/opencart": "<=3.0.3.7|>=4,<4.0.2.3-dev",
+                "opencart/opencart": ">=0",
                 "openid/php-openid": "<2.3",
-                "openmage/magento-lts": "<20.5",
+                "openmage/magento-lts": "<20.10.1",
+                "opensolutions/vimbadmin": "<=3.0.15",
                 "opensource-workshop/connect-cms": "<1.7.2|>=2,<2.3.2",
                 "orchid/platform": ">=9,<9.4.4|>=14.0.0.0-alpha4,<14.5",
                 "oro/calendar-bundle": ">=4.2,<=4.2.6|>=5,<=5.0.6|>=5.1,<5.1.1",
@@ -999,14 +1046,20 @@
                 "oro/crm-call-bundle": ">=4.2,<=4.2.5|>=5,<5.0.4|>=5.1,<5.1.1",
                 "oro/customer-portal": ">=4.1,<=4.1.13|>=4.2,<=4.2.10|>=5,<=5.0.11|>=5.1,<=5.1.3",
                 "oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.29|>=4.1,<4.1.17|>=4.2,<=4.2.10|>=5,<=5.0.12|>=5.1,<=5.1.3",
+                "oveleon/contao-cookiebar": "<1.16.3|>=2,<2.1.3",
                 "oxid-esales/oxideshop-ce": "<4.5",
+                "oxid-esales/paymorrow-module": ">=1,<1.0.2|>=2,<2.0.1",
                 "packbackbooks/lti-1-3-php-library": "<5",
                 "padraic/humbug_get_contents": "<1.1.2",
                 "pagarme/pagarme-php": "<3",
                 "pagekit/pagekit": "<=1.0.18",
+                "paragonie/ecc": "<2.0.1",
                 "paragonie/random_compat": "<2",
-                "passbolt/passbolt_api": "<2.11",
+                "passbolt/passbolt_api": "<4.6.2",
+                "paypal/adaptivepayments-sdk-php": "<=3.9.2",
+                "paypal/invoice-sdk-php": "<=3.9",
                 "paypal/merchant-sdk-php": "<3.12",
+                "paypal/permissions-sdk-php": "<=3.9.1",
                 "pear/archive_tar": "<1.4.14",
                 "pear/auth": "<1.2.4",
                 "pear/crypt_gpg": "<1.6.7",
@@ -1015,6 +1068,7 @@
                 "personnummer/personnummer": "<3.0.2",
                 "phanan/koel": "<5.1.4",
                 "phenx/php-svg-lib": "<0.5.2",
+                "php-censor/php-censor": "<2.0.13|>=2.1,<2.1.5",
                 "php-mod/curl": "<2.3.2",
                 "phpbb/phpbb": "<3.2.10|>=3.3,<3.3.1",
                 "phpems/phpems": ">=6,<=6.1.3",
@@ -1023,6 +1077,7 @@
                 "phpmussel/phpmussel": ">=1,<1.6",
                 "phpmyadmin/phpmyadmin": "<5.2.1",
                 "phpmyfaq/phpmyfaq": "<3.2.5|==3.2.5",
+                "phpoffice/common": "<0.2.9",
                 "phpoffice/phpexcel": "<1.8",
                 "phpoffice/phpspreadsheet": "<1.16",
                 "phpseclib/phpseclib": "<2.0.47|>=3,<3.0.36",
@@ -1033,13 +1088,13 @@
                 "phpxmlrpc/extras": "<0.6.1",
                 "phpxmlrpc/phpxmlrpc": "<4.9.2",
                 "pi/pi": "<=2.5",
-                "pimcore/admin-ui-classic-bundle": "<1.3.4",
+                "pimcore/admin-ui-classic-bundle": "<=1.5.1",
                 "pimcore/customer-management-framework-bundle": "<4.0.6",
                 "pimcore/data-hub": "<1.2.4",
                 "pimcore/demo": "<10.3",
                 "pimcore/ecommerce-framework-bundle": "<1.0.10",
                 "pimcore/perspective-editor": "<1.5.1",
-                "pimcore/pimcore": "<11.1.6.1-dev|>=11.2,<11.2.2",
+                "pimcore/pimcore": "<11.2.4",
                 "pixelfed/pixelfed": "<0.11.11",
                 "plotly/plotly.js": "<2.25.2",
                 "pocketmine/bedrock-protocol": "<8.0.2",
@@ -1051,22 +1106,25 @@
                 "prestashop/blockwishlist": ">=2,<2.1.1",
                 "prestashop/contactform": ">=1.0.1,<4.3",
                 "prestashop/gamification": "<2.3.2",
-                "prestashop/prestashop": "<8.1.4",
+                "prestashop/prestashop": "<8.1.6",
                 "prestashop/productcomments": "<5.0.2",
                 "prestashop/ps_emailsubscription": "<2.6.1",
                 "prestashop/ps_facetedsearch": "<3.4.1",
                 "prestashop/ps_linklist": "<3.1",
-                "privatebin/privatebin": "<1.4",
-                "processwire/processwire": "<=3.0.210",
+                "privatebin/privatebin": "<1.4|>=1.5,<1.7.4",
+                "processwire/processwire": "<=3.0.229",
                 "propel/propel": ">=2.0.0.0-alpha1,<=2.0.0.0-alpha7",
                 "propel/propel1": ">=1,<=1.7.1",
-                "pterodactyl/panel": "<1.7",
+                "pterodactyl/panel": "<1.11.6",
                 "ptheofan/yii2-statemachine": ">=2.0.0.0-RC1-dev,<=2",
                 "ptrofimov/beanstalk_console": "<1.7.14",
                 "pubnub/pubnub": "<6.1",
                 "pusher/pusher-php-server": "<2.2.1",
                 "pwweb/laravel-core": "<=0.3.6.0-beta",
+                "pxlrbt/filament-excel": "<2.3.3",
                 "pyrocms/pyrocms": "<=3.9.1",
+                "qcubed/qcubed": "<=3.1.1",
+                "quickapps/cms": "<=2.0.0.0-beta2",
                 "rainlab/blog-plugin": "<1.4.1",
                 "rainlab/debugbar-plugin": "<3.1",
                 "rainlab/user-plugin": "<=1.4.5",
@@ -1076,7 +1134,7 @@
                 "really-simple-plugins/complianz-gdpr": "<6.4.2",
                 "redaxo/source": "<=5.15.1",
                 "remdex/livehelperchat": "<4.29",
-                "reportico-web/reportico": "<=7.1.21",
+                "reportico-web/reportico": "<=8.1",
                 "rhukster/dom-sanitizer": "<1.0.7",
                 "rmccue/requests": ">=1.6,<1.8",
                 "robrichards/xmlseclibs": ">=1,<3.0.4",
@@ -1091,29 +1149,30 @@
                 "serluck/phpwhois": "<=4.2.6",
                 "sfroemken/url_redirect": "<=1.2.1",
                 "sheng/yiicms": "<=1.2",
-                "shopware/core": "<=6.5.7.3",
-                "shopware/platform": "<=6.5.7.3|>=6.5.8,<6.5.8.7-dev",
+                "shopware/core": "<=6.5.8.12|>=6.6,<=6.6.5",
+                "shopware/platform": "<=6.5.8.12|>=6.6,<=6.6.5",
                 "shopware/production": "<=6.3.5.2",
                 "shopware/shopware": "<=5.7.17",
                 "shopware/storefront": "<=6.4.8.1|>=6.5.8,<6.5.8.7-dev",
-                "shopxo/shopxo": "<2.2.6",
+                "shopxo/shopxo": "<=6.1",
                 "showdoc/showdoc": "<2.10.4",
                 "silverstripe-australia/advancedreports": ">=1,<=2",
                 "silverstripe/admin": "<1.13.19|>=2,<2.1.8",
                 "silverstripe/assets": ">=1,<1.11.1",
                 "silverstripe/cms": "<4.11.3",
-                "silverstripe/comments": ">=1.3,<1.9.99|>=2,<2.9.99|>=3,<3.1.1",
+                "silverstripe/comments": ">=1.3,<3.1.1",
                 "silverstripe/forum": "<=0.6.1|>=0.7,<=0.7.3",
-                "silverstripe/framework": "<4.13.39|>=5,<5.1.11",
+                "silverstripe/framework": "<5.2.16",
                 "silverstripe/graphql": ">=2,<2.0.5|>=3,<3.8.2|>=4,<4.3.7|>=5,<5.1.3",
                 "silverstripe/hybridsessions": ">=1,<2.4.1|>=2.5,<2.5.1",
                 "silverstripe/recipe-cms": ">=4.5,<4.5.3",
                 "silverstripe/registry": ">=2.1,<2.1.2|>=2.2,<2.2.1",
-                "silverstripe/restfulserver": ">=1,<1.0.9|>=2,<2.0.4",
+                "silverstripe/reports": "<5.2.3",
+                "silverstripe/restfulserver": ">=1,<1.0.9|>=2,<2.0.4|>=2.1,<2.1.2",
                 "silverstripe/silverstripe-omnipay": "<2.5.2|>=3,<3.0.2|>=3.1,<3.1.4|>=3.2,<3.2.1",
                 "silverstripe/subsites": ">=2,<2.6.1",
                 "silverstripe/taxonomy": ">=1.3,<1.3.1|>=2,<2.0.1",
-                "silverstripe/userforms": "<3",
+                "silverstripe/userforms": "<3|>=5,<5.4.2",
                 "silverstripe/versioned-admin": ">=1,<1.11.1",
                 "simple-updates/phpwhois": "<=1",
                 "simplesamlphp/saml2": "<1.10.6|>=2,<2.3.8|>=3,<3.1.4|==5.0.0.0-alpha12",
@@ -1128,34 +1187,37 @@
                 "slim/psr7": "<1.4.1|>=1.5,<1.5.1|>=1.6,<1.6.1",
                 "slim/slim": "<2.6",
                 "slub/slub-events": "<3.0.3",
-                "smarty/smarty": "<3.1.48|>=4,<4.3.1",
-                "snipe/snipe-it": "<=6.2.2",
+                "smarty/smarty": "<4.5.3|>=5,<5.1.1",
+                "snipe/snipe-it": "<6.4.2",
                 "socalnick/scn-social-auth": "<1.15.2",
                 "socialiteproviders/steam": "<1.1",
                 "spatie/browsershot": "<3.57.4",
+                "spatie/image-optimizer": "<1.7.3",
                 "spipu/html2pdf": "<5.2.8",
                 "spoon/library": "<1.4.1",
                 "spoonity/tcpdf": "<6.2.22",
                 "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1",
-                "ssddanbrown/bookstack": "<22.02.3",
-                "statamic/cms": "<4.46",
+                "ssddanbrown/bookstack": "<24.05.1",
+                "statamic/cms": "<4.46|>=5.3,<5.6.2",
                 "stormpath/sdk": "<9.9.99",
-                "studio-42/elfinder": "<2.1.62",
+                "studio-42/elfinder": "<=2.1.64",
+                "studiomitte/friendlycaptcha": "<0.1.4",
                 "subhh/libconnect": "<7.0.8|>=8,<8.1",
                 "sukohi/surpass": "<1",
+                "sulu/form-bundle": ">=2,<2.5.3",
                 "sulu/sulu": "<1.6.44|>=2,<2.4.17|>=2.5,<2.5.13",
                 "sumocoders/framework-user-bundle": "<1.4",
                 "superbig/craft-audit": "<3.0.2",
                 "swag/paypal": "<5.4.4",
-                "swiftmailer/swiftmailer": ">=4,<5.4.5",
+                "swiftmailer/swiftmailer": "<6.2.5",
                 "swiftyedit/swiftyedit": "<1.2",
                 "sylius/admin-bundle": ">=1,<1.0.17|>=1.1,<1.1.9|>=1.2,<1.2.2",
                 "sylius/grid": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1",
                 "sylius/grid-bundle": "<1.10.1",
                 "sylius/paypal-plugin": ">=1,<1.2.4|>=1.3,<1.3.1",
                 "sylius/resource-bundle": ">=1,<1.3.14|>=1.4,<1.4.7|>=1.5,<1.5.2|>=1.6,<1.6.4",
-                "sylius/sylius": "<1.9.10|>=1.10,<1.10.11|>=1.11,<1.11.2",
-                "symbiote/silverstripe-multivaluefield": ">=3,<3.0.99",
+                "sylius/sylius": "<1.12.19|>=1.13.0.0-alpha1,<1.13.4",
+                "symbiote/silverstripe-multivaluefield": ">=3,<3.1",
                 "symbiote/silverstripe-queuedjobs": ">=3,<3.0.2|>=3.1,<3.1.4|>=4,<4.0.7|>=4.1,<4.1.2|>=4.2,<4.2.4|>=4.3,<4.3.3|>=4.4,<4.4.3|>=4.5,<4.5.1|>=4.6,<4.6.4",
                 "symbiote/silverstripe-seed": "<6.0.3",
                 "symbiote/silverstripe-versionedfiles": "<=2.0.3",
@@ -1197,30 +1259,32 @@
                 "t3s/content-consent": "<1.0.3|>=2,<2.0.2",
                 "tastyigniter/tastyigniter": "<3.3",
                 "tcg/voyager": "<=1.4",
-                "tecnickcom/tcpdf": "<6.2.22",
+                "tecnickcom/tcpdf": "<=6.7.4",
                 "terminal42/contao-tablelookupwizard": "<3.3.5",
                 "thelia/backoffice-default-template": ">=2.1,<2.1.2",
                 "thelia/thelia": ">=2.1,<2.1.3",
                 "theonedemon/phpwhois": "<=4.2.5",
-                "thinkcmf/thinkcmf": "<=5.1.7",
+                "thinkcmf/thinkcmf": "<6.0.8",
                 "thorsten/phpmyfaq": "<3.2.2",
                 "tikiwiki/tiki-manager": "<=17.1",
-                "tinymce/tinymce": "<7",
+                "timber/timber": ">=0.16.6,<1.23.1|>=1.24,<1.24.1|>=2,<2.1",
+                "tinymce/tinymce": "<7.2",
                 "tinymighty/wiki-seo": "<1.2.2",
                 "titon/framework": "<9.9.99",
                 "tobiasbg/tablepress": "<=2.0.0.0-RC1",
-                "topthink/framework": "<6.0.14",
+                "topthink/framework": "<6.0.17|>=6.1,<6.1.5|>=8,<8.0.4",
                 "topthink/think": "<=6.1.1",
                 "topthink/thinkphp": "<=3.2.3",
-                "torrentpier/torrentpier": "<=2.4.1",
+                "torrentpier/torrentpier": "<=2.4.3",
                 "tpwd/ke_search": "<4.0.3|>=4.1,<4.6.6|>=5,<5.0.2",
-                "tribalsystems/zenario": "<=9.4.59197",
+                "tribalsystems/zenario": "<9.5.60602",
                 "truckersmp/phpwhois": "<=4.3.1",
                 "ttskch/pagination-service-provider": "<1",
+                "twbs/bootstrap": "<=3.4.1|>=4,<=4.6.2",
                 "twig/twig": "<1.44.7|>=2,<2.15.3|>=3,<3.4.3",
                 "typo3/cms": "<9.5.29|>=10,<10.4.35|>=11,<11.5.23|>=12,<12.2",
                 "typo3/cms-backend": "<4.1.14|>=4.2,<4.2.15|>=4.3,<4.3.7|>=4.4,<4.4.4|>=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1",
-                "typo3/cms-core": "<=8.7.56|>=9,<=9.5.45|>=10,<=10.4.42|>=11,<=11.5.34|>=12,<=12.4.10|==13",
+                "typo3/cms-core": "<=8.7.56|>=9,<=9.5.47|>=10,<=10.4.44|>=11,<=11.5.36|>=12,<=12.4.14|>=13,<=13.1",
                 "typo3/cms-extbase": "<6.2.24|>=7,<7.6.8|==8.1.1",
                 "typo3/cms-fluid": "<4.3.4|>=4.4,<4.4.1",
                 "typo3/cms-form": ">=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1",
@@ -1239,15 +1303,24 @@
                 "userfrosting/userfrosting": ">=0.3.1,<4.6.3",
                 "usmanhalalit/pixie": "<1.0.3|>=2,<2.0.2",
                 "uvdesk/community-skeleton": "<=1.1.1",
+                "uvdesk/core-framework": "<=1.1.1",
                 "vanilla/safecurl": "<0.9.2",
+                "verbb/comments": "<1.5.5",
+                "verbb/formie": "<2.1.6",
+                "verbb/image-resizer": "<2.0.9",
+                "verbb/knock-knock": "<1.2.8",
                 "verot/class.upload.php": "<=2.1.6",
+                "villagedefrance/opencart-overclocked": "<=1.11.1",
                 "vova07/yii2-fileapi-widget": "<0.1.9",
                 "vrana/adminer": "<4.8.1",
+                "vufind/vufind": ">=2,<9.1.1",
                 "waldhacker/hcaptcha": "<2.1.2",
                 "wallabag/tcpdf": "<6.2.22",
                 "wallabag/wallabag": "<2.6.7",
                 "wanglelecc/laracms": "<=1.0.3",
-                "web-auth/webauthn-framework": ">=3.3,<3.3.4",
+                "web-auth/webauthn-framework": ">=3.3,<3.3.4|>=4.5,<4.9",
+                "web-auth/webauthn-lib": ">=4.5,<4.9",
+                "web-feet/coastercms": "==5.5",
                 "webbuilders-group/silverstripe-kapost-bridge": "<0.4",
                 "webcoast/deferred-image-processing": "<1.0.2",
                 "webklex/laravel-imap": "<5.3",
@@ -1257,22 +1330,26 @@
                 "wikimedia/parsoid": "<0.12.2",
                 "willdurand/js-translation-bundle": "<2.1.1",
                 "winter/wn-backend-module": "<1.2.4",
+                "winter/wn-dusk-plugin": "<2.1",
                 "winter/wn-system-module": "<1.2.4",
                 "wintercms/winter": "<=1.2.3",
-                "woocommerce/woocommerce": "<6.6",
+                "woocommerce/woocommerce": "<6.6|>=8.8,<8.8.5|>=8.9,<8.9.3",
                 "wp-cli/wp-cli": ">=0.12,<2.5",
                 "wp-graphql/wp-graphql": "<=1.14.5",
+                "wp-premium/gravityforms": "<2.4.21",
                 "wpanel/wpanel4-cms": "<=4.3.1",
                 "wpcloud/wp-stateless": "<3.2",
-                "wwbn/avideo": "<=12.4",
+                "wpglobus/wpglobus": "<=1.9.6",
+                "wwbn/avideo": "<14.3",
                 "xataface/xataface": "<3",
                 "xpressengine/xpressengine": "<3.0.15",
+                "yab/quarx": "<2.4.5",
                 "yeswiki/yeswiki": "<4.1",
                 "yetiforce/yetiforce-crm": "<=6.4",
                 "yidashi/yii2cmf": "<=2",
                 "yii2mod/yii2-cms": "<1.9.2",
                 "yiisoft/yii": "<1.1.29",
-                "yiisoft/yii2": "<2.0.38",
+                "yiisoft/yii2": "<2.0.49.4-dev",
                 "yiisoft/yii2-authclient": "<2.2.15",
                 "yiisoft/yii2-bootstrap": "<2.0.4",
                 "yiisoft/yii2-dev": "<2.0.43",
@@ -1297,9 +1374,9 @@
                 "zendframework/zend-http": "<2.8.1",
                 "zendframework/zend-json": ">=2.1,<2.1.6|>=2.2,<2.2.6",
                 "zendframework/zend-ldap": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.8|>=2.3,<2.3.3",
-                "zendframework/zend-mail": ">=2,<2.4.11|>=2.5,<2.7.2",
+                "zendframework/zend-mail": "<2.4.11|>=2.5,<2.7.2",
                 "zendframework/zend-navigation": ">=2,<2.2.7|>=2.3,<2.3.1",
-                "zendframework/zend-session": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.9|>=2.3,<2.3.4",
+                "zendframework/zend-session": ">=2,<2.2.9|>=2.3,<2.3.4",
                 "zendframework/zend-validator": ">=2.3,<2.3.6",
                 "zendframework/zend-view": ">=2,<2.2.7|>=2.3,<2.3.1",
                 "zendframework/zend-xmlrpc": ">=2.1,<2.1.6|>=2.2,<2.2.6",
@@ -1358,7 +1435,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-02T15:04:34+00:00"
+            "time": "2024-08-28T08:05:44+00:00"
         }
     ],
     "aliases": [],
@@ -1369,7 +1446,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.1"
+        "php": ">=7.4 <8.3"
     },
     "platform-dev": [],
     "plugin-api-version": "2.6.0"
diff --git a/example.php b/example.php
index 2e8266e..680889f 100644
--- a/example.php
+++ b/example.php
@@ -10,9 +10,7 @@
 	"dir",
 	"more-specificity",
 ];
-$options = getopt("", array_map(function($option){
-	return "{$option}:";
-}, $opt_fields));
+$options = getopt("", array_map(static fn($option) => "{$option}:", $opt_fields));
 
 $opt_errors = [];
 foreach ($opt_fields as $opt_field){
diff --git a/src/ClassGenerator.php b/src/ClassGenerator.php
index fe4bf04..ddcd4f3 100644
--- a/src/ClassGenerator.php
+++ b/src/ClassGenerator.php
@@ -24,20 +24,15 @@ abstract class ClassGenerator {
 	public const NAMESPACE_MODEL = 'Models';
 	public const NAMESPACE_REQUEST = 'Requests';
 
-	/**
-	 * @var string
-	 */
-	private $namespace_name;
+	private string $namespace_name;
 
 	/**
 	 * @var ClassType[]
 	 */
-	public $classes = [];
+	public array $classes = [];
 
 	/**
 	 * Creates a generator for a specific namespace
-	 *
-	 * @param string $namespace_name
 	 */
 	public function __construct(string $namespace_name){
 		$this->namespace_name = $this->stringNotEndWith($namespace_name, '\\');
@@ -55,11 +50,6 @@ abstract public function saveClasses(string $dir);
 
 	abstract public function generate(string $file_path);
 
-	/**
-	 * @param string $yaml_path
-	 * @param string $dir
-	 * @return int
-	 */
 	public function runFull(string $yaml_path, string $dir): int{
 		$this->generate($yaml_path);
 
@@ -69,13 +59,7 @@ public function runFull(string $yaml_path, string $dir): int{
 		return count($this->classes);
 	}
 
-	/**
-	 * @param string $yaml_path
-	 * @param string $dir
-	 *
-	 * @return int
-	 */
-	public function runFullWithMoreSpecificity(string $yaml_path, string $dir){
+	public function runFullWithMoreSpecificity(string $yaml_path, string $dir): int{
 		$this->generate($yaml_path, true);
 
 		$this->saveClasses($dir);
@@ -87,9 +71,6 @@ public function runFullWithMoreSpecificity(string $yaml_path, string $dir){
 	/**
 	 * Saves generated classes down as PHP files
 	 *
-	 * @param string $dir
-	 * @param string $namespace_name
-	 * @param string $use
 	 * @throws RuntimeException
 	 * @throws FileNotFoundException
 	 */
@@ -110,10 +91,6 @@ protected function saveClassesInternal(string $dir, string $namespace_name, stri
 	abstract public function dumpParentClass(string $dir);
 
 	/**
-	 * @param string $dir
-	 * @param string $file
-	 * @param string $namespace
-	 * @param string $namespace_use
 	 * @throws FileNotFoundException
 	 */
 	protected function dumpParentInternal(string $dir, string $file, string $namespace, string $namespace_use = ''): void{
@@ -128,21 +105,10 @@ protected function dumpParentInternal(string $dir, string $file, string $namespa
 		file_put_contents("$dir/$file_name", $content);
 	}
 
-	/**
-	 * Utility function
-	 *
-	 * @param string $string
-	 * @param string $char
-	 * @return string
-	 */
 	protected function stringNotEndWith(string $string, string $char): string{
 		return $string[strlen($string)-1]===$char ? substr($string, 0, -1) : $string;
 	}
 
-	/**
-	 * @param string $string
-	 * @return string
-	 */
 	protected function unPlural(string $string): string{
 		if (substr($string, -3)==='ies'){
 			return substr($string, 0, -3).'y';
@@ -156,9 +122,6 @@ protected function unPlural(string $string): string{
 
 	/**
 	 * Changes a Swagger definition into a type
-	 *
-	 * @param array $property
-	 * @return string
 	 */
 	protected function typeFromRef(array $property): string{
 		if (!isset($property['$ref'])){
@@ -168,11 +131,6 @@ protected function typeFromRef(array $property): string{
 		return str_replace('#/definitions/', '', $property['$ref']);
 	}
 
-	/**
-	 * @param string $dir
-	 * @param string $namespace
-	 * @return string
-	 */
 	protected function dirNamespace(string $dir, string $namespace): string{
 		$dir = $this->stringNotEndWith($dir, '/');
 
@@ -180,8 +138,6 @@ protected function dirNamespace(string $dir, string $namespace): string{
 	}
 
 	/**
-	 * @param string $dir
-	 * @return string
 	 * @throws FileNotFoundException
 	 */
 	private function checkDir(string $dir): string{
@@ -195,10 +151,6 @@ private function checkDir(string $dir): string{
 		return $dir;
 	}
 
-	/**
-	 * @param string $type
-	 * @return bool
-	 */
 	protected function notScalarType(string $type): bool{
 		return !in_array($type, ['integer', 'string', 'boolean', 'number', 'null']);
 	}
diff --git a/src/GenerateAll.php b/src/GenerateAll.php
index 83dd630..f274cc0 100644
--- a/src/GenerateAll.php
+++ b/src/GenerateAll.php
@@ -3,16 +3,11 @@
 namespace SwaggerGen;
 
 class GenerateAll {
-	public $saved_models = 0;
-	public $saved_requests = 0;
+	public int $saved_models = 0;
+	public int $saved_requests = 0;
 
 	/**
 	 * Generates all required files into the specified directory
-	 *
-	 * @param string $namespace
-	 * @param string $yaml_path
-	 * @param string $dir
-	 * @param bool   $more_specificity
 	 */
 	public function __construct(string $namespace, string $yaml_path, string $dir, bool $more_specificity = false){
 		$generate_models = new GenerateModels($namespace);
diff --git a/src/GenerateModels.php b/src/GenerateModels.php
index 2975203..3c02c19 100644
--- a/src/GenerateModels.php
+++ b/src/GenerateModels.php
@@ -2,7 +2,6 @@
 namespace SwaggerGen;
 
 use Nette\PhpGenerator\ClassType;
-use Nette\PhpGenerator\Method;
 use Nette\PhpGenerator\PhpNamespace;
 use Nette\PhpGenerator\Property;
 use RuntimeException;
@@ -16,8 +15,6 @@ class GenerateModels extends ClassGenerator {
 
 	/**
 	 * Generates classes in the "classes" field
-	 *
-	 * @param string $file_path
 	 * @throws RuntimeException
 	 */
 	public function generate(string $file_path) :void{
@@ -55,9 +52,6 @@ public function generate(string $file_path) :void{
 	}
 
 	/**
-	 * @param array $properties
-	 * @param ClassType $class
-	 * @param array $required
 	 * @throws RuntimeException
 	 */
 	private function classProperties(array $properties, ClassType $class, ?array $required): void{
@@ -83,9 +77,6 @@ private function classProperties(array $properties, ClassType $class, ?array $re
 				$typehint = $type;
 			}
 
-			/**
-			 * @var Property $property
-			 */
 			$property = $class->addProperty($property_name)->setVisibility('protected');
 			$property->addComment($property_details['description'] ?? "\n");
 
@@ -136,9 +127,6 @@ private function classProperties(array $properties, ClassType $class, ?array $re
 			$class->addMethod('get'.$capital_case)
 				->setBody("return \$this->$property_name;")
 				->addComment("@return $comment_type");
-			/**
-			 * @var Method $setter
-			 */
 			$setter = $class->addMethod('set'.$capital_case)
 				->setBody("\$this->$property_name = \$$property_name;\n\nreturn \$this;")
 				->addComment("@param $comment_type \$$property_name")
@@ -153,9 +141,6 @@ private function classProperties(array $properties, ClassType $class, ?array $re
 			if ($sub_type){
 				$property_name_singular = $this->unPlural($property_name);
 				$capital_case_singular = $this->unPlural($capital_case);
-				/**
-				 * @var Method $add_to
-				 */
 				$add_to = $class->addMethod('add'.$capital_case_singular)
 					->setBody("\$this->{$property_name}[] = \$$property_name_singular;\n\nreturn \$this;");
 
@@ -174,25 +159,17 @@ private function classProperties(array $properties, ClassType $class, ?array $re
 		}
 	}
 
-	/**
-	 * @param string $dir
-	 */
 	public function saveClasses(string $dir) :void{
 		$dir = $this->dirNamespace($dir, self::NAMESPACE_MODEL);
 		$this->saveClassesInternal($dir, $this->namespaceModel());
 	}
 
-	/**
-	 * @param string $dir
-	 */
 	public function dumpParentClass(string $dir) :void{
 		$dir = $this->dirNamespace($dir, self::NAMESPACE_MODEL);
 		$this->dumpParentInternal($dir, __DIR__.'/SwaggerModel.php', $this->namespaceModel());
 	}
 
 	/**
-	 * @param Property $property
-	 * @param string $type
 	 * @throws RuntimeException
 	 */
 	private function blankValue(Property $property, string $type): void{
diff --git a/src/GenerateRequests.php b/src/GenerateRequests.php
index cc7ed24..efdc625 100644
--- a/src/GenerateRequests.php
+++ b/src/GenerateRequests.php
@@ -304,7 +304,7 @@ protected function handleResponse(array $method_details, ClassType $class): void
 				$type = "''";
 			}
 
-			$response_models[] = "'$code_string' => '$type'";
+			$response_models[] = "'$code_string' => $type";
 
 			if ((int)$code_string>0 && (int)$code_string<400){
 				$has_2xx = true;
diff --git a/src/SwaggerClient.php b/src/SwaggerClient.php
index 1167559..02f55b2 100644
--- a/src/SwaggerClient.php
+++ b/src/SwaggerClient.php
@@ -1,14 +1,18 @@
 <?php
 namespace SwaggerGen;
 
+use Psr\Http\Message\RequestInterface;
 use SwaggerGen\SwaggerModel;
 
 interface SwaggerClient {
 
 	/**
-	 * @param SwaggerRequest $request
-	 * @param string[] $response_models
-	 * @return SwaggerModel|SwaggerModel[]
+	 * @template T of SwaggerModel
+	 *
+	 * @param array<array-key, class-string<T>> $response_models
+	 * @return T|list<T>
 	 */
 	public function make(SwaggerRequest $request, array $response_models);
+
+	public function messageFromRequest(SwaggerRequest $swagger):RequestInterface;
 }
diff --git a/src/SwaggerModel.php b/src/SwaggerModel.php
index 29463e8..1729b4b 100644
--- a/src/SwaggerModel.php
+++ b/src/SwaggerModel.php
@@ -7,11 +7,8 @@
 class SwaggerModel implements JsonSerializable {
 	public const DATE_FORMAT = 'Y-m-d H:i:s';
 
-	private $_is_error = false;
+	private bool $_is_error = false;
 
-	/**
-	 * @return array
-	 */
 	public function toArray(): array{
 		$this->preOutput();
 
@@ -24,9 +21,7 @@ public function toArray(): array{
 			$data[$key] = $val;
 		}
 
-		$data = $this->toArrayData($data);
-
-		return $data;
+		return $this->toArrayData($data);
 	}
 
 	/**
@@ -38,15 +33,11 @@ protected function preOutput(): void{
 	/**
 	 * @return array
 	 */
+	#[\ReturnTypeWillChange]
 	public function jsonSerialize(){
 		return $this->toArray();
 	}
 
-	/**
-	 * @param array $data
-	 *
-	 * @return array
-	 */
 	private function toArrayData(array $data): array{
 		foreach ($data as &$val){
 
@@ -70,9 +61,6 @@ private function toArrayData(array $data): array{
 		return $data;
 	}
 
-	/**
-	 * @return bool
-	 */
 	public function isError(): bool{
 		return $this->_is_error;
 	}
diff --git a/src/SwaggerRequest.php b/src/SwaggerRequest.php
index a93b559..75869c3 100644
--- a/src/SwaggerRequest.php
+++ b/src/SwaggerRequest.php
@@ -6,806 +6,37 @@
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UriInterface;
 
-class SwaggerRequest implements RequestInterface {
+class SwaggerRequest {
 
 	public const METHOD = '';
 	public const URI = '';
-	public const RESPONSE_CLASS = '';
+	public const RESPONSE_CLASS = null;
 
-	protected $body;
+	protected ?string $body = null;
 
-	protected static $path_params = [];
-	protected static $query_params = [];
+	protected static array $path_params = [];
+	protected static array $query_params = [];
 
-	protected $headers = [];
-	/**
-	 * @var UriInterface
-	 */
-	private $uri;
+	protected array $headers = [];
 
-	public $response_is_array = false;
+	public bool $response_is_array = false;
 
-	/**
-	 * Retrieves the HTTP protocol version as a string.
-	 *
-	 * The string MUST contain only the HTTP version number (e.g., "1.1", "1.0").
-	 *
-	 * @return string HTTP protocol version.
-	 */
-	public function getProtocolVersion(){
-		return 1.1;
-	}
-
-	/**
-	 * Return an instance with the specified HTTP protocol version.
-	 *
-	 * The version string MUST contain only the HTTP version number (e.g.,
-	 * "1.1", "1.0").
-	 *
-	 * This method MUST be implemented in such a way as to retain the
-	 * immutability of the message, and MUST return an instance that has the
-	 * new protocol version.
-	 *
-	 * @param string $version HTTP protocol version
-	 * @return static
-	 */
-	public function withProtocolVersion($version){
-		return clone $this;
-	}
-
-	/**
-	 * Retrieves all message header values.
-	 *
-	 * The keys represent the header name as it will be sent over the wire, and
-	 * each value is an array of strings associated with the header.
-	 *
-	 *     // Represent the headers as a string
-	 *     foreach ($message->getHeaders() as $name => $values) {
-	 *         echo $name . ": " . implode(", ", $values);
-	 *     }
-	 *
-	 *     // Emit headers iteratively:
-	 *     foreach ($message->getHeaders() as $name => $values) {
-	 *         foreach ($values as $value) {
-	 *             header(sprintf('%s: %s', $name, $value), false);
-	 *         }
-	 *     }
-	 *
-	 * While header names are not case-sensitive, getHeaders() will preserve the
-	 * exact case in which headers were originally specified.
-	 *
-	 * @return string[][] Returns an associative array of the message's headers. Each
-	 *     key MUST be a header name, and each value MUST be an array of strings
-	 *     for that header.
-	 */
-	public function getHeaders(){
-		return $this->headers;
-	}
-
-	/**
-	 * Checks if a header exists by the given case-insensitive name.
-	 *
-	 * @param string $name Case-insensitive header field name.
-	 * @return bool Returns true if any header names match the given header
-	 *     name using a case-insensitive string comparison. Returns false if
-	 *     no matching header name is found in the message.
-	 */
-	public function hasHeader($name){
-		return isset($this->headers[$name]);
-	}
-
-	/**
-	 * Retrieves a message header value by the given case-insensitive name.
-	 *
-	 * This method returns an array of all the header values of the given
-	 * case-insensitive header name.
-	 *
-	 * If the header does not appear in the message, this method MUST return an
-	 * empty array.
-	 *
-	 * @param string $name Case-insensitive header field name.
-	 * @return string[] An array of string values as provided for the given
-	 *    header. If the header does not appear in the message, this method MUST
-	 *    return an empty array.
-	 */
-	public function getHeader($name){
-		return $this->headers[$name] ?: [];
-	}
-
-	/**
-	 * Retrieves a comma-separated string of the values for a single header.
-	 *
-	 * This method returns all of the header values of the given
-	 * case-insensitive header name as a string concatenated together using
-	 * a comma.
-	 *
-	 * NOTE: Not all header values may be appropriately represented using
-	 * comma concatenation. For such headers, use getHeader() instead
-	 * and supply your own delimiter when concatenating.
-	 *
-	 * If the header does not appear in the message, this method MUST return
-	 * an empty string.
-	 *
-	 * @param string $name Case-insensitive header field name.
-	 * @return string A string of values as provided for the given header
-	 *    concatenated together using a comma. If the header does not appear in
-	 *    the message, this method MUST return an empty string.
-	 */
-	public function getHeaderLine($name){
-		return implode(',', $this->headers[$name] ?: []);
-	}
-
-	/**
-	 * Return an instance with the provided value replacing the specified header.
-	 *
-	 * While header names are case-insensitive, the casing of the header will
-	 * be preserved by this function, and returned from getHeaders().
-	 *
-	 * This method MUST be implemented in such a way as to retain the
-	 * immutability of the message, and MUST return an instance that has the
-	 * new and/or updated header and value.
-	 *
-	 * @param string $name Case-insensitive header field name.
-	 * @param string|string[] $value Header value(s).
-	 * @return static
-	 * @throws \InvalidArgumentException for invalid header names or values.
-	 */
-	public function withHeader($name, $value){
-		$cloned = clone $this;
-		$cloned->setHeader($name, $value);
-
-		return $cloned;
-	}
-
-	private function setHeader($name, $value){
-		if (!is_array($value)){
-			$value = [$value];
-		}
-
-		$this->headers[$name] = $value;
-	}
-
-	/**
-	 * Return an instance with the specified header appended with the given value.
-	 *
-	 * Existing values for the specified header will be maintained. The new
-	 * value(s) will be appended to the existing list. If the header did not
-	 * exist previously, it will be added.
-	 *
-	 * This method MUST be implemented in such a way as to retain the
-	 * immutability of the message, and MUST return an instance that has the
-	 * new header and/or value.
-	 *
-	 * @param string $name Case-insensitive header field name to add.
-	 * @param string|string[] $value Header value(s).
-	 * @return static
-	 * @throws \InvalidArgumentException for invalid header names or values.
-	 */
-	public function withAddedHeader($name, $value){
-		$cloned = clone $this;
-		$cloned->addHeader($name, $value);
-
-		return $cloned;
-	}
-
-	private function addHeader($name, $value){
-		if (!is_array($value)){
-			$value = [$value];
-		}
-		if (!is_array($this->headers[$name])){
-			$this->headers[$name] = [];
-		}
-
-		$this->headers[$name] = array_merge($this->headers[$name], $value);
-	}
-
-	/**
-	 * Return an instance without the specified header.
-	 *
-	 * Header resolution MUST be done without case-sensitivity.
-	 *
-	 * This method MUST be implemented in such a way as to retain the
-	 * immutability of the message, and MUST return an instance that removes
-	 * the named header.
-	 *
-	 * @param string $name Case-insensitive header field name to remove.
-	 * @return static
-	 */
-	public function withoutHeader($name){
-		return clone $this;
-	}
-
-	/**
-	 * Gets the body of the message.
-	 *
-	 * @return StreamInterface Returns the body as a stream.
-	 */
-	public function getBody(){
-		return $this->body;
-	}
-
-	/**
-	 * Return an instance with the specified message body.
-	 *
-	 * The body MUST be a StreamInterface object.
-	 *
-	 * This method MUST be implemented in such a way as to retain the
-	 * immutability of the message, and MUST return a new instance that has the
-	 * new body stream.
-	 *
-	 * @param StreamInterface $body Body.
-	 * @return static
-	 * @throws \InvalidArgumentException When the body is not valid.
-	 */
-	public function withBody(StreamInterface $body){
-		return clone $this;
-	}
-
-	/**
-	 * Retrieves the message's request target.
-	 *
-	 * Retrieves the message's request-target either as it will appear (for
-	 * clients), as it appeared at request (for servers), or as it was
-	 * specified for the instance (see withRequestTarget()).
-	 *
-	 * In most cases, this will be the origin-form of the composed URI,
-	 * unless a value was provided to the concrete implementation (see
-	 * withRequestTarget() below).
-	 *
-	 * If no URI is available, and no request-target has been specifically
-	 * provided, this method MUST return the string "/".
-	 *
-	 * @return string
-	 */
-	public function getRequestTarget(){
-		return (string)$this->getUri();
-	}
-
-	/**
-	 * Return an instance with the specific request-target.
-	 *
-	 * If the request needs a non-origin-form request-target — e.g., for
-	 * specifying an absolute-form, authority-form, or asterisk-form —
-	 * this method may be used to create an instance with the specified
-	 * request-target, verbatim.
-	 *
-	 * This method MUST be implemented in such a way as to retain the
-	 * immutability of the message, and MUST return an instance that has the
-	 * changed request target.
-	 *
-	 * @link http://tools.ietf.org/html/rfc7230#section-5.3 (for the various
-	 *     request-target forms allowed in request messages)
-	 * @param mixed $requestTarget
-	 * @return static
-	 */
-	public function withRequestTarget($requestTarget){
-		return clone $this;
-	}
-
-	/**
-	 * Retrieves the HTTP method of the request.
-	 *
-	 * @return string Returns the request method.
-	 */
-	public function getMethod(){
+	final public function getMethod(): string{
 		return static::METHOD;
 	}
 
-	/**
-	 * Return an instance with the provided HTTP method.
-	 *
-	 * While HTTP method names are typically all uppercase characters, HTTP
-	 * method names are case-sensitive and thus implementations SHOULD NOT
-	 * modify the given string.
-	 *
-	 * This method MUST be implemented in such a way as to retain the
-	 * immutability of the message, and MUST return an instance that has the
-	 * changed request method.
-	 *
-	 * @param string $method Case-sensitive method.
-	 * @return static
-	 * @throws \InvalidArgumentException for invalid HTTP methods.
-	 */
-	public function withMethod($method){
-		return clone $this;
+	final public function getUri(): string{
+		return static::URI.$this->getPath();
 	}
 
-	/**
-	 * Retrieves the URI instance.
-	 *
-	 * This method MUST return a UriInterface instance.
-	 *
-	 * @link http://tools.ietf.org/html/rfc3986#section-4.3
-	 * @return UriInterface Returns a UriInterface instance
-	 *     representing the URI of the request.
-	 */
-	public function getUri(){
-		if (is_null($this->uri)){
-			$this->uri = $this->makeUri();
-		}
-
-		return $this->uri;
-	}
-
-	/**
-	 * Returns an instance with the provided URI.
-	 *
-	 * This method MUST update the Host header of the returned request by
-	 * default if the URI contains a host component. If the URI does not
-	 * contain a host component, any pre-existing Host header MUST be carried
-	 * over to the returned request.
-	 *
-	 * You can opt-in to preserving the original state of the Host header by
-	 * setting `$preserveHost` to `true`. When `$preserveHost` is set to
-	 * `true`, this method interacts with the Host header in the following ways:
-	 *
-	 * - If the Host header is missing or empty, and the new URI contains
-	 *   a host component, this method MUST update the Host header in the returned
-	 *   request.
-	 * - If the Host header is missing or empty, and the new URI does not contain a
-	 *   host component, this method MUST NOT update the Host header in the returned
-	 *   request.
-	 * - If a Host header is present and non-empty, this method MUST NOT update
-	 *   the Host header in the returned request.
-	 *
-	 * This method MUST be implemented in such a way as to retain the
-	 * immutability of the message, and MUST return an instance that has the
-	 * new UriInterface instance.
-	 *
-	 * @link http://tools.ietf.org/html/rfc3986#section-4.3
-	 * @param UriInterface $uri New request URI to use.
-	 * @param bool $preserveHost Preserve the original state of the Host header.
-	 * @return static
-	 */
-	public function withUri(UriInterface $uri, $preserveHost = false){
-		$request = clone $this;
-		$request->setUri($uri);
-
-		return $request;
-	}
-
-	private function setUri(UriInterface $uri): void{
-		$this->uri = $uri;
-	}
-
-	/**
-	 * @return UriInterface
-	 */
-	private function makeUri() :UriInterface{
-		$uri = static::URI;
-		$query = [];
-		foreach (static::$path_params as $param_name){
-			$path_param_pattern = "{{$param_name}}";
-			if(strpos($uri, $path_param_pattern)) {
-				$uri = str_replace($path_param_pattern, $this->{$param_name}, $uri);
-			}
-			else {
-				$query[] = $this->{$param_name};
-			}
-		}
-		if (!empty($query)){
-			/** @noinspection PhpUnusedLocalVariableInspection */
-			$uri .= '/'.implode('/', $query);
-		}
-
-		if (!empty(static::$query_params)){
-			$query_params = [];
-			foreach (static::$query_params as $param){
-				if (!empty($this->{$param})){
-					$query_params[$param] = $this->{$param};
-				}
-			}
-			if (!empty($query_params)){
-				$uri .= '?'.http_build_query($query_params);
-			}
-		}
-
-		return new class($uri) implements UriInterface {
-			private $uri;
-			private $scheme;
-
-			public function __construct($uri){
-				$this->uri = $this->handleScheme($uri);
-			}
-
-			/**
-			 * Retrieve the scheme component of the URI.
-			 *
-			 * If no scheme is present, this method MUST return an empty string.
-			 *
-			 * The value returned MUST be normalized to lowercase, per RFC 3986
-			 * Section 3.1.
-			 *
-			 * The trailing ":" character is not part of the scheme and MUST NOT be
-			 * added.
-			 *
-			 * @see https://tools.ietf.org/html/rfc3986#section-3.1
-			 * @return string The URI scheme.
-			 */
-			public function getScheme(){
-				return $this->scheme;
-			}
-
-			/**
-			 * Retrieve the authority component of the URI.
-			 *
-			 * If no authority information is present, this method MUST return an empty
-			 * string.
-			 *
-			 * The authority syntax of the URI is:
-			 *
-			 * <pre>
-			 * [user-info@]host[:port]
-			 * </pre>
-			 *
-			 * If the port component is not set or is the standard port for the current
-			 * scheme, it SHOULD NOT be included.
-			 *
-			 * @see https://tools.ietf.org/html/rfc3986#section-3.2
-			 * @return string The URI authority, in "[user-info@]host[:port]" format.
-			 */
-			public function getAuthority(){
-				return '';
-			}
-
-			/**
-			 * Retrieve the user information component of the URI.
-			 *
-			 * If no user information is present, this method MUST return an empty
-			 * string.
-			 *
-			 * If a user is present in the URI, this will return that value;
-			 * additionally, if the password is also present, it will be appended to the
-			 * user value, with a colon (":") separating the values.
-			 *
-			 * The trailing "@" character is not part of the user information and MUST
-			 * NOT be added.
-			 *
-			 * @return string The URI user information, in "username[:password]" format.
-			 */
-			public function getUserInfo(){
-				return '';
-			}
-
-			/**
-			 * Retrieve the host component of the URI.
-			 *
-			 * If no host is present, this method MUST return an empty string.
-			 *
-			 * The value returned MUST be normalized to lowercase, per RFC 3986
-			 * Section 3.2.2.
-			 *
-			 * @see http://tools.ietf.org/html/rfc3986#section-3.2.2
-			 * @return string The URI host.
-			 */
-			public function getHost(){
-				return explode('/', $this->uri)[0];
-			}
-
-			/**
-			 * Retrieve the port component of the URI.
-			 *
-			 * If a port is present, and it is non-standard for the current scheme,
-			 * this method MUST return it as an integer. If the port is the standard port
-			 * used with the current scheme, this method SHOULD return null.
-			 *
-			 * If no port is present, and no scheme is present, this method MUST return
-			 * a null value.
-			 *
-			 * If no port is present, but a scheme is present, this method MAY return
-			 * the standard port for that scheme, but SHOULD return null.
-			 *
-			 * @return null|int The URI port.
-			 */
-			public function getPort(){
-				return null;
-			}
-
-			/**
-			 * Retrieve the path component of the URI.
-			 *
-			 * The path can either be empty or absolute (starting with a slash) or
-			 * rootless (not starting with a slash). Implementations MUST support all
-			 * three syntaxes.
-			 *
-			 * Normally, the empty path "" and absolute path "/" are considered equal as
-			 * defined in RFC 7230 Section 2.7.3. But this method MUST NOT automatically
-			 * do this normalization because in contexts with a trimmed base path, e.g.
-			 * the front controller, this difference becomes significant. It's the task
-			 * of the user to handle both "" and "/".
-			 *
-			 * The value returned MUST be percent-encoded, but MUST NOT double-encode
-			 * any characters. To determine what characters to encode, please refer to
-			 * RFC 3986, Sections 2 and 3.3.
-			 *
-			 * As an example, if the value should include a slash ("/") not intended as
-			 * delimiter between path segments, that value MUST be passed in encoded
-			 * form (e.g., "%2F") to the instance.
-			 *
-			 * @see https://tools.ietf.org/html/rfc3986#section-2
-			 * @see https://tools.ietf.org/html/rfc3986#section-3.3
-			 * @return string The URI path.
-			 */
-			public function getPath(){
-				$no_host = $this->uriNoHost();
-
-				return explode('?', $no_host)[0];
-			}
-
-			private function uriNoHost(){
-				$split = explode('/', $this->uri);
-				unset($split[0]);
-
-				return implode('/', $split);
-			}
-
-			/**
-			 * Retrieve the query string of the URI.
-			 *
-			 * If no query string is present, this method MUST return an empty string.
-			 *
-			 * The leading "?" character is not part of the query and MUST NOT be
-			 * added.
-			 *
-			 * The value returned MUST be percent-encoded, but MUST NOT double-encode
-			 * any characters. To determine what characters to encode, please refer to
-			 * RFC 3986, Sections 2 and 3.4.
-			 *
-			 * As an example, if a value in a key/value pair of the query string should
-			 * include an ampersand ("&") not intended as a delimiter between values,
-			 * that value MUST be passed in encoded form (e.g., "%26") to the instance.
-			 *
-			 * @see https://tools.ietf.org/html/rfc3986#section-2
-			 * @see https://tools.ietf.org/html/rfc3986#section-3.4
-			 * @return string The URI query string.
-			 */
-			public function getQuery(){
-				$no_host = $this->uriNoHost();
-
-				return explode('?', $no_host)[1] ?? '';
-			}
-
-			/**
-			 * Retrieve the fragment component of the URI.
-			 *
-			 * If no fragment is present, this method MUST return an empty string.
-			 *
-			 * The leading "#" character is not part of the fragment and MUST NOT be
-			 * added.
-			 *
-			 * The value returned MUST be percent-encoded, but MUST NOT double-encode
-			 * any characters. To determine what characters to encode, please refer to
-			 * RFC 3986, Sections 2 and 3.5.
-			 *
-			 * @see https://tools.ietf.org/html/rfc3986#section-2
-			 * @see https://tools.ietf.org/html/rfc3986#section-3.5
-			 * @return string The URI fragment.
-			 */
-			public function getFragment(){
-				return '';
-			}
-
-			/**
-			 * Return an instance with the specified scheme.
-			 *
-			 * This method MUST retain the state of the current instance, and return
-			 * an instance that contains the specified scheme.
-			 *
-			 * Implementations MUST support the schemes "http" and "https" case
-			 * insensitively, and MAY accommodate other schemes if required.
-			 *
-			 * An empty scheme is equivalent to removing the scheme.
-			 *
-			 * @param string $scheme The scheme to use with the new instance.
-			 * @return static A new instance with the specified scheme.
-			 * @throws \InvalidArgumentException for invalid or unsupported schemes.
-			 */
-			public function withScheme($scheme){
-				return clone $this;
-			}
-
-			/**
-			 * Return an instance with the specified user information.
-			 *
-			 * This method MUST retain the state of the current instance, and return
-			 * an instance that contains the specified user information.
-			 *
-			 * Password is optional, but the user information MUST include the
-			 * user; an empty string for the user is equivalent to removing user
-			 * information.
-			 *
-			 * @param string $user The user name to use for authority.
-			 * @param null|string $password The password associated with $user.
-			 * @return static A new instance with the specified user information.
-			 */
-			public function withUserInfo($user, $password = null){
-				return clone $this;
-			}
-
-			/**
-			 * Return an instance with the specified host.
-			 *
-			 * This method MUST retain the state of the current instance, and return
-			 * an instance that contains the specified host.
-			 *
-			 * An empty host value is equivalent to removing the host.
-			 *
-			 * @param string $host The hostname to use with the new instance.
-			 * @return static A new instance with the specified host.
-			 * @throws \InvalidArgumentException for invalid hostnames.
-			 */
-			public function withHost($host){
-				$clone = clone $this;
-				$clone->setHost($host);
-
-				return $clone;
-			}
-
-			/**
-			 * @param string $host
-			 */
-			private function setHost($host){
-				$host = $this->handleScheme($host);
-				$current_host = $this->getHost();
-
-				if (!empty($current_host)){
-					$this->uri = str_replace($current_host, $host, $this->uri);
-				}
-				else {
-					$this->uri = $host.$this->uri;
-				}
-			}
-
-			/**
-			 * Return an instance with the specified port.
-			 *
-			 * This method MUST retain the state of the current instance, and return
-			 * an instance that contains the specified port.
-			 *
-			 * Implementations MUST raise an exception for ports outside the
-			 * established TCP and UDP port ranges.
-			 *
-			 * A null value provided for the port is equivalent to removing the port
-			 * information.
-			 *
-			 * @param null|int $port The port to use with the new instance; a null value
-			 *     removes the port information.
-			 * @return static A new instance with the specified port.
-			 * @throws \InvalidArgumentException for invalid ports.
-			 */
-			public function withPort($port){
-				return clone $this;
-			}
-
-			/**
-			 * Return an instance with the specified path.
-			 *
-			 * This method MUST retain the state of the current instance, and return
-			 * an instance that contains the specified path.
-			 *
-			 * The path can either be empty or absolute (starting with a slash) or
-			 * rootless (not starting with a slash). Implementations MUST support all
-			 * three syntaxes.
-			 *
-			 * If the path is intended to be domain-relative rather than path relative then
-			 * it must begin with a slash ("/"). Paths not starting with a slash ("/")
-			 * are assumed to be relative to some base path known to the application or
-			 * consumer.
-			 *
-			 * Users can provide both encoded and decoded path characters.
-			 * Implementations ensure the correct encoding as outlined in getPath().
-			 *
-			 * @param string $path The path to use with the new instance.
-			 * @return static A new instance with the specified path.
-			 * @throws \InvalidArgumentException for invalid paths.
-			 */
-			public function withPath($path){
-				return clone $this;
-			}
-
-			/**
-			 * Return an instance with the specified query string.
-			 *
-			 * This method MUST retain the state of the current instance, and return
-			 * an instance that contains the specified query string.
-			 *
-			 * Users can provide both encoded and decoded query characters.
-			 * Implementations ensure the correct encoding as outlined in getQuery().
-			 *
-			 * An empty query string value is equivalent to removing the query string.
-			 *
-			 * @param string $query The query string to use with the new instance.
-			 * @return static A new instance with the specified query string.
-			 * @throws \InvalidArgumentException for invalid query strings.
-			 */
-			public function withQuery($query){
-				$uri = clone $this;
-				$uri->setQuery($query);
-
-				return $uri;
-			}
-
-			/**
-			 * @param $query
-			 */
-			private function setQuery($query){
-				$current_query = $this->getQuery();
-				if (!empty($current_query)){
-					$this->uri = str_replace($current_query, $query, $this->uri);
-				}
-				else {
-					$this->uri .= '?'.$query;
-				}
-			}
-
-			/**
-			 * Return an instance with the specified URI fragment.
-			 *
-			 * This method MUST retain the state of the current instance, and return
-			 * an instance that contains the specified URI fragment.
-			 *
-			 * Users can provide both encoded and decoded fragment characters.
-			 * Implementations ensure the correct encoding as outlined in getFragment().
-			 *
-			 * An empty fragment value is equivalent to removing the fragment.
-			 *
-			 * @param string $fragment The fragment to use with the new instance.
-			 * @return static A new instance with the specified fragment.
-			 */
-			public function withFragment($fragment){
-				return clone $this;
-			}
-
-			/**
-			 * Return the string representation as a URI reference.
-			 *
-			 * Depending on which components of the URI are present, the resulting
-			 * string is either a full URI or relative reference according to RFC 3986,
-			 * Section 4.1. The method concatenates the various components of the URI,
-			 * using the appropriate delimiters:
-			 *
-			 * - If a scheme is present, it MUST be suffixed by ":".
-			 * - If an authority is present, it MUST be prefixed by "//".
-			 * - The path can be concatenated without delimiters. But there are two
-			 *   cases where the path has to be adjusted to make the URI reference
-			 *   valid as PHP does not allow to throw an exception in __toString():
-			 *     - If the path is rootless and an authority is present, the path MUST
-			 *       be prefixed by "/".
-			 *     - If the path is starting with more than one "/" and no authority is
-			 *       present, the starting slashes MUST be reduced to one.
-			 * - If a query is present, it MUST be prefixed by "?".
-			 * - If a fragment is present, it MUST be prefixed by "#".
-			 *
-			 * @see http://tools.ietf.org/html/rfc3986#section-4.1
-			 * @return string
-			 */
-			public function __toString(){
-				return $this->getScheme().'://'.$this->uri;
-			}
-
-			/**
-			 * @param string $uri
-			 * @return string
-			 */
-			protected function handleScheme($uri){
-				$scheme = strpos($uri, 'http://')===0 ? 'http' : 'https';
-				$this->scheme = $scheme;
-
-				return str_replace(['https://', 'http://'], '', $uri);
-			}
-		};
+	final public function getBody(): ?string{
+		return $this->body;
 	}
 
-	/**
-	 * @return string
-	 */
-	public function getResponseClass(): string{
+	final public function getResponseClass(): ?string{
 		return static::RESPONSE_CLASS;
 	}
 
-	/**
-	 * @return array
-	 */
 	public function getQuery(): array{
 		$query = [];
 		foreach (static::$query_params as $param_name){
@@ -816,4 +47,19 @@ public function getQuery(): array{
 
 		return $query;
 	}
+
+	public function getPath(): string{
+		$query = [];
+		foreach (static::$path_params as $param_name){
+			if (!isset($this->{$param_name})){
+				continue;
+			}
+			$query[] = $this->{$param_name};
+		}
+		if (count($query)>0){
+			return '/'.implode('/', $query);
+		}
+
+		return '';
+	}
 }