From 7dfcefd35d54a830a81b02d1ccdc63887b787d7d Mon Sep 17 00:00:00 2001
From: Matthew Brown <github@muglug.com>
Date: Sat, 19 Jan 2019 23:25:23 -0500
Subject: [PATCH] Support intersections on LHS of static calls

---
 .../Expression/Call/StaticCallAnalyzer.php    | 27 ++++++++++++++++++-
 tests/ClassStringTest.php                     | 12 ++++-----
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticCallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticCallAnalyzer.php
index 2adf9c6b7..a2d594cbe 100644
--- a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticCallAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticCallAnalyzer.php
@@ -257,12 +257,18 @@ class StaticCallAnalyzer extends \Psalm\Internal\Analyzer\Statements\Expression\
         $has_mock = false;
 
         foreach ($lhs_type->getTypes() as $lhs_type_part) {
+            $intersection_types = [];
+
             if ($lhs_type_part instanceof TNamedObject) {
                 $fq_class_name = $lhs_type_part->value;
+
+                $intersection_types = $lhs_type_part->extra_types;
             } elseif ($lhs_type_part instanceof Type\Atomic\TClassString
                 && $lhs_type_part->as_type
             ) {
                 $fq_class_name = $lhs_type_part->as_type->value;
+
+                $intersection_types = $lhs_type_part->as_type->extra_types;
             } elseif ($lhs_type_part instanceof Type\Atomic\TLiteralClassString) {
                 $fq_class_name = $lhs_type_part->value;
             } elseif ($lhs_type_part instanceof Type\Atomic\TGenericParam
@@ -365,6 +371,25 @@ class StaticCallAnalyzer extends \Psalm\Internal\Analyzer\Statements\Expression\
 
                 $args = $stmt->args;
 
+                if ($intersection_types
+                    && !$codebase->methods->methodExists($method_id)
+                ) {
+                    foreach ($intersection_types as $intersection_type) {
+                        if (!$intersection_type instanceof TNamedObject) {
+                            continue;
+                        }
+
+                        $intersection_method_id = $intersection_type->value . '::' . $method_name_lc;
+
+                        if ($codebase->methods->methodExists($intersection_method_id)) {
+                            $method_id = $intersection_method_id;
+                            $fq_class_name = $intersection_type->value;
+                            $cased_method_id = $fq_class_name . '::' . $stmt->name->name;
+                            break;
+                        }
+                    }
+                }
+
                 if (!$codebase->methods->methodExists($method_id)
                     || !MethodAnalyzer::isMethodVisible(
                         $method_id,
@@ -455,7 +480,7 @@ class StaticCallAnalyzer extends \Psalm\Internal\Analyzer\Statements\Expression\
 
                 $does_method_exist = MethodAnalyzer::checkMethodExists(
                     $codebase,
-                    $cased_method_id,
+                    $method_id,
                     new CodeLocation($source, $stmt),
                     $statements_analyzer->getSuppressedIssues(),
                     $context->calling_method_id
diff --git a/tests/ClassStringTest.php b/tests/ClassStringTest.php
index d225eebcc..87390d9f3 100644
--- a/tests/ClassStringTest.php
+++ b/tests/ClassStringTest.php
@@ -434,22 +434,22 @@ class ClassStringTest extends TestCase
                         return false;
                     }',
             ],
-            'intersectionClassString' => [
+            'explicitIntersectionClassString' => [
                 '<?php
                     interface Foo {
-                        public static function one() : bool;
+                        public static function one() : void;
                     };
 
                     interface Bar {
-                        public static function two() : bool;
+                        public static function two() : void;
                     }
 
                     /**
                      * @param class-string<Foo&Bar> $className
                      */
-                    function foo($className) : bool {
-                        return $className::one();
-                        return $className::two();
+                    function foo($className) : void {
+                        $className::one();
+                        $className::two();
                     }'
             ],
         ];