Actualize CI

Author: SerafimArts

src/Component/Authority.php

@@ -9,21 +9,9 @@
 
 final class Authority implements AuthorityInterface
 {
-    /**
-     * @var non-empty-string
-     */
-    public const string AUTHORITY_HOST_PORT_DELIMITER = ':';
-
-    /**
-     * @var non-empty-string
-     */
-    public const string AUTHORITY_USER_INFO_DELIMITER = '@';
-
     /**
      * Gets the user component of the URI.
      *
-     * @uses \Boson\Contracts\Uri\Component\UserInfoInterface::$user
-     *
      * @var non-empty-string|null
      */
     public ?string $user {
@@ -33,8 +21,6 @@ final class Authority implements AuthorityInterface
     /**
      * Gets the password component of the URI.
      *
-     * @uses \Boson\Contracts\Uri\Component\UserInfoInterface::$password
-     *
      * @var non-empty-string|null
      */
     public ?string $password {
@@ -73,11 +59,11 @@ public function __toString(): string
         $result = $this->host;
 
         if ($this->port !== null) {
-            $result .= self::AUTHORITY_HOST_PORT_DELIMITER . $this->port;
+            $result .= ':' . $this->port;
         }
 
         if ($this->userInfo !== null) {
-            return $this->userInfo . self::AUTHORITY_USER_INFO_DELIMITER . $result;
+            return $this->userInfo . '@' . $result;
         }
 
         return $result;

src/Component/Path.php

@@ -11,13 +11,6 @@
  */
 final readonly class Path implements PathInterface, \IteratorAggregate
 {
-    /**
-     * Provides segment delimiter of the path component.
-     *
-     * @var non-empty-string
-     */
-    public const string PATH_SEGMENT_DELIMITER = '/';
-
     /**
      * @var list<non-empty-string>
      */
@@ -67,14 +60,14 @@ public function __toString(): string
             $segments[] = \rawurlencode($segment);
         }
 
-        $path = \implode(self::PATH_SEGMENT_DELIMITER, $segments);
+        $path = \implode('/', $segments);
 
         if ($this->isAbsolute) {
-            $path = self::PATH_SEGMENT_DELIMITER . $path;
+            $path = '/' . $path;
         }
 
         if ($segments !== [] && $this->hasTrailingSlash) {
-            $path .= self::PATH_SEGMENT_DELIMITER;
+            $path .= '/';
         }
 
         return $path;

src/Component/Query.php

@@ -11,16 +11,6 @@
  */
 final class Query implements QueryInterface, \IteratorAggregate
 {
-    /**
-     * @var non-empty-string
-     */
-    public const string QUERY_PARAMETER_VALUE_DELIMITER = '=';
-
-    /**
-     * @var non-empty-string
-     */
-    public const string QUERY_PARAMETER_DELIMITER = '&';
-
     /**
      * @var array<non-empty-string, string|array<array-key, string>>
      */
@@ -113,12 +103,12 @@ public function __toString(): string
         $result = [];
 
         foreach ($this as $key => $value) {
-            /** @phpstan-ignore-next-line : PHPStan false-positive. PHP may contain integer keys in array */
+            /** @phpstan-ignore-next-line PHPStan false-positive. PHP may contain integer keys in array */
             $result[] = \rawurlencode((string) $key)
-                . self::QUERY_PARAMETER_VALUE_DELIMITER
+                . '='
                 . \rawurlencode($value);
         }
 
-        return \implode(self::QUERY_PARAMETER_DELIMITER, $result);
+        return \implode('&', $result);
     }
 }

src/Component/Scheme.php

@@ -36,7 +36,7 @@
     /**
      * Hypertext Transfer Protocol Secure (HTTPS) is an extension of the
      * Hypertext Transfer Protocol (HTTP). It uses encryption for secure
-     * communication over a computer network, and is widely used on the Internet.
+     * communication over a computer network and is widely used on the Internet.
      *
      * In HTTPS, the communication protocol is encrypted using Transport
      * Layer Security (TLS) or, formerly, Secure Sockets Layer (SSL).

src/Component/UserInfo.php

@@ -8,11 +8,6 @@
 
 final readonly class UserInfo implements UserInfoInterface
 {
-    /**
-     * @var non-empty-string
-     */
-    public const string USER_INFO_USER_PASSWORD_DELIMITER = ':';
-
     public function __construct(
         /**
          * @var non-empty-string
@@ -43,9 +38,7 @@ public function toString(): string
     public function __toString(): string
     {
         if ($this->password !== null) {
-            return $this->user
-                . self::USER_INFO_USER_PASSWORD_DELIMITER
-                . $this->password;
+            return $this->user . ':' . $this->password;
         }
 
         return $this->user;

src/Uri.php

@@ -14,31 +14,9 @@
 
 final class Uri implements UriInterface
 {
-    /**
-     * @var non-empty-string
-     */
-    public const string URI_SCHEMA_SUFFIX = ':';
-
-    /**
-     * @var non-empty-string
-     */
-    public const string URI_AUTHORITY_PREFIX = '//';
-
-    /**
-     * @var non-empty-string
-     */
-    public const string URI_QUERY_PREFIX = '?';
-
-    /**
-     * @var non-empty-string
-     */
-    public const string URI_FRAGMENT_PREFIX = '#';
-
     /**
      * Gets the user component of the URI.
      *
-     * @uses \Boson\Contracts\Uri\Component\UserInfoInterface::$user
-     *
      * @var non-empty-string|null
      */
     public ?string $user {
@@ -48,8 +26,6 @@ final class Uri implements UriInterface
     /**
      * Gets the password component of the URI.
      *
-     * @uses \Boson\Contracts\Uri\Component\UserInfoInterface::$password
-     *
      * @var non-empty-string|null
      */
     public ?string $password {
@@ -59,8 +35,6 @@ final class Uri implements UriInterface
     /**
      * Gets the host component of the URI.
      *
-     * @uses \Boson\Contracts\Uri\Component\AuthorityInterface::$host
-     *
      * @var non-empty-string|null
      */
     public ?string $host {
@@ -70,8 +44,6 @@ final class Uri implements UriInterface
     /**
      * Gets the port component of the URI.
      *
-     * @uses \Boson\Contracts\Uri\Component\AuthorityInterface::$port
-     *
      * @var int<0, 65535>|null
      */
     public ?int $port {
@@ -116,22 +88,21 @@ public function __toString(): string
         $result = '';
 
         if ($this->scheme !== null) {
-            $result .= $this->scheme . self::URI_SCHEMA_SUFFIX;
+            $result .= $this->scheme . ':';
         }
 
         if ($this->authority !== null) {
-            $result .= self::URI_AUTHORITY_PREFIX
-                . $this->authority;
+            $result .= '//' . $this->authority;
         }
 
         $result .= $this->path;
 
         if ($this->query->count() !== 0) {
-            $result .= self::URI_QUERY_PREFIX . $this->query;
+            $result .= '?' . $this->query;
         }
 
         if ($this->fragment !== null) {
-            $result .= self::URI_FRAGMENT_PREFIX . \rawurlencode($this->fragment);
+            $result .= '#' . \rawurlencode($this->fragment);
         }
 
         return $result;