Merge pull request #8670 from danog/fix_8669

Fix #8669
vimeo · Nov 5, 2022 · 205e8cc · 205e8cc
2 parents 2ae819e + 923f1d2
commit 205e8cc
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Type/AssertionReconciler.php b/src/Psalm/Internal/Type/AssertionReconciler.php
@@ -601,7 +601,7 @@ private static function filterAtomicWithAnother(
             $codebase,
             $type_1_atomic,
             $type_2_atomic,
-            !($type_1_atomic instanceof TNamedObject && $type_2_atomic instanceof TNamedObject),
+            $type_1_atomic instanceof TClassString && $type_2_atomic instanceof TClassString,
             false,
             $atomic_comparison_results
         );

diff --git a/tests/TypeReconciliation/TypeTest.php b/tests/TypeReconciliation/TypeTest.php
@@ -19,6 +19,31 @@ class TypeTest extends TestCase
     public function providerValidCodeParse(): iterable
     {
         return [
+            'instanceOfInterface' => [
+                'code' => '<?php
+                    interface Supplier {
+                        public function get(): iterable;
+                    }
+
+                    class SomeClass {
+                        protected Supplier|iterable $prop;
+
+                        public function __construct(Supplier|iterable $value) {
+                            $this->prop = $value;
+                        }
+
+                        public function do(): void {
+                            $var = $this->prop;
+
+                            if ($var instanceof Supplier) {
+                                $var->get();
+                            }
+                        }
+                    }',
+                'assertions' => [],
+                'ignored_issues' => [],
+                'php_version' => '8.0'
+            ],
             'nullableMethodWithTernaryGuard' => [
                 'code' => '<?php
                     class A {