Prevent more offset issues

vimeo · Mar 23, 2021 · 15b0542 · 15b0542
1 parent bf578d1
commit 15b0542
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 13 deletions.
diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -11,7 +11,7 @@
     throwExceptionOnError="0"
     findUnusedCode="true"
     ensureArrayStringOffsetsExist="true"
-    ensureArrayIntOffsetsExist="false"
+    ensureArrayIntOffsetsExist="true"
     resolveFromConfigFile="true"
     xsi:schemaLocation="https://getpsalm.org/schema/config config.xsd"
     limitMethodComplexity="true"

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/ArrayAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/ArrayAnalyzer.php
@@ -478,7 +478,9 @@ private static function handleUnpackedArray(
                     || (
                         $unpacked_atomic_type instanceof Type\Atomic\TGenericObject
                         && $unpacked_atomic_type->hasTraversableInterface($codebase)
+                        && \count($unpacked_atomic_type->type_params) === 2
                 )) {
+                    /** @psalm-suppress PossiblyUndefinedArrayOffset provably true, but Psalm can’t see it */
                     if ($unpacked_atomic_type->type_params[1]->isEmpty()) {
                         continue;
                     }

diff --git a/src/Psalm/Plugin/EventHandler/Event/MethodParamsProviderEvent.php b/src/Psalm/Plugin/EventHandler/Event/MethodParamsProviderEvent.php
@@ -19,7 +19,7 @@ class MethodParamsProviderEvent
      */
     private $method_name_lowercase;
     /**
-     * @var PhpParser\Node\Arg[]|null
+     * @var list<PhpParser\Node\Arg>|null
      */
     private $call_args;
     /**
@@ -65,7 +65,7 @@ public function getMethodNameLowercase(): string
     }
 
     /**
-     * @return PhpParser\Node\Arg[]|null
+     * @return list<PhpParser\Node\Arg>|null
      */
     public function getCallArgs(): ?array
     {

diff --git a/src/Psalm/Plugin/EventHandler/Event/MethodReturnTypeProviderEvent.php b/src/Psalm/Plugin/EventHandler/Event/MethodReturnTypeProviderEvent.php
@@ -24,7 +24,7 @@ class MethodReturnTypeProviderEvent
      */
     private $method_name_lowercase;
     /**
-     * @var PhpParser\Node\Arg[]
+     * @var list<PhpParser\Node\Arg>
      */
     private $call_args;
     /**
@@ -99,7 +99,7 @@ public function getMethodNameLowercase(): string
     }
 
     /**
-     * @return PhpParser\Node\Arg[]
+     * @return list<PhpParser\Node\Arg>
      */
     public function getCallArgs(): array
     {

diff --git a/src/Psalm/Storage/FunctionLikeStorage.php b/src/Psalm/Storage/FunctionLikeStorage.php
@@ -22,7 +22,7 @@ abstract class FunctionLikeStorage
     public $stmt_location;
 
     /**
-     * @var array<int, FunctionLikeParameter>
+     * @var list<FunctionLikeParameter>
      */
     public $params = [];
 

diff --git a/src/Psalm/Type/Atomic/CallableTrait.php b/src/Psalm/Type/Atomic/CallableTrait.php
@@ -16,7 +16,7 @@
 trait CallableTrait
 {
     /**
-     * @var array<int, FunctionLikeParameter>|null
+     * @var list<FunctionLikeParameter>|null
      */
     public $params = [];
 
@@ -33,7 +33,7 @@ trait CallableTrait
     /**
      * Constructs a new instance of a generic type
      *
-     * @param array<int, FunctionLikeParameter> $params
+     * @param list<FunctionLikeParameter> $params
      */
     public function __construct(
         string $value = 'callable',

diff --git a/src/Psalm/Type/Atomic/GenericTrait.php b/src/Psalm/Type/Atomic/GenericTrait.php
@@ -15,11 +15,6 @@
 
 trait GenericTrait
 {
-    /**
-     * @var non-empty-list<Union>
-     */
-    public $type_params;
-
     public function __toString(): string
     {
         $s = '';

diff --git a/src/Psalm/Type/Atomic/TArray.php b/src/Psalm/Type/Atomic/TArray.php
@@ -12,6 +12,11 @@ class TArray extends \Psalm\Type\Atomic
 {
     use GenericTrait;
 
+    /**
+     * @var array{\Psalm\Type\Union, \Psalm\Type\Union}
+     */
+    public $type_params;
+
     /**
      * @var string
      */

diff --git a/src/Psalm/Type/Atomic/TGenericObject.php b/src/Psalm/Type/Atomic/TGenericObject.php
@@ -14,6 +14,11 @@ class TGenericObject extends TNamedObject
 {
     use GenericTrait;
 
+    /**
+     * @var non-empty-list<\Psalm\Type\Union>
+     */
+    public $type_params;
+
     /** @var bool if the parameters have been remapped to another class */
     public $remapped_params = false;