diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/ConditionalTypeForParameterMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/ConditionalTypeForParameterMapper.php
index aed82973735..4190e289190 100644
--- a/packages/PHPStanStaticTypeMapper/TypeMapper/ConditionalTypeForParameterMapper.php
+++ b/packages/PHPStanStaticTypeMapper/TypeMapper/ConditionalTypeForParameterMapper.php
@@ -4,6 +4,7 @@
 
 namespace Rector\PHPStanStaticTypeMapper\TypeMapper;
 
+use PHPStan\Type\TypeCombinator;
 use PhpParser\Node;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\ConditionalTypeForParameter;
@@ -40,7 +41,8 @@ public function getNodeClass(): string
      */
     public function mapToPHPStanPhpDocTypeNode(Type $type, string $typeKind): TypeNode
     {
-        return $this->phpStanStaticTypeMapper->mapToPHPStanPhpDocTypeNode($type->getTarget(), $typeKind);
+        $type = TypeCombinator::union($type->getIf(), $type->getElse());
+        return $this->phpStanStaticTypeMapper->mapToPHPStanPhpDocTypeNode($type, $typeKind);
     }
 
     /**
@@ -49,6 +51,7 @@ public function mapToPHPStanPhpDocTypeNode(Type $type, string $typeKind): TypeNo
      */
     public function mapToPhpParserNode(Type $type, string $typeKind): ?Node
     {
-        return $this->phpStanStaticTypeMapper->mapToPhpParserNode($type->getTarget(), $typeKind);
+        $type = TypeCombinator::union($type->getIf(), $type->getElse());
+        return $this->phpStanStaticTypeMapper->mapToPhpParserNode($type, $typeKind);
     }
 }
diff --git a/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/conditional_type_for_parameter.php.inc b/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/conditional_type_for_parameter.php.inc
new file mode 100644
index 00000000000..83ee1887411
--- /dev/null
+++ b/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/conditional_type_for_parameter.php.inc
@@ -0,0 +1,31 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+
+final class ConditionalTypeForParameter
+{
+    public function run()
+    {
+        $username = 'xxxxxx';
+        $password = 'yyyyyyy';
+        return base64_encode(implode(':', [$username, $password]));
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+
+final class ConditionalTypeForParameter
+{
+    public function run(): string
+    {
+        $username = 'xxxxxx';
+        $password = 'yyyyyyy';
+        return base64_encode(implode(':', [$username, $password]));
+    }
+}
+
+?>
diff --git a/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_is_array.php.inc b/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_is_array.php.inc
new file mode 100644
index 00000000000..ce9fe233dbe
--- /dev/null
+++ b/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_is_array.php.inc
@@ -0,0 +1,27 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+
+final class ReturnIsArray
+{
+    public function run($value)
+    {
+        return is_array(ftp_nlist($value, '.'));
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+
+final class ReturnIsArray
+{
+    public function run($value): bool
+    {
+        return is_array(ftp_nlist($value, '.'));
+    }
+}
+
+?>
diff --git a/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_conditional_type_for_parameter.php.inc b/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_conditional_type_for_parameter.php.inc
deleted file mode 100644
index e49c3ad9936..00000000000
--- a/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_conditional_type_for_parameter.php.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
-
-final class SkipConditionalTypeForParameter
-{
-    public function run()
-    {
-        $username = 'xxxxxx';
-        $password = 'yyyyyyy';
-        return base64_encode(implode(':', [$username, $password]));
-    }
-}
diff --git a/src/Kernel/RectorKernel.php b/src/Kernel/RectorKernel.php
index 0da9d981bd0..00edeaa18f5 100644
--- a/src/Kernel/RectorKernel.php
+++ b/src/Kernel/RectorKernel.php
@@ -17,7 +17,7 @@ final class RectorKernel
     /**
      * @var string
      */
-    private const CACHE_KEY = 'v79';
+    private const CACHE_KEY = 'v80';
 
     private ContainerInterface|null $container = null;