Fix type narrowed too much after identical comparison with never-typed generic method

src/Reflection/ResolvedFunctionVariantWithOriginal.php

@@ -3,6 +3,7 @@
 namespace PHPStan\Reflection;
 
 use PHPStan\Reflection\Php\ExtendedDummyParameter;
+use PHPStan\Type\ConditionalType;
 use PHPStan\Type\ConditionalTypeForParameter;
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\Generic\GenericObjectType;
@@ -12,6 +13,7 @@
 use PHPStan\Type\Generic\TemplateTypeMap;
 use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\Generic\TemplateTypeVarianceMap;
+use PHPStan\Type\NeverType;
 use PHPStan\Type\NonAcceptingNeverType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeTraverser;
@@ -245,7 +247,16 @@ private function resolveResolvableTemplateTypes(Type $type, TemplateTypeVariance
 			return $traverse($type);
 		};
 
-		return TypeTraverser::map($type, function (Type $type, callable $traverse) use ($references, $objectCb): Type {
+		$containsConditionalType = false;
+		TypeTraverser::map($type, static function (Type $type, callable $traverse) use (&$containsConditionalType): Type {
+			if ($type instanceof ConditionalType) {
+				$containsConditionalType = true;
+			}
+
+			return $containsConditionalType ? $type : $traverse($type);
+		});
+
+		return TypeTraverser::map($type, function (Type $type, callable $traverse) use ($references, $objectCb, $containsConditionalType): Type {
 			if ($type instanceof GenericObjectType || $type instanceof GenericStaticType) {
 				return TypeTraverser::map($type, $objectCb);
 			}
@@ -256,6 +267,10 @@ private function resolveResolvableTemplateTypes(Type $type, TemplateTypeVariance
 					return $traverse($type);
 				}
 
+				if ($newType instanceof NeverType && $type->getScope()->getFunctionName() === null && !$containsConditionalType) {
+					return $traverse($type->getBound());
+				}
+
 				$variance = TemplateTypeVariance::createInvariant();
 				foreach ($references as $reference) {
 					// this uses identity to distinguish between different occurrences of the same template type

tests/PHPStan/Analyser/nsrt/bug-14281.php

@@ -0,0 +1,96 @@
+<?php declare(strict_types=1);
+
+namespace Bug14281;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @template TElement
+ * @implements \IteratorAggregate<array-key, TElement>
+ */
+abstract class Collection implements \IteratorAggregate, \Countable
+{
+	/** @var array<array-key, TElement> */
+	protected array $elements = [];
+
+	/** @param array<TElement> $elements */
+	public function __construct(array $elements = [])
+	{
+		$this->elements = $elements;
+	}
+
+	/**
+	 * @param array-key $key
+	 * @return TElement|null
+	 */
+	public function get($key)
+	{
+		return $this->elements[$key] ?? null;
+	}
+
+	/** @phpstan-impure */
+	#[\Override]
+	public function count(): int
+	{
+		return \count($this->elements);
+	}
+
+	/** @return \Traversable<TElement> */
+	#[\Override]
+	public function getIterator(): \Traversable
+	{
+		yield from $this->elements;
+	}
+
+	/** @param array<mixed> $options */
+	public function assignRecursive(array $options): static
+	{
+		return $this;
+	}
+}
+
+/**
+ * @template TElement
+ * @extends Collection<TElement>
+ */
+class TestCollection extends Collection
+{
+}
+
+class CollectionTest
+{
+	public function testFromAssociative(): void
+	{
+		$data = [
+			null,
+			0,
+			'some-string',
+			new \stdClass(),
+			['some' => 'value'],
+		];
+
+		$collection = (new TestCollection())->assignRecursive($data);
+
+		assert(count($collection) === 5);
+		assertType("array{null, 0, 'some-string', stdClass, array{some: 'value'}}", $data);
+
+		assertType('Bug14281\TestCollection<*NEVER*>', $collection);
+		assertType('mixed', $collection->get(0));
+		assertType('mixed', $collection->get(1));
+
+		assert($data[0] === $collection->get(0));
+		assertType("array{null, 0, 'some-string', stdClass, array{some: 'value'}}", $data);
+
+		assert($data[1] === $collection->get(1));
+		assertType("array{null, 0, 'some-string', stdClass, array{some: 'value'}}", $data);
+
+		assert($data[2] === $collection->get(2));
+		assertType("array{null, 0, 'some-string', stdClass, array{some: 'value'}}", $data);
+
+		assert($data[3] === $collection->get(3));
+		assertType("array{null, 0, 'some-string', stdClass, array{some: 'value'}}", $data);
+
+		assert($data[4] === $collection->get(4));
+		assertType("array{null, 0, 'some-string', stdClass, array{some: 'value'}}", $data);
+	}
+}

tests/PHPStan/Analyser/nsrt/generics.php

@@ -931,7 +931,7 @@ public function returnStatic(): self
 function () {
 	$stdEmpty = new StdClassCollection([]);
 	assertType('PHPStan\Generics\FunctionsAssertType\StdClassCollection<*NEVER*, *NEVER*>', $stdEmpty);
-	assertType('array{}', $stdEmpty->getAll());
+	assertType('array<stdClass>', $stdEmpty->getAll());
 
 	$std = new StdClassCollection([new \stdClass()]);
 	assertType('PHPStan\Generics\FunctionsAssertType\StdClassCollection<int, stdClass>', $std);