Improve Type class codebase

Author: nyamsprod

src/ByteSequence.php

@@ -5,7 +5,6 @@
 namespace Bakame\Http\StructuredFields;
 
 use Stringable;
-
 use Throwable;
 
 use function base64_decode;
@@ -25,25 +24,25 @@ private function __construct(
     /**
      * Returns a new instance from a Base64 encoded string.
      */
-    public static function fromEncoded(Stringable|string $encodedValue): self
+    public static function fromEncoded(Stringable|string $encoded): self
     {
-        $encodedValue = (string) $encodedValue;
-        if (1 !== preg_match('/^[a-z\d+\/=]*$/i', $encodedValue)) {
-            throw new SyntaxError('Invalid character in byte sequence.');
+        $encoded = (string) $encoded;
+        if (1 !== preg_match('/^[a-z\d+\/=]*$/i', $encoded)) {
+            throw new SyntaxError('The byte sequence '.$encoded.' contains invalid characters.');
         }
 
-        $decoded = base64_decode($encodedValue, true);
+        $decoded = base64_decode($encoded, true);
         if (false === $decoded) {
-            throw new SyntaxError('Unable to base64 decode the byte sequence.');
+            throw new SyntaxError('Unable to base64 decode the byte sequence '.$encoded);
         }
 
         return new self($decoded);
     }
 
-    public static function tryFromEncoded(Stringable|string $encodedValue): ?self
+    public static function tryFromEncoded(Stringable|string $encoded): ?self
     {
         try {
-            return self::fromEncoded($encodedValue);
+            return self::fromEncoded($encoded);
         } catch (Throwable) {
             return null;
         }
@@ -52,9 +51,9 @@ public static function tryFromEncoded(Stringable|string $encodedValue): ?self
     /**
      * Returns a new instance from a raw decoded string.
      */
-    public static function fromDecoded(Stringable|string $value): self
+    public static function fromDecoded(Stringable|string $decoded): self
     {
-        return new self((string) $value);
+        return new self((string) $decoded);
     }
 
     /**

src/DisplayString.php

@@ -22,10 +22,10 @@ private function __construct(
     ) {
     }
 
-    public static function tryFromEncoded(Stringable|string $encodedValue): ?self
+    public static function tryFromEncoded(Stringable|string $encoded): ?self
     {
         try {
-            return self::fromEncoded($encodedValue);
+            return self::fromEncoded($encoded);
         } catch (Throwable) {
             return null;
         }
@@ -34,41 +34,41 @@ public static function tryFromEncoded(Stringable|string $encodedValue): ?self
     /**
      * Returns a new instance from a Base64 encoded string.
      */
-    public static function fromEncoded(Stringable|string $encodedValue): self
+    public static function fromEncoded(Stringable|string $encoded): self
     {
-        $value = (string) $encodedValue;
+        $encoded = (string) $encoded;
 
-        if (1 === preg_match('/[^\x20-\x7E]/i', $value)) {
-            throw new SyntaxError('The string contains invalid characters.'.$value);
+        if (1 === preg_match('/[^\x20-\x7E]/i', $encoded)) {
+            throw new SyntaxError('The display string '.$encoded.' contains invalid characters.');
         }
 
-        if (!str_contains($value, '%')) {
-            return new self($value);
+        if (!str_contains($encoded, '%')) {
+            return new self($encoded);
         }
 
-        if (1 === preg_match('/%(?![0-9a-f]{2})/', $value)) {
-            throw new SyntaxError('The string '.$value.' contains invalid utf-8 encoded sequence.');
+        if (1 === preg_match('/%(?![0-9a-f]{2})/', $encoded)) {
+            throw new SyntaxError('The display string '.$encoded.' contains invalid utf-8 encoded sequence.');
         }
 
-        $value = (string) preg_replace_callback(
+        $decoded = (string) preg_replace_callback(
             ',%[a-f0-9]{2},',
             fn (array $matches): string => rawurldecode($matches[0]),
-            $value
+            $encoded
         );
 
-        if (1 !== preg_match('//u', $value)) {
-            throw new SyntaxError('The string contains invalid characters.'.$value);
+        if (1 !== preg_match('//u', $decoded)) {
+            throw new SyntaxError('The display string '.$encoded.' contains invalid characters.');
         }
 
-        return new self($value);
+        return new self($decoded);
     }
 
     /**
      * Returns a new instance from a raw decoded string.
      */
-    public static function fromDecoded(Stringable|string $value): self
+    public static function fromDecoded(Stringable|string $decoded): self
     {
-        return new self((string) $value);
+        return new self((string) $decoded);
     }
 
     /**

src/Token.php

@@ -5,7 +5,6 @@
 namespace Bakame\Http\StructuredFields;
 
 use Stringable;
-
 use Throwable;
 
 use function preg_match;
@@ -18,7 +17,7 @@ final class Token
     private function __construct(private readonly string $value)
     {
         if (1 !== preg_match("/^([a-z*][a-z\d:\/!#\$%&'*+\-.^_`|~]*)$/i", $this->value)) {
-            throw new SyntaxError('Invalid characters in token.');
+            throw new SyntaxError('The token '.$this->value.' contains invalid characters.');
         }
     }