Merge 33cb9bc into 65428ce

webonyx · Mar 25, 2021 · f219d10 · f219d10
2 parents 65428ce + 33cb9bc
commit f219d10
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/src/Language/AST/Node.php b/src/Language/AST/Node.php
@@ -95,7 +95,7 @@ public function __toString() : string
     }
 
     /**
-     * @return mixed[]
+     * @return array<string, mixed>
      */
     public function toArray(bool $recursive = false) : array
     {

diff --git a/src/Language/AST/NodeList.php b/src/Language/AST/NodeList.php
@@ -23,15 +23,15 @@
 class NodeList implements ArrayAccess, IteratorAggregate, Countable
 {
     /**
-     * @var Node[]
-     * @phpstan-var array<T>
+     * @var array<Node|array>
+     * @phpstan-var array<T|array<string, mixed>>
      */
     private $nodes;
 
     /**
-     * @param Node[] $nodes
+     * @param array<Node|array<string, mixed>> $nodes
      *
-     * @phpstan-param array<T> $nodes
+     * @phpstan-param array<T|array<string, mixed>> $nodes
      * @phpstan-return self<T>
      */
     public static function create(array $nodes) : self
@@ -40,9 +40,9 @@ public static function create(array $nodes) : self
     }
 
     /**
-     * @param Node[] $nodes
+     * @param array<Node|array> $nodes
      *
-     * @phpstan-param array<T> $nodes
+     * @phpstan-param array<T|array<string, mixed>> $nodes
      */
     public function __construct(array $nodes)
     {
@@ -73,20 +73,22 @@ public function offsetGet($offset)// : Node
     {
         $item = $this->nodes[$offset];
 
-        if (is_array($item) && isset($item['kind'])) {
+        if (is_array($item)) {
             /** @phpstan-var T $node */
             $node                 = AST::fromArray($item);
             $this->nodes[$offset] = $node;
+
+            return $node;
         }
 
-        return $this->nodes[$offset];
+        return $item;
     }
 
     /**
-     * @param int|string|null $offset
-     * @param Node|mixed[]    $value
+     * @param int|string|null           $offset
+     * @param Node|array<string, mixed> $value
      *
-     * @phpstan-param T|mixed[] $value
+     * @phpstan-param T|array<string, mixed> $value
      */
     public function offsetSet($offset, $value) : void
     {
@@ -124,7 +126,7 @@ public function splice(int $offset, int $length, $replacement = null) : NodeList
     }
 
     /**
-     * @param NodeList|Node[] $list
+     * @param NodeList|array<Node|array<string, mixed>> $list
      *
      * @phpstan-param NodeList<T>|array<T> $list
      * @phpstan-return NodeList<T>

diff --git a/tests/Language/NodeListTest.php b/tests/Language/NodeListTest.php
@@ -27,6 +27,7 @@ public function testThrowsOnInvalidArrays() : void
         $nodeList = new NodeList([]);
 
         self::expectException(InvariantViolation::class);
+        // @phpstan-ignore-next-line Wrong on purpose
         $nodeList[] = ['not a valid array representation of an AST node'];
     }