Merge pull request #10190 from boesing/feature/array-object-array-key

vimeo · Sep 10, 2023 · ea1664f · ea1664f
2 parents 5b54bd8 + 7f8ec79
commit ea1664f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/stubs/CoreGenericClasses.phpstub b/stubs/CoreGenericClasses.phpstub
@@ -125,7 +125,7 @@ interface ArrayAccess {
  * This class allows objects to work as arrays.
  * @link http://php.net/manual/en/class.arrayobject.php
  *
- * @template TKey
+ * @template TKey of array-key
  * @template TValue
  * @template-implements IteratorAggregate<TKey, TValue>
  * @template-implements ArrayAccess<TKey, TValue>

diff --git a/tests/ArrayAssignmentTest.php b/tests/ArrayAssignmentTest.php
@@ -1297,7 +1297,6 @@ function foo(ArrayObject $a) : array {
 
                         /**
                          * @psalm-suppress MixedAssignment
-                         * @psalm-suppress MixedArrayOffset
                          */
                         foreach ($a as $k => $v) {
                             $arr[$k] = $v;

diff --git a/tests/ClassTest.php b/tests/ClassTest.php
@@ -640,7 +640,7 @@ function intersect(A $a) {
                 'code' => '<?php
 
                     /**
-                     * @template TTKey
+                     * @template TTKey of array-key
                      * @template TTValue
                      *
                      * @extends ArrayObject<TTKey, TTValue>
@@ -675,7 +675,7 @@ class b extends a {
             'preventDoubleStaticResolution2' => [
                 'code' => '<?php
                     /**
-                     * @template TTKey
+                     * @template TTKey of array-key
                      * @template TTValue
                      *
                      * @extends ArrayObject<TTKey, TTValue>
@@ -712,7 +712,7 @@ public function ret(): iter {
             'preventDoubleStaticResolution3' => [
                 'code' => '<?php
                     /**
-                     * @template TTKey
+                     * @template TTKey of array-key
                      * @template TTValue
                      *
                      * @extends ArrayObject<TTKey, TTValue>

diff --git a/tests/Template/ClassTemplateExtendsTest.php b/tests/Template/ClassTemplateExtendsTest.php
@@ -1390,7 +1390,7 @@ class A {}',
             'extendArrayObjectWithTemplateParams' => [
                 'code' => '<?php
                     /**
-                     * @template TKey
+                     * @template TKey of array-key
                      * @template TValue
                      * @template-extends \ArrayObject<TKey,TValue>
                      */