Remove UriData

Author: devanych

src/Request.php

@@ -4,7 +4,6 @@
 
 namespace HttpSoft\Request;
 
-use HttpSoft\Uri\UriData;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UriInterface;
@@ -22,7 +21,7 @@ final class Request implements RequestInterface, RequestMethodInterface
      */
     public function __construct(
         string $method = self::METHOD_GET,
-        $uri = UriData::EMPTY_STRING,
+        $uri = '',
         $body = 'php://temp',
         array $headers = [],
         string $protocol = '1.1'

src/RequestTrait.php

@@ -6,7 +6,6 @@
 
 use HttpSoft\Stream\MessageTrait;
 use HttpSoft\Stream\StreamFactory;
-use HttpSoft\Uri\UriData;
 use HttpSoft\Uri\UriFactory;
 use InvalidArgumentException;
 use Psr\Http\Message\RequestInterface;
@@ -225,7 +224,7 @@ public function withUri(UriInterface $uri, $preserveHost = false): RequestInterf
      */
     private function init(
         string $method = RequestMethodInterface::METHOD_GET,
-        $uri = UriData::EMPTY_STRING,
+        $uri = '',
         $body = 'php://temp',
         array $headers = [],
         string $protocol = '1.1'

src/SapiNormalizer.php

@@ -4,15 +4,11 @@
 
 namespace HttpSoft\Request;
 
-use HttpSoft\Uri\Uri;
-use HttpSoft\Uri\UriData;
+use HttpSoft\Uri\UriFactory;
 use Psr\Http\Message\UriInterface;
 
 use function array_key_exists;
-use function explode;
-use function in_array;
 use function is_string;
-use function preg_replace;
 use function strpos;
 use function str_replace;
 use function strtolower;
@@ -50,33 +46,7 @@ public function normalizeProtocolVersion(array $server): string
      */
     public function normalizeUri(array $server): UriInterface
     {
-        $uriData = new UriData();
-
-        if (isset($server['HTTPS']) && in_array(strtolower((string) $server['HTTPS']), ['on', '1'])) {
-            $uriData->setScheme(UriData::SCHEMES[UriData::SECURE_PORT]);
-        } elseif ($scheme = $server['HTTP_X_FORWARDED_PROTO'] ?? $server['REQUEST_SCHEME'] ?? UriData::EMPTY_STRING) {
-            $uriData->setScheme((string) $scheme);
-        }
-
-        if ($host = $server['HTTP_X_FORWARDED_HOST'] ?? $server['HTTP_HOST'] ?? UriData::EMPTY_STRING) {
-            $uriData->setHost((string) $host);
-        } elseif ($host = $server['SERVER_NAME'] ?? $server['SERVER_ADDR'] ?? UriData::EMPTY_STRING) {
-            $uriData->setHost((string) $host);
-        }
-
-        if (($port = $server['SERVER_PORT'] ?? null) && (strpos($uriData->getHost(), ':') === false)) {
-            $uriData->setPort((int) $port);
-        }
-
-        if ($path = $server['REQUEST_URI'] ?? $server['ORIG_PATH_INFO'] ?? UriData::EMPTY_STRING) {
-            $uriData->setPath(explode('?', preg_replace('/^[^\/:]+:\/\/[^\/]+/', '', (string) $path), 2)[0]);
-        }
-
-        if ($query = $server['QUERY_STRING'] ?? UriData::EMPTY_STRING) {
-            $uriData->setQuery((string) $query);
-        }
-
-        return new Uri($uriData->__toString());
+        return UriFactory::createFromServer($server);
     }
 
     /**

src/ServerRequest.php

@@ -4,7 +4,6 @@
 
 namespace HttpSoft\Request;
 
-use HttpSoft\Uri\UriData;
 use InvalidArgumentException;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamInterface;
@@ -71,7 +70,7 @@ public function __construct(
         array $queryParams = [],
         $parsedBody = null,
         string $method = self::METHOD_GET,
-        $uri = UriData::EMPTY_STRING,
+        $uri = '',
         $body = 'php://input',
         array $headers = [],
         string $protocol = '1.1'