Fix a couple psalm errors

amphp · Jan 14, 2024 · add726f · add726f
1 parent 6c63063
commit add726f
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 21 deletions.
diff --git a/src/StructuredFields/Boolean.php b/src/StructuredFields/Boolean.php
@@ -4,8 +4,7 @@
 
 /**
  * @psalm-import-type Rfc8941Parameters from \Amp\Http\StructuredFields\Rfc8941
- * @property-read bool $item
- * @template-extends Item<void>
+ * @template-extends Item<bool>
  */
 class Boolean extends Item
 {

diff --git a/src/StructuredFields/Bytes.php b/src/StructuredFields/Bytes.php
@@ -4,8 +4,7 @@
 
 /**
  * @psalm-import-type Rfc8941Parameters from \Amp\Http\StructuredFields\Rfc8941
- * @property-read string $item
- * @template-extends Item<void>
+ * @template-extends Item<string>
  */
 class Bytes extends Item
 {

diff --git a/src/StructuredFields/Date.php b/src/StructuredFields/Date.php
@@ -4,8 +4,7 @@
 
 /**
  * @psalm-import-type Rfc8941Parameters from \Amp\Http\StructuredFields\Rfc8941
- * @property-read int $item
- * @template-extends Item<void>
+ * @template-extends Item<int>
  */
 class Date extends Item
 {

diff --git a/src/StructuredFields/DisplayString.php b/src/StructuredFields/DisplayString.php
@@ -4,8 +4,7 @@
 
 /**
  * @psalm-import-type Rfc8941Parameters from \Amp\Http\StructuredFields\Rfc8941
- * @property-read string $item
- * @template-extends Item<void>
+ * @template-extends Item<string>
  */
 class DisplayString extends Item
 {

diff --git a/src/StructuredFields/InnerList.php b/src/StructuredFields/InnerList.php
@@ -4,13 +4,13 @@
 
 /**
  * @psalm-import-type Rfc8941Parameters from \Amp\Http\StructuredFields\Rfc8941
- * @property-read list<Item<void>> $item
- * @template-extends Item<list<Item<void>>>
+ * @psalm-import-type Rfc8941BareItem from \Amp\Http\StructuredFields\Rfc8941
+ * @template-extends Item<list<Item<Rfc8941BareItem>>>
  */
 class InnerList extends Item
 {
     /**
-     * @psalm-param list<Item<void>> $item
+     * @psalm-param list<Item<Rfc8941BareItem>> $item
      * @psalm-param Rfc8941Parameters $parameters
      */
     public function __construct(array $item, array $parameters)

diff --git a/src/StructuredFields/Item.php b/src/StructuredFields/Item.php
@@ -3,13 +3,13 @@
 namespace Amp\Http\StructuredFields;
 
 /**
- * @psalm-template Inner
+ * @template-covariant Inner
  * @psalm-import-type Rfc8941Parameters from \Amp\Http\StructuredFields\Rfc8941
  */
 class Item
 {
     /**
-     * @psalm-param int|float|string|bool|Inner $item
+     * @psalm-param Inner $item
      * @psalm-param Rfc8941Parameters $parameters
      */
     protected function __construct(public readonly int|float|string|bool|array $item, public readonly array $parameters)

diff --git a/src/StructuredFields/Number.php b/src/StructuredFields/Number.php
@@ -4,8 +4,7 @@
 
 /**
  * @psalm-import-type Rfc8941Parameters from \Amp\Http\StructuredFields\Rfc8941
- * @property-read int|float $item
- * @template-extends Item<void>
+ * @template-extends Item<int|float>
  */
 class Number extends Item
 {

diff --git a/src/StructuredFields/Rfc8941.php b/src/StructuredFields/Rfc8941.php
@@ -4,7 +4,7 @@
 
 // Including support for the extension for RFC 8941, see https://datatracker.ietf.org/doc/draft-ietf-httpbis-sfbis
 /**
- * @psalm-type Rfc8941SingleItem = Item<void>
+ * @psalm-type Rfc8941SingleItem = Item<Rfc8941BareItem>
  * @psalm-type Rfc8941ListItem = InnerList|Rfc8941SingleItem
  * @psalm-type Rfc8941BareItem = int|float|string|bool
  * @psalm-type Rfc8941Parameters = array<string, Rfc8941BareItem>
@@ -27,9 +27,11 @@ public static function parseList(array|string $value): ?array
 
         $list = [];
         while (true) {
-            if (null === $list[] = self::parseItemOrInnerList($string, $i)) {
+            $item = self::parseItemOrInnerList($string, $i);
+            if (null === $item) {
                 return null;
             }
+            $list[] = $item;
             $i += \strspn($string, " \t", $i);
             if ($i >= $len) {
                 return $list;

diff --git a/src/StructuredFields/Str.php b/src/StructuredFields/Str.php
@@ -4,8 +4,7 @@
 
 /**
  * @psalm-import-type Rfc8941Parameters from \Amp\Http\StructuredFields\Rfc8941
- * @property-read string $item
- * @template-extends Item<void>
+ * @template-extends Item<string>
  */
 class Str extends Item
 {

diff --git a/src/StructuredFields/Token.php b/src/StructuredFields/Token.php
@@ -4,8 +4,7 @@
 
 /**
  * @psalm-import-type Rfc8941Parameters from \Amp\Http\StructuredFields\Rfc8941
- * @property-read string $item
- * @template-extends Item<void>
+ * @template-extends Item<string>
  */
 class Token extends Item
 {