Merge pull request #3 from MaplePHP/develop

Add DTO v3.0.0

Author: wazabii8

Env.php

@@ -57,8 +57,8 @@ public function drop(string $key): void
 
     public function formatKey($key)
     {
-        return Format\Str::value($key)->clearBreaks()->trim()->replaceSpecialChar()
-                ->trimSpaces()->replaceSpaces("-")->toUpper()->get();
+        return Format\Str::value($key)->clearBreaks()->trim()->normalizeAccents()
+                ->normalizeSeparators()->replaceSpaces("-")->toUpper()->get();
     }
 
     public function generateOutput(array $fromArr = ["data", "fileData", "set"])

Environment.php

@@ -77,9 +77,9 @@ public function getPath(): string
     {
         if (is_null($this->path)) {
             $basePath = '';
-            $requestName = Format\Str::value($this->get("SCRIPT_NAME"))->extractPath()->get();
+            $requestName = Format\Str::value($this->get("SCRIPT_NAME"))->getUrlPath()->get();
             $requestDir = dirname($requestName);
-            $requestUri = Format\Str::value($this->get("REQUEST_URI"))->extractPath()->get();
+            $requestUri = Format\Str::value($this->get("REQUEST_URI"))->getUrlPath()->get();
 
             $this->path = $requestUri;
             if (stripos($requestUri, $requestName) === 0) {

Uri.php

@@ -213,7 +213,10 @@ public function getDefaultPort(): ?int
     public function getPath(): string
     {
         if ($val = $this->getUniquePart("path")) {
-            $this->encoded['path'] = Format\Str::value($val)->toggleUrlencode(['%2F'], ['/'])->get();
+            $this->encoded['path'] = Format\Str::value($val)
+                ->normalizeUrlEncoding()
+                ->replace(['%2F'], ['/'])
+                ->get();
             if($this->encoded['path']) {
                 $this->encoded['path'] = "/".ltrim($this->encoded['path'], "/");
             }
@@ -229,8 +232,9 @@ public function getQuery(): string
     {
         if ($val = $this->getUniquePart("query")) {
             $this->encoded['query'] = Format\Str::value($val)
-            ->toggleUrlencode(['%3D', '%26', '%5B', '%5D'], ['=', '&', '[', ']'])
-            ->get();
+                ->normalizeUrlEncoding()
+                ->replace(['%3D', '%26', '%5B', '%5D'], ['=', '&', '[', ']'])
+                ->get();
         }
         return (string)$this->encoded['query'];
     }

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "maplephp/http",
-  "version": "v1.2.2",
+  "version": "v1.2.3",
   "type": "library",
   "description": "MaplePHP/Http is a powerful and easy-to-use PHP library that fully supports the PSR-7 HTTP message interfaces.",
   "keywords": [
@@ -29,7 +29,7 @@
   ],
   "require": {
     "php": ">=8.0",
-    "maplephp/dto": "^2.0"
+    "maplephp/dto": "^3.0"
   },
   "require-dev": {
     "maplephp/unitary": "^1.0"