diff --git a/README.md b/README.md
index df5ddb4cb..fd6978040 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,8 @@ The set provides best practices to make development more fun and classes/service
 
 | Requirement  | Constraint          | Supported by |
 |--------------|---------------------|------------------|
-|  PHP  | `^8.2` |   `HEAD ⋯ 2.0.0`   |
+|  PHP  | `^8.3` |  `HEAD`   |
+|  | `^8.2` |   `HEAD ⋯ 2.0.0`   |
 |  | `^8.1` |   `HEAD ⋯ 2.0.0`   |
 |  | `^8.0` |   `4.6.0 ⋯ 2.0.0`   |
 |  | `^8.0.0` |   `1.1.2 ⋯ 0.12.0`   |
diff --git a/composer.json b/composer.json
index d74e46408..c01772c30 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
     "forum": "https://github.com/LastDragon-ru/lara-asp/discussions"
   },
   "require": {
-    "php": "^8.1|^8.2",
+    "php": "^8.1|^8.2|^8.3",
     "ext-dom": "*",
     "ext-intl": "*",
     "ext-json": "*",
diff --git a/metadata.json b/metadata.json
index 449fe26d5..a98ce2d65 100644
--- a/metadata.json
+++ b/metadata.json
@@ -8,6 +8,7 @@
                 "^9.21.0"
             ],
             "php": [
+                "^8.3",
                 "^8.2",
                 "^8.1"
             ]
diff --git a/packages/core/README.md b/packages/core/README.md
index 4809316cb..3f4107277 100644
--- a/packages/core/README.md
+++ b/packages/core/README.md
@@ -10,7 +10,8 @@ This package contains useful utilities and classes.
 
 | Requirement  | Constraint          | Supported by |
 |--------------|---------------------|------------------|
-|  PHP  | `^8.2` |   `HEAD ⋯ 2.0.0`   |
+|  PHP  | `^8.3` |  `HEAD`   |
+|  | `^8.2` |   `HEAD ⋯ 2.0.0`   |
 |  | `^8.1` |   `HEAD ⋯ 2.0.0`   |
 |  | `^8.0` |   `4.6.0 ⋯ 2.0.0`   |
 |  | `^8.0.0` |   `1.1.2 ⋯ 0.12.0`   |
diff --git a/packages/core/composer.json b/packages/core/composer.json
index b84da8369..303350ef4 100644
--- a/packages/core/composer.json
+++ b/packages/core/composer.json
@@ -16,7 +16,7 @@
     "forum": "https://github.com/LastDragon-ru/lara-asp/discussions"
   },
   "require": {
-    "php": "^8.1|^8.2",
+    "php": "^8.1|^8.2|^8.3",
     "ext-mbstring": "*",
     "laravel/framework": "^9.21.0|^10.0.0"
   },
diff --git a/packages/core/metadata.json b/packages/core/metadata.json
index 7130bc9ae..4dcedb2a8 100644
--- a/packages/core/metadata.json
+++ b/packages/core/metadata.json
@@ -8,6 +8,7 @@
                 "^9.21.0"
             ],
             "php": [
+                "^8.3",
                 "^8.2",
                 "^8.1"
             ]
diff --git a/packages/documentator/README.md b/packages/documentator/README.md
index bd6f42e21..84c32bdb4 100644
--- a/packages/documentator/README.md
+++ b/packages/documentator/README.md
@@ -10,7 +10,8 @@ This package provides various utilities for documentation generation.
 
 | Requirement  | Constraint          | Supported by |
 |--------------|---------------------|------------------|
-|  PHP  | `^8.2` |  `HEAD`  ,  `5.0.0-beta.1`   |
+|  PHP  | `^8.3` |  `HEAD`   |
+|  | `^8.2` |  `HEAD`  ,  `5.0.0-beta.1`   |
 |  | `^8.1` |  `HEAD`  ,  `5.0.0-beta.1`   |
 |  Laravel  | `^10.0.0` |  `HEAD`  ,  `5.0.0-beta.1`   |
 |  | `^9.21.0` |  `HEAD`  ,  `5.0.0-beta.1`   |
