NoDynamicNameRule: Fix union type handling (#212)

Co-authored-by: Markus Staab <[email protected]>

Author: staabm

src/TypeAnalyzer/CallableTypeAnalyzer.php

@@ -20,11 +20,7 @@ public function isClosureOrCallableType(Scope $scope, Expr $expr): bool
         $nameStaticType = $scope->getType($expr);
         $unwrappedNameStaticType = TypeCombinator::removeNull($nameStaticType);
 
-        if ($unwrappedNameStaticType instanceof CallableType) {
-            return true;
-        }
-
-        if ($unwrappedNameStaticType instanceof ClosureType) {
+        if ($unwrappedNameStaticType->isCallable()->yes()) {
             return true;
         }
 

tests/Rules/NoDynamicNameRule/Fixture/SkipCallableUnion.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symplify\PHPStanRules\Tests\Rules\NoDynamicNameRule\Fixture;
+
+use Closure;
+
+final class SkipCallableUnion
+{
+    /** @var array|callable():array */
+    private $sometimesCallable = [];
+
+    public function run()
+    {
+        $sometimesCallable = $this->sometimesCallable;
+        if (is_callable($sometimesCallable)) {
+            $sometimesCallable();
+        }
+    }
+}

tests/Rules/NoDynamicNameRule/NoDynamicNameRuleTest.php

@@ -35,6 +35,7 @@ public static function provideData(): Iterator
         yield [__DIR__ . '/Fixture/SkipInvokable.php', []];
         yield [__DIR__ . '/Fixture/SkipClosure.php', []];
         yield [__DIR__ . '/Fixture/SkipCallable.php', []];
+        yield [__DIR__ . '/Fixture/SkipCallableUnion.php', []];
         yield [__DIR__ . '/Fixture/SkipNullableClosure.php', []];
         yield [__DIR__ . '/Fixture/SkipImmediatelyInvokedFunctionExpression.php', []];
     }