add access to normalized header values

Innmind · Feb 17, 2023 · 287159d · 287159d
1 parent af9e58c
commit 287159d
Show file tree

Hide file tree

Showing 35 changed files with 201 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,31 @@
 # Changelog
 
+## 6.1.0 - 2023-02-17
+
+### Added
+
+- `Innmind\Http\Header\Age::age()`
+- `Innmind\Http\Header\AgeValue::age()`
+- `Innmind\Http\Header\Authorization::scheme()`
+- `Innmind\Http\Header\Authorization::parameter()`
+- `Innmind\Http\Header\ContentLength::length()`
+- `Innmind\Http\Header\ContentLengthValue::length()`
+- `Innmind\Http\Header\ContentLocation::url()`
+- `Innmind\Http\Header\ContentRange::range()`
+- `Innmind\Http\Header\ContentType::content()`
+- `Innmind\Http\Header\Cookie::parameters()`
+- `Innmind\Http\Header\Date::date()`
+- `Innmind\Http\Header\DateValue::date()`
+- `Innmind\Http\Header\Expires::date()`
+- `Innmind\Http\Header\Host::host()`
+- `Innmind\Http\Header\Host::port()`
+- `Innmind\Http\Header\IfModifiedSince::date()`
+- `Innmind\Http\Header\IfUnmodifiedSince::date()`
+- `Innmind\Http\Header\LastModified::date()`
+- `Innmind\Http\Header\Range::range()`
+- `Innmind\Http\Header\Referrer::referrer()`
+- `Innmind\Http\Header\ReferrerValue::url()`
+
 ## 6.0.1 - 2023-02-12
 
 ### Fixed

diff --git a/src/Header/Age.php b/src/Header/Age.php
@@ -12,10 +12,12 @@
 final class Age implements HeaderInterface
 {
     private Header $header;
+    private AgeValue $value;
 
     public function __construct(AgeValue $age)
     {
         $this->header = new Header('Age', $age);
+        $this->value = $age;
     }
 
     /**
@@ -36,6 +38,14 @@ public function values(): Set
         return $this->header->values();
     }
 
+    /**
+     * @return 0|positive-int
+     */
+    public function age(): int
+    {
+        return $this->value->age();
+    }
+
     public function toString(): string
     {
         return $this->header->toString();

diff --git a/src/Header/AgeValue.php b/src/Header/AgeValue.php
@@ -11,6 +11,7 @@
  */
 final class AgeValue implements Value
 {
+    /** @var 0|positive-int */
     private int $age;
 
     public function __construct(int $age)
@@ -19,6 +20,7 @@ public function __construct(int $age)
             throw new DomainException((string) $age);
         }
 
+        /** @var 0|positive-int */
         $this->age = $age;
     }
 
@@ -37,6 +39,14 @@ public static function of(int $age): Maybe
         }
     }
 
+    /**
+     * @return 0|positive-int
+     */
+    public function age(): int
+    {
+        return $this->age;
+    }
+
     public function toString(): string
     {
         return (string) $this->age;

diff --git a/src/Header/Authorization.php b/src/Header/Authorization.php
@@ -12,10 +12,12 @@
 final class Authorization implements HeaderInterface
 {
     private Header $header;
+    private AuthorizationValue $value;
 
     public function __construct(AuthorizationValue $authorization)
     {
         $this->header = new Header('Authorization', $authorization);
+        $this->value = $authorization;
     }
 
     /**
@@ -36,6 +38,16 @@ public function values(): Set
         return $this->header->values();
     }
 
+    public function scheme(): string
+    {
+        return $this->value->scheme();
+    }
+
+    public function parameter(): string
+    {
+        return $this->value->parameter();
+    }
+
     public function toString(): string
     {
         return $this->header->toString();

diff --git a/src/Header/ContentLength.php b/src/Header/ContentLength.php
@@ -12,10 +12,12 @@
 final class ContentLength implements HeaderInterface
 {
     private Header $header;
+    private ContentLengthValue $value;
 
     public function __construct(ContentLengthValue $length)
     {
         $this->header = new Header('Content-Length', $length);
+        $this->value = $length;
     }
 
     /**
@@ -36,6 +38,14 @@ public function values(): Set
         return $this->header->values();
     }
 
+    /**
+     * @return 0|positive-int
+     */
+    public function length(): int
+    {
+        return $this->value->length();
+    }
+
     public function toString(): string
     {
         return $this->header->toString();

diff --git a/src/Header/ContentLengthValue.php b/src/Header/ContentLengthValue.php
@@ -11,6 +11,7 @@
  */
 final class ContentLengthValue implements Value
 {
+    /** @var 0|positive-int */
     private int $length;
 
     public function __construct(int $length)
@@ -19,6 +20,7 @@ public function __construct(int $length)
             throw new DomainException((string) $length);
         }
 
+        /** @var 0|positive-int */
         $this->length = $length;
     }
 
@@ -37,6 +39,14 @@ public static function of(int $length): Maybe
         }
     }
 
