Add tests

Author: VincentLanglet

src/Type/ValueOfType.php

@@ -51,11 +51,11 @@ public function isResolvable(): bool
 	protected function getResult(): Type
 	{
 		if ($this->type->isEnum()->yes()) {
-			if ($this->type instanceof TemplateType) {
-				$bound = $this->type->getBound();
-				if ($bound->equals(new ObjectType('BackedEnum'))) {
-					return new UnionType([new IntegerType(), new StringType()]);
-				}
+			if (
+				$this->type instanceof TemplateType
+				&& $this->type->getBound()->equals(new ObjectType('BackedEnum'))
+			) {
+				return new UnionType([new IntegerType(), new StringType()]);
 			}
 
 			$valueTypes = [];

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

@@ -0,0 +1,46 @@
+<?php // lint >= 8.1
+
+namespace Bug13283;
+
+use function PHPStan\Testing\assertType;
+
+enum Test: string
+{
+	case NAME = 'name';
+	case VALUE = 'value';
+}
+
+/**
+ * @template T of \BackedEnum
+ * @param class-string<T> $enum
+ * @phpstan-assert null|value-of<T> $value
+ */
+function assertValue(mixed $value, string $enum): void
+{
+	if (null === $value) {
+		return;
+	}
+
+	if (! is_int($value) && ! is_string($value)) {
+		throw new \Exception();
+	}
+
+	if (null === $enum::tryFrom($value)) {
+		throw new \Exception();
+	}
+}
+
+function getFromRequest(): mixed
+{
+	return 'name';
+}
+
+$v = getFromRequest();
+
+assertType('mixed', $v);
+
+assertValue($v, Test::class);
+
+assertType("'name'|'value'|null", $v);
+
+$a = null !== $v ? Test::from($v) : null;

tests/PHPStan/Rules/Comparison/StrictComparisonOfDifferentTypesRuleTest.php

@@ -1034,6 +1034,12 @@ public function testBug13208(): void
 		$this->analyse([__DIR__ . '/data/bug-13208.php'], []);
 	}
 
+	#[RequiresPhp('>= 8.1')]
+	public function testBug13282(): void
+	{
+		$this->analyse([__DIR__ . '/../../Analyser/nsrt/bug-13282.php'], []);
+	}
+
 	public function testBug11609(): void
 	{
 		$this->analyse([__DIR__ . '/data/bug-11609.php'], [

tests/PHPStan/Rules/Functions/ReturnTypeRuleTest.php

@@ -357,6 +357,14 @@ public function testBug12274(): void
 		]);
 	}
 
+	#[RequiresPhp('>= 8.1')]
+	public function testBug13638(): void
+	{
+		$this->checkNullables = true;
+		$this->checkExplicitMixed = true;
+		$this->analyse([__DIR__ . '/data/bug-13638.php'], []);
+	}
+
 	public function testBug13484(): void
 	{
 		$this->checkExplicitMixed = true;

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

@@ -0,0 +1,15 @@
+<?php // lint >= 8.1
+
+namespace Bug13638;
+
+use BackedEnum;
+
+/**
+ * @template T of BackedEnum
+ * @param ?value-of<T> $a
+ * @return ($a is null ? list<?value-of<T>> : list<value-of<T>>)
+ */
+function test1(int | string | null $a): array
+{
+	return [$a];
+}