Added regression tests for fixed issues.

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -61,6 +61,9 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/strtotime-return-type-extensions.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/closure-return-type-extensions.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-key.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6633.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-10283.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-10442.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/discussion-9972.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/intersection-static.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/static-properties.php');
@@ -1433,7 +1436,6 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-9123.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-10037.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/set-type-type-specifying.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-10442.php');
 	}
 
 	/**

tests/PHPStan/Analyser/data/bug-10283.php

@@ -0,0 +1,25 @@
+<?php declare(strict_types = 1);
+
+namespace Bug10283;
+
+use function PHPStan\Testing\assertType;
+
+class JsExpressionable {}
+
+class Cl
+{
+    /**
+     * @param \Closure(): JsExpressionable|\Closure(): int $fx
+     */
+	public function test($fx): ?JsExpressionable
+	{
+		$res = $fx();
+		assertType('Bug10283\JsExpressionable|int', $res);
+
+		if (is_int($res)) {
+			return null;
+		}
+
+		return $res;
+	}
+}

tests/PHPStan/Analyser/data/bug-6633.php

@@ -0,0 +1,75 @@
+<?php declare(strict_types = 1);
+
+namespace Bug6633;
+
+use function PHPStan\Testing\assertType;
+
+class CreateServiceSolrData
+{
+  public ?string $name;
+  public ?string $version;
+}
+
+class CreateServiceRedisData
+{
+  public ?string $name;
+  public ?string $version;
+  public ?bool $persistent;
+
+}
+
+class ServiceSolr
+{
+	public function __construct(
+		private string $name,
+		private string $version,
+	) {}
+
+	public function touchAll() : string{
+		return $this->name . $this->version;
+	}
+}
+
+class ServiceRedis
+{
+	public function __construct(
+		private string $name,
+		private string $version,
+		private bool $persistent,
+	) {}
+
+	public function touchAll() : string{
+		return $this->persistent ? $this->name : $this->version;
+	}
+}
+
+function test(?string $type = NULL) : void {
+	$types = [
+      'solr' => [
+        'label' => 'SOLR Search',
+        'data_class' => CreateServiceSolrData::class,
+        'to_entity' => function (CreateServiceSolrData $data) {
+          assert($data->name !== NULL && $data->version !== NULL, "Incorrect form validation");
+          return new ServiceSolr($data->name, $data->version);
+        },
+      ],
+	  'redis' => [
+        'label' => 'Redis',
+        'data_class' => CreateServiceRedisData::class,
+        'to_entity' => function (CreateServiceRedisData $data) {
+          assert($data->name !== NULL && $data->version !== NULL && $data->persistent !== NULL, "Incorrect form validation");
+          return new ServiceRedis($data->name, $data->version, $data->persistent);
+        },
+      ],
+    ];
+
+	if ($type === NULL || !isset($types[$type])) {
+		throw new \RuntimeException("404 or choice form here");
+	}
+
+    $data = new $types[$type]['data_class']();
+
+    $service = $types[$type]['to_entity']($data);
+
+	assertType('Bug6633\ServiceRedis|Bug6633\ServiceSolr', $service);
+}

tests/PHPStan/Rules/Functions/CallCallablesRuleTest.php

@@ -286,4 +286,24 @@ public function testBug6485(): void
 		]);
 	}
 
+	public function testBug6633(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-6633.php'], []);
+	}
+
+	public function testBug3818b(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-3818b.php'], []);
+	}
+
+	public function testBug9594(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-9594.php'], []);
+	}
+
+	public function testBug9614(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-9614.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Functions/data/bug-3818b.php

@@ -0,0 +1,29 @@
+<?php declare(strict_types = 1);
+
+namespace Bug3818b;
+
+class A
+{
+}
+
+class B
+{
+}
+
+class Foo
+{
+	public function handle(A|B $obj): void
+	{
+		$method = $obj instanceof A ? $this->handleA(...) : $this->handleB(...);
+
+		$method($obj);
+	}
+
+	private function handleA(A $a): void
+	{
+	}
+
+	private function handleB(B $b): void
+	{
+	}
+}

tests/PHPStan/Rules/Functions/data/bug-6633.php

@@ -0,0 +1,71 @@
+<?php declare(strict_types = 1);
+
+namespace Bug6633\Rule;
+
+class CreateServiceSolrData
+{
+  public ?string $name;
+  public ?string $version;
+}
+
+class CreateServiceRedisData
+{
+  public ?string $name;
+  public ?string $version;
+  public ?bool $persistent;
+
+}
+
+class ServiceSolr
+{
+	public function __construct(
+		private string $name,
+		private string $version,
+	) {}
+
+	public function touchAll() : string{
+		return $this->name . $this->version;
+	}
+}
+
+class ServiceRedis
+{
+	public function __construct(
+		private string $name,
+		private string $version,
+		private bool $persistent,
+	) {}
+
+	public function touchAll() : string{
+		return $this->persistent ? $this->name : $this->version;
+	}
+}
+
+function test(?string $type = NULL) : void {
+	$types = [
+      'solr' => [
+        'label' => 'SOLR Search',
+        'data_class' => CreateServiceSolrData::class,
+        'to_entity' => function (CreateServiceSolrData $data) {
+          assert($data->name !== NULL && $data->version !== NULL, "Incorrect form validation");
+          return new ServiceSolr($data->name, $data->version);
+        },
+      ],
+	  'redis' => [
+        'label' => 'Redis',
+        'data_class' => CreateServiceRedisData::class,
+        'to_entity' => function (CreateServiceRedisData $data) {
+          assert($data->name !== NULL && $data->version !== NULL && $data->persistent !== NULL, "Incorrect form validation");
+          return new ServiceRedis($data->name, $data->version, $data->persistent);
+        },
+      ],
+    ];
+
+	if ($type === NULL || !isset($types[$type])) {
+		throw new \RuntimeException("404 or choice form here");
+	}
+
+    $data = new $types[$type]['data_class']();
+
+    $service = $types[$type]['to_entity']($data);
+}

tests/PHPStan/Rules/Functions/data/bug-9594.php

@@ -0,0 +1,26 @@
+<?php declare(strict_types = 1);
+
+namespace Bug9594;
+
+class HelloWorld
+{
+	public function sayHello(): void
+	{
+		$data = [
+			[
+				'elements' => [1, 2, 3],
+				'greet' => fn (int $value) => 'I am '.$value,
+			],
+			[
+				'elements' => ['hello', 'world'],
+				'greet' => fn (string $value) => 'I am '.$value,
+			],
+		];
+
+		foreach ($data as $entry) {
+			foreach ($entry['elements'] as $element) {
+				$entry['greet']($element);
+			}
+		}
+	}
+}

tests/PHPStan/Rules/Functions/data/bug-9614.php

@@ -0,0 +1,27 @@
+<?php declare(strict_types = 1);
+
+namespace Bug9614;
+
+class HelloWorld
+{
+	public function sayHello(string $key, ?string $a = null, ?string $b = null): string
+	{
+		$funcs = [
+			'test' => function() {
+				return 'test';
+			},
+			'foo' => function($a) {
+				return 'foo';
+			},
+			'bar' => function($a, $b) {
+				return 'bar';
+			}
+		];
+
+        if (!isset($funcs[$key])) {
+            return '';
+        }
+
+		return $funcs[$key]($a, $b);
+	}
+}