+    /**
+     * @return 0|positive-int
+     */
+    public function length(): int
+    {
+        return $this->length;
+    }
+
     public function toString(): string
     {
         return (string) $this->length;

diff --git a/src/Header/ContentLocation.php b/src/Header/ContentLocation.php
@@ -13,10 +13,12 @@
 final class ContentLocation implements HeaderInterface
 {
     private Header $header;
+    private LocationValue $value;
 
     public function __construct(LocationValue $location)
     {
         $this->header = new Header('Content-Location', $location);
+        $this->value = $location;
     }
 
     /**
@@ -37,6 +39,11 @@ public function values(): Set
         return $this->header->values();
     }
 
+    public function url(): Url
+    {
+        return $this->value->url();
+    }
+
     public function toString(): string
     {
         return $this->header->toString();

diff --git a/src/Header/ContentRange.php b/src/Header/ContentRange.php
@@ -12,10 +12,12 @@
 final class ContentRange implements HeaderInterface
 {
     private Header $header;
+    private ContentRangeValue $range;
 
     public function __construct(ContentRangeValue $range)
     {
         $this->header = new Header('Content-Range', $range);
+        $this->range = $range;
     }
 
     /**
@@ -45,6 +47,11 @@ public function values(): Set
         return $this->header->values();
     }
 
+    public function range(): ContentRangeValue
+    {
+        return $this->range;
+    }
+
     public function toString(): string
     {
         return $this->header->toString();

diff --git a/src/Header/ContentType.php b/src/Header/ContentType.php
@@ -12,10 +12,12 @@
 final class ContentType implements HeaderInterface
 {
     private Header $header;
+    private ContentTypeValue $content;
 
     public function __construct(ContentTypeValue $content)
     {
         $this->header = new Header('Content-Type', $content);
+        $this->content = $content;
     }
 
     /**
@@ -43,6 +45,11 @@ public function values(): Set
         return $this->header->values();
     }
 
+    public function content(): ContentTypeValue
+    {
+        return $this->content;
+    }
+
     public function toString(): string
     {
         return $this->header->toString();

diff --git a/src/Header/Cookie.php b/src/Header/Cookie.php
@@ -4,18 +4,23 @@
 namespace Innmind\Http\Header;
 
 use Innmind\Http\Header as HeaderInterface;
-use Innmind\Immutable\Set;
+use Innmind\Immutable\{
+    Set,
+    Map,
+};
 
 /**
  * @psalm-immutable
  */
 final class Cookie implements HeaderInterface
 {
     private Header $header;
+    private CookieValue $value;
 
     public function __construct(CookieValue $value)
     {
         $this->header = new Header('Cookie', $value);
+        $this->value = $value;
     }
 
     /**
@@ -37,6 +42,14 @@ public function values(): Set
         return $this->header->values();
     }
 
+    /**
+     * @return Map<string, Parameter>
+     */
+    public function parameters(): Map
+    {
+        return $this->value->parameters();
+    }
+
     public function toString(): string
     {
         return $this->header->toString();

diff --git a/src/Header/Date.php b/src/Header/Date.php
@@ -13,10 +13,12 @@
 final class Date implements HeaderInterface
 {
     private Header $header;
+    private DateValue $value;
 
     public function __construct(DateValue $date)
     {
         $this->header = new Header('Date', $date);
+        $this->value = $date;
     }
 
     /**
@@ -37,6 +39,11 @@ public function values(): Set
         return $this->header->values();
     }
 
+    public function date(): PointInTime
+    {
+        return $this->value->date();
+    }
+
     public function toString(): string
     {
         return $this->header->toString();

diff --git a/src/Header/DateValue.php b/src/Header/DateValue.php
@@ -21,6 +21,11 @@ public function __construct(PointInTime $date)
         $this->date = $date;
     }
 
+    public function date(): PointInTime
+    {
+        return $this->date;
+    }
+
     public function toString(): string
     {
         return $this->date->changeTimezone(new UTC)->format(new Http);

diff --git a/src/Header/Expires.php b/src/Header/Expires.php
@@ -13,10 +13,12 @@
 final class Expires implements HeaderInterface
 {
     private Header $header;
+    private DateValue $value;
 
     public function __construct(DateValue $date)
     {
         $this->header = new Header('Expires', $date);
+        $this->value = $date;
     }
 
     /**
@@ -37,6 +39,11 @@ public function values(): Set
         return $this->header->values();
     }
 
+    public function date(): PointInTime
+    {
+        return $this->value->date();
+    }
+
     public function toString(): string
     {
         return $this->header->toString();

diff --git a/src/Header/Host.php b/src/Header/Host.php
@@ -16,10 +16,12 @@
 final class Host implements HeaderInterface
 {
     private Header $header;
+    private HostValue $value;
 
     public function __construct(HostValue $host)
     {
         $this->header = new Header('Host', $host);
+        $this->value = $host;
     }
 
     /**
@@ -40,6 +42,16 @@ public function values(): Set
         return $this->header->values();
     }
 
+    public function host(): UrlHost
+    {
+        return $this->value->host();
+    }
+
+    public function port(): Port
+    {
+        return $this->value->port();
+    }
+
     public function toString(): string
     {
         return $this->header->toString();