decouple CallableTypeMapper, ClosureTypeMapper

packages/PHPStanStaticTypeMapper/src/PHPStanStaticTypeMapper.php

@@ -122,14 +122,6 @@ final class PHPStanStaticTypeMapper
             return null;
         }
 
-        if ($phpStanType instanceof CallableType || $phpStanType instanceof ClosureType) {
-            if ($kind === 'property') {
-                return null;
-            }
-
-            return new Identifier('callable');
-        }
-
         if ($phpStanType instanceof TypeWithClassName) {
             $lowerCasedClassName = strtolower($phpStanType->getClassName());
             if ($lowerCasedClassName === 'callable') {

packages/PHPStanStaticTypeMapper/src/TypeMapper/CallableTypeMapper.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\PHPStanStaticTypeMapper\TypeMapper;
+
+use PhpParser\Node;
+use PhpParser\Node\Identifier;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use PHPStan\Type\CallableType;
+use PHPStan\Type\Type;
+use Rector\Exception\NotImplementedException;
+use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface;
+
+final class CallableTypeMapper implements TypeMapperInterface
+{
+    public function getNodeClass(): string
+    {
+        return CallableType::class;
+    }
+
+    /**
+     * @param CallableType $type
+     */
+    public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode
+    {
+        throw new NotImplementedException();
+    }
+
+    /**
+     * @param CallableType $type
+     */
+    public function mapToPhpParserNode(Type $type, ?string $kind = null): ?Node
+    {
+        if ($kind === 'property') {
+            return null;
+        }
+
+        return new Identifier('callable');
+    }
+}

packages/PHPStanStaticTypeMapper/src/TypeMapper/ClosureTypeMapper.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\PHPStanStaticTypeMapper\TypeMapper;
+
+use PhpParser\Node;
+use PhpParser\Node\Identifier;
+use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use PHPStan\Type\ClosureType;
+use PHPStan\Type\Type;
+use Rector\Exception\NotImplementedException;
+use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface;
+
+final class ClosureTypeMapper implements TypeMapperInterface
+{
+    public function getNodeClass(): string
+    {
+        return ClosureType::class;
+    }
+
+    /**
+     * @param ClosureType $type
+     */
+    public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode
+    {
+        throw new NotImplementedException();
+    }
+
+    /**
+     * @param ClosureType $type
+     */
+    public function mapToPhpParserNode(Type $type, ?string $kind = null): ?Node
+    {
+        if ($kind === 'property') {
+            return null;
+        }
+
+        return new Identifier('callable');
+    }
+}