diff --git a/packages/documentator/composer.json b/packages/documentator/composer.json
index 7988f59e9..06522d8e7 100644
--- a/packages/documentator/composer.json
+++ b/packages/documentator/composer.json
@@ -18,7 +18,7 @@
     "forum": "https://github.com/LastDragon-ru/lara-asp/discussions"
   },
   "require": {
-    "php": "^8.1|^8.2",
+    "php": "^8.1|^8.2|^8.3",
     "ext-mbstring": "*",
     "composer/semver": "^3.2",
     "laravel/framework": "^9.21.0|^10.0.0",
diff --git a/packages/documentator/metadata.json b/packages/documentator/metadata.json
index bcbbe62d7..b087ae858 100644
--- a/packages/documentator/metadata.json
+++ b/packages/documentator/metadata.json
@@ -8,6 +8,7 @@
                 "^9.21.0"
             ],
             "php": [
+                "^8.3",
                 "^8.2",
                 "^8.1"
             ]
diff --git a/packages/eloquent/README.md b/packages/eloquent/README.md
index 037ad64be..250740535 100644
--- a/packages/eloquent/README.md
+++ b/packages/eloquent/README.md
@@ -10,7 +10,8 @@ This package contains useful extensions and mixins for [Eloquent](https://larave
 
 | Requirement  | Constraint          | Supported by |
 |--------------|---------------------|------------------|
-|  PHP  | `^8.2` |   `HEAD ⋯ 2.0.0`   |
+|  PHP  | `^8.3` |  `HEAD`   |
+|  | `^8.2` |   `HEAD ⋯ 2.0.0`   |
 |  | `^8.1` |   `HEAD ⋯ 2.0.0`   |
 |  | `^8.0` |   `4.6.0 ⋯ 2.0.0`   |
 |  | `^8.0.0` |   `1.1.2 ⋯ 0.12.0`   |
diff --git a/packages/eloquent/composer.json b/packages/eloquent/composer.json
index a74215431..7a434aac5 100644
--- a/packages/eloquent/composer.json
+++ b/packages/eloquent/composer.json
@@ -17,7 +17,7 @@
     "forum": "https://github.com/LastDragon-ru/lara-asp/discussions"
   },
   "require": {
-    "php": "^8.1|^8.2",
+    "php": "^8.1|^8.2|^8.3",
     "laravel/framework": "^9.21.0|^10.0.0",
     "lastdragon-ru/lara-asp-core": "self.version"
   },
diff --git a/packages/eloquent/metadata.json b/packages/eloquent/metadata.json
index 449fe26d5..a98ce2d65 100644
--- a/packages/eloquent/metadata.json
+++ b/packages/eloquent/metadata.json
@@ -8,6 +8,7 @@
                 "^9.21.0"
             ],
             "php": [
+                "^8.3",
                 "^8.2",
                 "^8.1"
             ]
diff --git a/packages/formatter/README.md b/packages/formatter/README.md
index 2f745d3a3..0d29c18db 100644
--- a/packages/formatter/README.md
+++ b/packages/formatter/README.md
@@ -10,7 +10,8 @@ This package provides a customizable wrapper around [Intl](https://www.php.net/m
 
 | Requirement  | Constraint          | Supported by |
 |--------------|---------------------|------------------|
-|  PHP  | `^8.2` |   `HEAD ⋯ 2.0.0`   |
+|  PHP  | `^8.3` |  `HEAD`   |
+|  | `^8.2` |   `HEAD ⋯ 2.0.0`   |
 |  | `^8.1` |   `HEAD ⋯ 2.0.0`   |
 |  | `^8.0` |   `4.6.0 ⋯ 2.0.0`   |
 |  | `^8.0.0` |   `1.1.2 ⋯ 0.12.0`   |
diff --git a/packages/formatter/composer.json b/packages/formatter/composer.json
index a67a45e03..d18154e0f 100644
--- a/packages/formatter/composer.json
+++ b/packages/formatter/composer.json
@@ -18,7 +18,7 @@
     "forum": "https://github.com/LastDragon-ru/lara-asp/discussions"
   },
   "require": {
-    "php": "^8.1|^8.2",
+    "php": "^8.1|^8.2|^8.3",
     "ext-intl": "*",
     "ext-mbstring": "*",
     "laravel/framework": "^9.21.0|^10.0.0",
diff --git a/packages/formatter/metadata.json b/packages/formatter/metadata.json
index 449fe26d5..a98ce2d65 100644
--- a/packages/formatter/metadata.json
+++ b/packages/formatter/metadata.json
@@ -8,6 +8,7 @@
                 "^9.21.0"
             ],
             "php": [
+                "^8.3",
                 "^8.2",
                 "^8.1"
             ]
