Merge branch '4.x' into upstream-master

vimeo · Jan 6, 2022 · 3fb3db3 · 3fb3db3
2 parents f3bc55e + 513b263
commit 3fb3db3
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php b/src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php
@@ -3558,7 +3558,7 @@ private static function getInarrayAssertions(
                         // - The array may have one of the types but not the others.
                         //
                         // NOTE: the negation of the negation is the original assertion.
-                        if ($value_type->getId() !== '' && !$value_type->isMixed()) {
+                        if ($value_type->getId() !== '' && !$value_type->isMixed() && !$value_type->hasTemplate()) {
                             $assertions[] = 'in-array-' . $value_type->getId();
                         }
                     } else {

diff --git a/stubs/Reflection.phpstub b/stubs/Reflection.phpstub
@@ -103,7 +103,7 @@ class ReflectionMethod implements Reflector
     public function isStatic(): bool {}
 }
 
-class ReflectionClassConstant
+class ReflectionClassConstant implements Reflector
 {
     /**
      * @since 8.0
@@ -117,7 +117,7 @@ class ReflectionClassConstant
 /**
  * @psalm-immutable
  */
-class ReflectionParameter {
+class ReflectionParameter implements Reflector {
     /**
      * @psalm-assert-if-true ReflectionType $this->getType()
      */

diff --git a/tests/AssertAnnotationTest.php b/tests/AssertAnnotationTest.php
@@ -1898,6 +1898,29 @@ function assertBarNotNull(Foo $foo): bool
                     function requiresString(string $_str): void {}
                 ',
             ],
+            'assertInArrayWithTemplateDontCrash' => [
+                '<?php
+                    class A{
+                        /**
+                         * @template T
+                         * @param array<T> $objects
+                         * @return array<T>
+                         */
+                        private function uniquateObjects(array $objects) : array
+                        {
+                            $uniqueObjects = [];
+                            foreach ($objects as $object) {
+                                if (in_array($object, $uniqueObjects, true)) {
+                                    continue;
+                                }
+                                $uniqueObjects[] = $object;
+                            }
+
+                            return $uniqueObjects;
+                        }
+                    }
+                ',
+            ],
             'assertionOnMagicProperty' => [
                 '<?php
                     /**