Merge branch 'develop'

* develop: add a template to specify the type of header values
Innmind · Feb 15, 2020 · 5a7b973 · 5a7b973
2 parents 1615b96 + 0caa376
commit 5a7b973
Show file tree

Hide file tree

Showing 30 changed files with 92 additions and 4 deletions.
diff --git a/src/Header.php b/src/Header.php
@@ -5,12 +5,15 @@
 
 use Innmind\Immutable\Set;
 
+/**
+ * @template V of Header\Value
+ */
 interface Header
 {
     public function name(): string;
 
     /**
-     * @return Set<Header\Value>
+     * @return Set<V>
      */
     public function values(): Set;
     public function toString(): string;

diff --git a/src/Header/Accept.php b/src/Header/Accept.php
@@ -3,6 +3,9 @@
 
 namespace Innmind\Http\Header;
 
+/**
+ * @extends Header<AcceptValue>
+ */
 final class Accept extends Header
 {
     public function __construct(AcceptValue $first, AcceptValue ...$values)

diff --git a/src/Header/AcceptCharset.php b/src/Header/AcceptCharset.php
@@ -3,6 +3,9 @@
 
 namespace Innmind\Http\Header;
 
+/**
+ * @extends Header<AcceptCharsetValue>
+ */
 final class AcceptCharset extends Header
 {
     public function __construct(AcceptCharsetValue ...$values)

diff --git a/src/Header/AcceptEncoding.php b/src/Header/AcceptEncoding.php
@@ -3,6 +3,9 @@
 
 namespace Innmind\Http\Header;
 
+/**
+ * @extends Header<AcceptEncodingValue>
+ */
 final class AcceptEncoding extends Header
 {
     public function __construct(AcceptEncodingValue ...$values)

diff --git a/src/Header/AcceptLanguage.php b/src/Header/AcceptLanguage.php
@@ -3,6 +3,9 @@
 
 namespace Innmind\Http\Header;
 
+/**
+ * @extends Header<AcceptLanguageValue>
+ */
 final class AcceptLanguage extends Header
 {
     public function __construct(AcceptLanguageValue ...$values)

diff --git a/src/Header/AcceptRanges.php b/src/Header/AcceptRanges.php
@@ -3,6 +3,9 @@
 
 namespace Innmind\Http\Header;
 
+/**
+ * @extends Header<AcceptRangesValue>
+ */
 final class AcceptRanges extends Header
 {
     public function __construct(AcceptRangesValue $ranges)

diff --git a/src/Header/Age.php b/src/Header/Age.php
@@ -3,6 +3,9 @@
 
 namespace Innmind\Http\Header;
 
+/**
+ * @extends Header<AgeValue>
+ */
 final class Age extends Header
 {
     public function __construct(AgeValue $age)

diff --git a/src/Header/Allow.php b/src/Header/Allow.php
@@ -3,6 +3,9 @@
 
 namespace Innmind\Http\Header;
 
+/**
+ * @extends Header<AllowValue>
+ */
 final class Allow extends Header
 {
     public function __construct(AllowValue ...$values)

diff --git a/src/Header/Authorization.php b/src/Header/Authorization.php
@@ -3,6 +3,9 @@
 
 namespace Innmind\Http\Header;
 
+/**
+ * @extends Header<AuthorizationValue>
+ */
 final class Authorization extends Header
 {
     public function __construct(AuthorizationValue $authorization)

diff --git a/src/Header/CacheControl.php b/src/Header/CacheControl.php
@@ -3,6 +3,9 @@
 
 namespace Innmind\Http\Header;
 
+/**
+ * @extends Header<CacheControlValue>
+ */
 final class CacheControl extends Header
 {
     public function __construct(CacheControlValue $first, CacheControlValue ...$values)

diff --git a/src/Header/ContentEncoding.php b/src/Header/ContentEncoding.php
@@ -3,6 +3,9 @@
 
 namespace Innmind\Http\Header;
 
+/**
+ * @extends Header<ContentEncodingValue>
+ */
 final class ContentEncoding extends Header
 {
     public function __construct(ContentEncodingValue $encoding)

diff --git a/src/Header/ContentLanguage.php b/src/Header/ContentLanguage.php
@@ -3,6 +3,9 @@
 
 namespace Innmind\Http\Header;
 
+/**
+ * @extends Header<ContentLanguageValue>
+ */
 final class ContentLanguage extends Header
 {
     public function __construct(ContentLanguageValue ...$values)

diff --git a/src/Header/ContentLength.php b/src/Header/ContentLength.php
@@ -3,6 +3,9 @@
 
 namespace Innmind\Http\Header;
 
+/**
+ * @extends Header<ContentLengthValue>
+ */
 final class ContentLength extends Header
 {
     public function __construct(ContentLengthValue $length)

diff --git a/src/Header/ContentLocation.php b/src/Header/ContentLocation.php
@@ -5,6 +5,9 @@
 
 use Innmind\Url\Url;
 
+/**
+ * @extends Header<LocationValue>
+ */
 final class ContentLocation extends Header
 {
     public function __construct(LocationValue $location)

diff --git a/src/Header/ContentRange.php b/src/Header/ContentRange.php
@@ -3,6 +3,9 @@
 
 namespace Innmind\Http\Header;
 
+/**
+ * @extends Header<ContentRangeValue>
+ */
 final class ContentRange extends Header
 {
     public function __construct(ContentRangeValue $range)

diff --git a/src/Header/ContentType.php b/src/Header/ContentType.php
@@ -3,6 +3,9 @@
 
 namespace Innmind\Http\Header;
 
+/**
+ * @extends Header<ContentTypeValue>
+ */
 final class ContentType extends Header
 {
     public function __construct(ContentTypeValue $content)

diff --git a/src/Header/Cookie.php b/src/Header/Cookie.php
@@ -3,6 +3,9 @@
 
 namespace Innmind\Http\Header;
 
+/**
+ * @extends Header<CookieValue>
+ */
 final class Cookie extends Header
 {
     public function __construct(CookieValue $value)

diff --git a/src/Header/Date.php b/src/Header/Date.php
@@ -5,6 +5,9 @@
 
 use Innmind\TimeContinuum\PointInTime;
 
+/**
+ * @extends Header<DateValue>
+ */
 final class Date extends Header
 {
     public function __construct(DateValue $date)

diff --git a/src/Header/Expires.php b/src/Header/Expires.php
@@ -5,6 +5,9 @@
 
 use Innmind\TimeContinuum\PointInTime;
 
+/**
+ * @extends Header<DateValue>
+ */
 final class Expires extends Header
 {
     public function __construct(DateValue $date)

diff --git a/src/Header/Header.php b/src/Header/Header.php
@@ -7,6 +7,10 @@
 use Innmind\Immutable\Set;
 use function Innmind\Immutable\join;
 
+/**
+ * @template V of Value
+ * @implements HeaderInterface<V>
+ */
 class Header implements HeaderInterface
 {
     private string $name;
@@ -25,9 +29,6 @@ public function name(): string
         return $this->name;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function values(): Set
     {
         return $this->values;

diff --git a/src/Header/Host.php b/src/Header/Host.php
@@ -8,6 +8,9 @@
     Port,
 };
 
+/**
+ * @extends Header<HostValue>
+ */
 final class Host extends Header
 {
     public function __construct(HostValue $host)

diff --git a/src/Header/IfModifiedSince.php b/src/Header/IfModifiedSince.php
@@ -5,6 +5,9 @@
 
 use Innmind\TimeContinuum\PointInTime;
 
+/**
+ * @extends Header<DateValue>
+ */
 final class IfModifiedSince extends Header
 {
     public function __construct(DateValue $date)

diff --git a/src/Header/IfUnmodifiedSince.php b/src/Header/IfUnmodifiedSince.php
@@ -5,6 +5,9 @@
 
 use Innmind\TimeContinuum\PointInTime;
 
+/**
+ * @extends Header<DateValue>
+ */
 final class IfUnmodifiedSince extends Header
 {
     public function __construct(DateValue $date)

diff --git a/src/Header/LastModified.php b/src/Header/LastModified.php
@@ -5,6 +5,9 @@
 
 use Innmind\TimeContinuum\PointInTime;
 
+/**
+ * @extends Header<DateValue>
+ */
 final class LastModified extends Header
 {
     public function __construct(DateValue $date)

diff --git a/src/Header/Link.php b/src/Header/Link.php
@@ -3,6 +3,9 @@
 
 namespace Innmind\Http\Header;
 
+/**
+ * @extends Header<LinkValue>
+ */
 final class Link extends Header
 {
     public function __construct(LinkValue ...$values)

diff --git a/src/Header/Location.php b/src/Header/Location.php
@@ -5,6 +5,9 @@
 
 use Innmind\Url\Url;
 
+/**
+ * @extends Header<LocationValue>
+ */
 final class Location extends Header
 {
     public function __construct(LocationValue $location)

diff --git a/src/Header/Range.php b/src/Header/Range.php
@@ -3,6 +3,9 @@
 
 namespace Innmind\Http\Header;
 
+/**
+ * @extends Header<RangeValue>
+ */
 final class Range extends Header
 {
     public function __construct(RangeValue $range)

diff --git a/src/Header/Referrer.php b/src/Header/Referrer.php
@@ -5,6 +5,9 @@
 
 use Innmind\Url\Url;
 
+/**
+ * @extends Header<ReferrerValue>
+ */
 final class Referrer extends Header
 {
     public function __construct(ReferrerValue $referrer)

diff --git a/src/Header/SetCookie.php b/src/Header/SetCookie.php
@@ -3,6 +3,9 @@
 
 namespace Innmind\Http\Header;
 
+/**
+ * @extends Header<CookieValue>
+ */
 final class SetCookie extends Header
 {
     public function __construct(CookieValue ...$values)

diff --git a/src/Header/WWWAuthenticate.php b/src/Header/WWWAuthenticate.php
@@ -3,6 +3,9 @@
 
 namespace Innmind\Http\Header;
 
+/**
+ * @extends Header<WWWAuthenticateValue>
+ */
 final class WWWAuthenticate extends Header
 {
     public function __construct(WWWAuthenticateValue ...$values)