Merge branch 2.1.x into 2.2.x

Author: phpstan-bot

src/Type/Generic/TemplateBenevolentUnionType.php

@@ -3,6 +3,7 @@
 namespace PHPStan\Type\Generic;
 
 use PHPStan\Type\BenevolentUnionType;
+use PHPStan\Type\NeverType;
 use PHPStan\Type\Type;
 
 /** @api */
@@ -50,6 +51,9 @@ public function withTypes(array $types): self
 	public function filterTypes(callable $filterCb): Type
 	{
 		$result = parent::filterTypes($filterCb);
+		if ($result instanceof NeverType) {
+			return $result;
+		}
 		if (!$result instanceof TemplateType) {
 			return TemplateTypeFactory::create(
 				$this->getScope(),

src/Type/Generic/TemplateUnionType.php

@@ -2,6 +2,7 @@
 
 namespace PHPStan\Type\Generic;
 
+use PHPStan\Type\NeverType;
 use PHPStan\Type\Type;
 use PHPStan\Type\UnionType;
 
@@ -37,6 +38,9 @@ public function __construct(
 	public function filterTypes(callable $filterCb): Type
 	{
 		$result = parent::filterTypes($filterCb);
+		if ($result instanceof NeverType) {
+			return $result;
+		}
 		if (!$result instanceof TemplateType) {
 			return TemplateTypeFactory::create(
 				$this->getScope(),

tests/PHPStan/Rules/Pure/PureFunctionRuleTest.php

@@ -209,4 +209,9 @@ public function testBug12119(): void
 		$this->analyse([__DIR__ . '/data/bug-12119.php'], []);
 	}
 
+	public function testBug14504(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-14504.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Pure/PureMethodRuleTest.php

@@ -377,4 +377,10 @@ public function testBug12382(): void
 		]);
 	}
 
+	public function testBug14504(): void
+	{
+		$this->treatPhpDocTypesAsCertain = true;
+		$this->analyse([__DIR__ . '/data/bug-14504-method.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Pure/data/bug-14504-method.php

@@ -0,0 +1,19 @@
+<?php declare(strict_types = 1);
+
+namespace Bug14504Method;
+
+/**
+ * @template T of int|string
+ */
+class Foo
+{
+
+	/** @param T $val */
+	public function __construct(private $val) {}
+
+	/** @phpstan-pure */
+	public function toString(): string {
+		return (string)$this->val;
+	}
+
+}

tests/PHPStan/Rules/Pure/data/bug-14504.php

@@ -0,0 +1,43 @@
+<?php declare(strict_types = 1);
+
+namespace Bug14504;
+
+/**
+ * @phpstan-pure
+ * @template T of int|string
+ * @param T $val
+ * @return string
+ */
+function stringCast($val): string {
+	return (string)$val;
+}
+
+/**
+ * @phpstan-pure
+ * @template T of int|string
+ * @param T $val
+ * @return string
+ */
+function stringConcat($val): string {
+	return '' . $val;
+}
+
+/**
+ * @phpstan-pure
+ * @template T of int|string
+ * @param T $val
+ * @return string
+ */
+function stringInterpolation($val): string {
+	return "$val";
+}
+
+/**
+ * @phpstan-pure
+ * @template T of int|float|bool
+ * @param T $val
+ * @return string
+ */
+function nonStringNonObjectCast($val): string {
+	return (string)$val;
+}