diff --git a/packages/formatter/src/FormatterTest.php b/packages/formatter/src/FormatterTest.php
index cf26f6755..7dc4e57ad 100644
--- a/packages/formatter/src/FormatterTest.php
+++ b/packages/formatter/src/FormatterTest.php
@@ -9,6 +9,7 @@
 use PHPUnit\Framework\Attributes\CoversClass;
 
 use function config;
+use function str_replace;
 
 /**
  * @internal
@@ -125,8 +126,11 @@ public function testDuration(): void {
     public function testTime(): void {
         $time = DateTime::createFromFormat('H:i:s', '23:24:59') ?: null;
 
-        self::assertEquals('11:24 PM', $this->formatter->time($time));
-        self::assertEquals('2:24 AM', $this->formatter->time($time, null, 'Europe/Moscow'));
+        self::assertEquals('11:24 PM', str_replace("\u{202F}", ' ', $this->formatter->time($time)));
+        self::assertEquals(
+            '2:24 AM',
+            str_replace("\u{202F}", ' ', $this->formatter->time($time, null, 'Europe/Moscow')),
+        );
     }
 
     public function testTimeConfig(): void {
@@ -136,7 +140,7 @@ public function testTimeConfig(): void {
 
         $time = DateTime::createFromFormat('H:i:s', '23:24:59') ?: null;
 
-        self::assertEquals('11:24:59 PM', $this->formatter->time($time));
+        self::assertEquals('11:24:59 PM', str_replace("\u{202F}", ' ', $this->formatter->time($time)));
     }
 
     public function testTimeCustomFormat(): void {
@@ -185,8 +189,11 @@ public function testDateCustomFormat(): void {
     public function testDatetime(): void {
         $datetime = DateTime::createFromFormat('d.m.Y H:i:s', '12.05.2005 23:00:00') ?: null;
 
-        self::assertEquals('5/12/05, 11:00 PM', $this->formatter->datetime($datetime));
-        self::assertEquals('5/13/05, 3:00 AM', $this->formatter->datetime($datetime, null, 'Europe/Moscow'));
+        self::assertEquals('5/12/05, 11:00 PM', str_replace("\u{202F}", ' ', $this->formatter->datetime($datetime)));
+        self::assertEquals(
+            '5/13/05, 3:00 AM',
+            str_replace("\u{202F}", ' ', $this->formatter->datetime($datetime, null, 'Europe/Moscow')),
+        );
     }
 
     public function testDatetimeConfig(): void {
@@ -196,7 +203,10 @@ public function testDatetimeConfig(): void {
 
         $datetime = DateTime::createFromFormat('d.m.Y H:i:s', '12.05.2005 23:00:00') ?: null;
 
-        self::assertEquals('May 12, 2005, 11:00:00 PM', $this->formatter->datetime($datetime));
+        self::assertEquals(
+            'May 12, 2005, 11:00:00 PM',
+            str_replace("\u{202F}", ' ', $this->formatter->datetime($datetime)),
+        );
     }
 
     public function testDatetimeCustomFormat(): void {
diff --git a/packages/graphql-printer/README.md b/packages/graphql-printer/README.md
index 14ac063d8..281a6cc99 100644
--- a/packages/graphql-printer/README.md
+++ b/packages/graphql-printer/README.md
@@ -10,7 +10,8 @@ Independent (from Laravel and Lighthouse) package that allow you to print GraphQ
 
 | Requirement  | Constraint          | Supported by |
 |--------------|---------------------|------------------|
-|  PHP  | `^8.2` |   `HEAD ⋯ 3.0.0`   |
+|  PHP  | `^8.3` |  `HEAD`   |
+|  | `^8.2` |   `HEAD ⋯ 3.0.0`   |
 |  | `^8.1` |   `HEAD ⋯ 3.0.0`   |
 |  | `^8.0` |   `4.6.0 ⋯ 3.0.0`   |
 |  `webonyx/graphql-php`  | `^15.4.0` |   `HEAD ⋯ 4.2.1`   |
diff --git a/packages/graphql-printer/composer.json b/packages/graphql-printer/composer.json
index 3046cfaf5..1de329665 100644
--- a/packages/graphql-printer/composer.json
+++ b/packages/graphql-printer/composer.json
@@ -17,7 +17,7 @@
     "forum": "https://github.com/LastDragon-ru/lara-asp/discussions"
   },
   "require": {
-    "php": "^8.1|^8.2",
+    "php": "^8.1|^8.2|^8.3",
     "ext-mbstring": "*",
     "webonyx/graphql-php": "^15.4.0"
   },
diff --git a/packages/graphql-printer/metadata.json b/packages/graphql-printer/metadata.json
index fadc5ce07..001672973 100644
--- a/packages/graphql-printer/metadata.json
+++ b/packages/graphql-printer/metadata.json
@@ -7,6 +7,7 @@
     "requirements": {
         "HEAD": {
             "php": [
+                "^8.3",
                 "^8.2",
                 "^8.1"
             ],
diff --git a/packages/graphql/README.md b/packages/graphql/README.md
index 05c322c73..d518e8afe 100644
--- a/packages/graphql/README.md
+++ b/packages/graphql/README.md
@@ -10,7 +10,8 @@ This package provides highly powerful `@searchBy` and `@sortBy`  directives for
 
 | Requirement  | Constraint          | Supported by |
 |--------------|---------------------|------------------|
-|  PHP  | `^8.2` |   `HEAD ⋯ 2.0.0`   |
+|  PHP  | `^8.3` |  `HEAD`   |
+|  | `^8.2` |   `HEAD ⋯ 2.0.0`   |
 |  | `^8.1` |   `HEAD ⋯ 2.0.0`   |
 |  | `^8.0` |   `4.6.0 ⋯ 2.0.0`   |
 |  | `^8.0.0` |   `1.1.2 ⋯ 0.12.0`   |
diff --git a/packages/graphql/composer.json b/packages/graphql/composer.json
index 13f8a84e7..c1b756f07 100644
--- a/packages/graphql/composer.json
+++ b/packages/graphql/composer.json
@@ -18,7 +18,7 @@
     "forum": "https://github.com/LastDragon-ru/lara-asp/discussions"
   },
   "require": {
-    "php": "^8.1|^8.2",
+    "php": "^8.1|^8.2|^8.3",
     "ext-mbstring": "*",
     "composer/semver": "^3.2",
     "laravel/framework": "^9.21.0|^10.0.0",
diff --git a/packages/graphql/metadata.json b/packages/graphql/metadata.json
index f76cc5d74..20009d8c2 100644
--- a/packages/graphql/metadata.json
+++ b/packages/graphql/metadata.json
@@ -15,6 +15,7 @@
                 "^6.5.0"
             ],
             "php": [
+                "^8.3",
                 "^8.2",
                 "^8.1"
             ]
diff --git a/packages/migrator/README.md b/packages/migrator/README.md
index fef90dca9..afaea9107 100644
--- a/packages/migrator/README.md
+++ b/packages/migrator/README.md
@@ -13,7 +13,8 @@ This package improves standard laravel migrations to add support for raw SQL fil
 
 | Requirement  | Constraint          | Supported by |
 |--------------|---------------------|------------------|
-|  PHP  | `^8.2` |   `HEAD ⋯ 2.0.0`   |
+|  PHP  | `^8.3` |  `HEAD`   |
+|  | `^8.2` |   `HEAD ⋯ 2.0.0`   |
 |  | `^8.1` |   `HEAD ⋯ 2.0.0`   |
 |  | `^8.0` |   `4.6.0 ⋯ 2.0.0`   |
 |  | `^8.0.0` |   `1.1.2 ⋯ 0.12.0`   |
diff --git a/packages/migrator/composer.json b/packages/migrator/composer.json
index 995eec247..76bfed1fd 100644
--- a/packages/migrator/composer.json
+++ b/packages/migrator/composer.json
@@ -20,7 +20,7 @@
     "forum": "https://github.com/LastDragon-ru/lara-asp/discussions"
   },
   "require": {
-    "php": "^8.1|^8.2",
+    "php": "^8.1|^8.2|^8.3",
     "ext-json": "*",
     "composer/semver": "^3.2",
     "laravel/framework": "^9.21.0|^10.0.0",
diff --git a/packages/migrator/metadata.json b/packages/migrator/metadata.json
index 449fe26d5..a98ce2d65 100644
--- a/packages/migrator/metadata.json
+++ b/packages/migrator/metadata.json
@@ -8,6 +8,7 @@
                 "^9.21.0"
             ],
             "php": [
+                "^8.3",
                 "^8.2",
                 "^8.1"
             ]
diff --git a/packages/queue/README.md b/packages/queue/README.md
index f52881273..4664c1923 100644
--- a/packages/queue/README.md
+++ b/packages/queue/README.md
@@ -10,7 +10,8 @@ This package provides additional capabilities for queued jobs and queued listene
 
 | Requirement  | Constraint          | Supported by |
 |--------------|---------------------|------------------|
-|  PHP  | `^8.2` |   `HEAD ⋯ 2.0.0`   |
+|  PHP  | `^8.3` |  `HEAD`   |
+|  | `^8.2` |   `HEAD ⋯ 2.0.0`   |
 |  | `^8.1` |   `HEAD ⋯ 2.0.0`   |
 |  | `^8.0` |   `4.6.0 ⋯ 2.0.0`   |
 |  | `^8.0.0` |   `1.1.2 ⋯ 0.12.0`   |
diff --git a/packages/queue/composer.json b/packages/queue/composer.json
index 43074bc12..122733083 100644
--- a/packages/queue/composer.json
+++ b/packages/queue/composer.json
@@ -18,7 +18,7 @@
     "forum": "https://github.com/LastDragon-ru/lara-asp/discussions"
   },
   "require": {
-    "php": "^8.1|^8.2",
+    "php": "^8.1|^8.2|^8.3",
     "laravel/framework": "^9.21.0|^10.0.0",
     "lastdragon-ru/lara-asp-core": "self.version"
   },
diff --git a/packages/queue/metadata.json b/packages/queue/metadata.json
index 449fe26d5..a98ce2d65 100644
--- a/packages/queue/metadata.json
+++ b/packages/queue/metadata.json
@@ -8,6 +8,7 @@
                 "^9.21.0"
             ],
             "php": [
+                "^8.3",
                 "^8.2",
                 "^8.1"
             ]
diff --git a/packages/serializer/README.md b/packages/serializer/README.md
index 081b00aaf..f84a574e0 100644
--- a/packages/serializer/README.md
+++ b/packages/serializer/README.md
@@ -10,7 +10,8 @@ This package provides a customizable wrapper around the [Symfony Serializer Comp
 
 | Requirement  | Constraint          | Supported by |
 |--------------|---------------------|------------------|
-|  PHP  | `^8.2` |   `HEAD ⋯ 5.0.0-beta.0`   |
+|  PHP  | `^8.3` |  `HEAD`   |
+|  | `^8.2` |   `HEAD ⋯ 5.0.0-beta.0`   |
 |  | `^8.1` |   `HEAD ⋯ 5.0.0-beta.0`   |
 |  Laravel  | `^10.0.0` |   `HEAD ⋯ 5.0.0-beta.0`   |
 |  | `^9.21.0` |  `HEAD`  ,  `5.0.0-beta.1`   |
diff --git a/packages/serializer/composer.json b/packages/serializer/composer.json
index d2793692b..5d46d8147 100644
--- a/packages/serializer/composer.json
+++ b/packages/serializer/composer.json
@@ -17,7 +17,7 @@
     "forum": "https://github.com/LastDragon-ru/lara-asp/discussions"
   },
   "require": {
-    "php": "^8.1|^8.2",
+    "php": "^8.1|^8.2|^8.3",
     "laravel/framework": "^9.21.0|^10.0.0",
     "lastdragon-ru/lara-asp-core": "self.version",
     "phpdocumentor/type-resolver": "^1.7",
diff --git a/packages/serializer/metadata.json b/packages/serializer/metadata.json
index 4b4dafba1..3af3a4948 100644
--- a/packages/serializer/metadata.json
+++ b/packages/serializer/metadata.json
@@ -8,6 +8,7 @@
                 "^9.21.0"
             ],
             "php": [
+                "^8.3",
                 "^8.2",
                 "^8.1"
             ]
diff --git a/packages/spa/README.md b/packages/spa/README.md
index f45526dfd..4135675ee 100644
--- a/packages/spa/README.md
+++ b/packages/spa/README.md
@@ -8,7 +8,8 @@
 
 | Requirement  | Constraint          | Supported by |
 |--------------|---------------------|------------------|
-|  PHP  | `^8.2` |   `HEAD ⋯ 2.0.0`   |
+|  PHP  | `^8.3` |  `HEAD`   |
+|  | `^8.2` |   `HEAD ⋯ 2.0.0`   |
 |  | `^8.1` |   `HEAD ⋯ 2.0.0`   |
 |  | `^8.0` |   `4.6.0 ⋯ 2.0.0`   |
 |  | `^8.0.0` |   `1.1.2 ⋯ 0.12.0`   |
diff --git a/packages/spa/composer.json b/packages/spa/composer.json
index 0d993d6a2..9e8463448 100644
--- a/packages/spa/composer.json
+++ b/packages/spa/composer.json
@@ -18,7 +18,7 @@
     "forum": "https://github.com/LastDragon-ru/lara-asp/discussions"
   },
   "require": {
-    "php": "^8.1|^8.2",
+    "php": "^8.1|^8.2|^8.3",
     "ext-mbstring": "*",
     "guzzlehttp/psr7": "^1.9.1|^2.4.5",
     "laravel/framework": "^9.21.0|^10.0.0",
diff --git a/packages/spa/metadata.json b/packages/spa/metadata.json
index cb6a95920..f702a4ec9 100644
--- a/packages/spa/metadata.json
+++ b/packages/spa/metadata.json
@@ -8,6 +8,7 @@
                 "^9.21.0"
             ],
             "php": [
+                "^8.3",
                 "^8.2",
                 "^8.1"
             ]
diff --git a/packages/testing/README.md b/packages/testing/README.md
index df0db70d2..7f73f521d 100644
--- a/packages/testing/README.md
+++ b/packages/testing/README.md
@@ -10,7 +10,8 @@ This package provides various useful asserts for [PHPUnit](https://phpunit.de/)
 
 | Requirement  | Constraint          | Supported by |
 |--------------|---------------------|------------------|
-|  PHP  | `^8.2` |   `HEAD ⋯ 2.0.0`   |
+|  PHP  | `^8.3` |  `HEAD`   |
+|  | `^8.2` |   `HEAD ⋯ 2.0.0`   |
 |  | `^8.1` |   `HEAD ⋯ 2.0.0`   |
 |  | `^8.0` |   `4.6.0 ⋯ 2.0.0`   |
 |  | `^8.0.0` |   `1.1.2 ⋯ 0.12.0`   |
diff --git a/packages/testing/composer.json b/packages/testing/composer.json
index dac8e312e..72d595006 100644
--- a/packages/testing/composer.json
+++ b/packages/testing/composer.json
@@ -19,7 +19,7 @@
     "forum": "https://github.com/LastDragon-ru/lara-asp/discussions"
   },
   "require": {
-    "php": "^8.1|^8.2",
+    "php": "^8.1|^8.2|^8.3",
     "ext-json": "*",
     "ext-libxml": "*",
     "ext-dom": "*",
diff --git a/packages/testing/metadata.json b/packages/testing/metadata.json
index 449fe26d5..a98ce2d65 100644
--- a/packages/testing/metadata.json
+++ b/packages/testing/metadata.json
@@ -8,6 +8,7 @@
                 "^9.21.0"
             ],
             "php": [
+                "^8.3",
                 "^8.2",
                 "^8.1"
             ]
diff --git a/packages/testing/src/Constraints/Json/Protocol.php b/packages/testing/src/Constraints/Json/Protocol.php
index d0f41ed7d..e246d0d53 100644
--- a/packages/testing/src/Constraints/Json/Protocol.php
+++ b/packages/testing/src/Constraints/Json/Protocol.php
@@ -47,7 +47,7 @@ public static function getUri(SplFileInfo $file, array $parameters = []): Uri {
 
         // Build
         $scheme = static::Scheme;
-        $query  = http_build_query($parameters, encoding_type: PHP_QUERY_RFC3986);
+        $query  = http_build_query($parameters, '', '&', PHP_QUERY_RFC3986);
         $path   = implode('/', array_map(rawurlencode(...), explode('/', ltrim($path, '/'))));
         $uri    = new Uri((array) parse_url("{$scheme}://{$host}/{$path}?{$query}"));