improve type safety

Author: filecage

src/Components/QueryParameters/ArrayQueryParameter.php

@@ -3,6 +3,8 @@
 namespace UriManage\Components\QueryParameters;
 
 
+use UriManage\Constants\Symbol;
+
 /**
  * @internal
  */
@@ -35,4 +37,15 @@ function getValueAsInt () : int {
         return (int) $this->value;
     }
 
+    function __toString (): string {
+        $key = rawurlencode($this->key . Symbol::QUERY_ARRAY_SUFFIX);
+
+        return implode(Symbol::QUERY_PAIR_SEPARATOR, array_map(function($value) use ($key) {
+            if ($value === null) {
+                return $key;
+            }
+
+            return $key . Symbol::QUERY_KEYVALUE_SEPARATOR . rawurlencode($value);
+        }, $this->value));
+    }
 }

src/Components/QueryParameters/QueryParameter.php

@@ -48,18 +48,8 @@ abstract function getValueAsString (): string;
     abstract function getValueAsInt (): int;
 
     function __toString () : string {
-        $value = $this->getValuePlain();
-        $key = rawurlencode($this->key . (is_array($value) ? Symbol::QUERY_ARRAY_SUFFIX : ''));
-
-        if (is_array($value)) {
-            return implode(Symbol::QUERY_PAIR_SEPARATOR, array_map(function($value) use ($key){
-                if ($value === null) {
-                    return $key;
-                }
-
-                return $key . Symbol::QUERY_KEYVALUE_SEPARATOR . rawurlencode($value);
-            }, $value));
-        } elseif ($value === null) {
+        $key = rawurlencode($this->key);
+        if ($this->getValuePlain() === null) {
             return $key;
         }
 

src/Uri.php

@@ -12,16 +12,15 @@
     use UriManage\Exceptions\UriException;
 
     class Uri implements UriInterface {
-        protected ?string $scheme;
-        protected ?string $user;
-        protected ?string $pass;
-        protected ?string $host;
-        protected ?int $port;
+        protected ?string $scheme = null;
+        protected ?string $user = null;
+        protected ?string $pass = null;
+        protected ?string $host = null;
+        protected ?int $port = null;
         protected ?Path $path = null;
         protected ?Query $query = null;
-        protected ?string $fragment;
-        protected ?string $originalUri;
-        protected bool $hasBaseUrlRemoved = false;
+        protected ?string $fragment = null;
+        protected ?string $originalUri = null;
 
         /**
          * @throws InvalidArgumentException
@@ -62,12 +61,12 @@ function getFragment () : string {
          * @return string
          */
         function getUserInfo () : string {
-            if (!$this->hasUserInfo()) {
+            if ($this->user === null) {
                 return '';
             }
 
-            if (($this->pass ?? '') === '') {
-                return $this->user ?? '';
+            if ($this->pass === null) {
+                return $this->user;
             }
 
             return sprintf('%s:%s', $this->user, $this->pass);
@@ -77,19 +76,19 @@ function getUserInfo () : string {
          * @return string
          */
         function getAuthority () : string {
-            if (!$this->hasUserInfo()) {
-                if ($this->isDefaultPortForScheme() || $this->getPort() === null) {
+            if ($this->user === null) {
+                if ($this->isDefaultPortForScheme() || $this->port === null) {
                     return $this->getHost();
                 }
 
-                return sprintf('%s:%d', $this->getHost(), $this->getPort());
+                return sprintf('%s:%d', $this->getHost(), $this->port);
             }
 
-            if ($this->isDefaultPortForScheme() || $this->getPort() === null) {
+            if ($this->isDefaultPortForScheme() || $this->port === null) {
                 return sprintf('%s@%s', $this->getUserInfo(), $this->getHost());
             }
 
-            return sprintf('%s@%s:%d', $this->getUserInfo(), $this->getHost(), $this->getPort());
+            return sprintf('%s@%s:%d', $this->getUserInfo(), $this->getHost(), $this->port);
         }
 
         /**
@@ -180,7 +179,7 @@ function withHost ($host) : static {
             $instance = clone $this;
 
             if ($host === '') {
-                unset($instance->host);
+                $instance->host = null;
             } else {
                 $instance->host = UriParser::parseHost($host);
             }
@@ -259,13 +258,13 @@ function withUserInfo ($user, $password = null) : static {
         }
 
         /**
-         * @param int|null $port
+         * @param null|int $port
          * @return static
          */
         function withPort ($port) : static {
             if ($port === null) {
                 $instance = clone $this;
-                unset($instance->port);
+                $instance->port = null;
 
                 return $instance;
             }
@@ -337,11 +336,4 @@ private function isDefaultPortForScheme () : bool {
             return (DefaultSchemePorts::PORT_TO_SCHEME[$this->port] ?? null) === $this->getScheme();
         }
 
-        /**
-         * @return bool
-         */
-        private function hasUserInfo () : bool {
-            return ($this->user ?? null) !== null;
-        }
-
     }