Fixed object comparison that aims to improve nested template analysis (…

…vimeo#8112).
emmanuelGuiton · Dec 22, 2022 · 164e279 · 164e279
1 parent b138107
commit 164e279
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Psalm/Internal/Type/Comparator/ObjectComparator.php b/src/Psalm/Internal/Type/Comparator/ObjectComparator.php
@@ -36,6 +36,9 @@ public static function isShallowlyContainedBy(
     ): bool {
         if ($container_type_part instanceof TTemplateParam
             && $input_type_part instanceof TTemplateParam
+            && $container_type_part->defining_class != $input_type_part->defining_class
+            && strpos($container_type_part->defining_class, 'fn-') !== 0
+            && strpos($input_type_part->defining_class, 'fn-') !== 0
             && 1 == count($container_type_part->as->getAtomicTypes())
             && 1 == count($input_type_part->as->getAtomicTypes())) {
             $containerAs = current($container_type_part->as->getAtomicTypes());

diff --git a/tests/Template/ClassTemplateExtendsTest.php b/tests/Template/ClassTemplateExtendsTest.php
@@ -1635,9 +1635,6 @@ public function __construct(array $elements = [])
 
                         public function getIterator()
                         {
-                            /**
-                             * @psalm-suppress InvalidReturnStatement
-                             */
                             return new ArrayIterator($this->elements);
                         }