add more tests

Author: staabm

src/Reflection/Assertions.php

@@ -148,11 +148,10 @@ public function intersect(Assertions $other): self
 	private static function getAssertKey(AssertTag $assert): string
 	{
 		return sprintf(
-			'%s-%s-%s-%s',
+			'%s-%s-%s',
 			$assert->getParameter()->describe(),
 			$assert->getIf(),
 			$assert->isNegated() ? '1' : '0',
-			$assert->isEquality() ? '1' : '0',
 		);
 	}
 

tests/PHPStan/Analyser/nsrt/bug-14108b.php

@@ -0,0 +1,52 @@
+<?php // lint >= 8.0
+
+namespace Bug14108b;
+
+use function PHPStan\Testing\assertType;
+
+class Foo
+{
+	public function __construct(private ?string $param)
+	{
+	}
+
+	public function getParam(): ?string
+	{
+		return $this->param;
+	}
+
+	/**
+	 * @phpstan-assert !null $this->getParam()
+	 */
+	public function narrowGetParam(): void
+	{
+	}
+}
+
+class Bar
+{
+	public function __construct(private ?int $param)
+	{
+	}
+
+	public function getParam(): ?int
+	{
+		return $this->param;
+	}
+
+	/**
+	 * @phpstan-assert int $this->getParam()
+	 */
+	public function narrowGetParam(): void
+	{
+	}
+}
+
+function test(Foo|Bar $fooOrBar): void
+{
+	assertType('int|string|null', $fooOrBar->getParam());
+
+	$fooOrBar->narrowGetParam();
+
+	assertType('int|string|null', $fooOrBar->getParam());
+}

tests/PHPStan/Analyser/nsrt/bug-14108c.php

@@ -0,0 +1,52 @@
+<?php // lint >= 8.0
+
+namespace Bug14108c;
+
+use function PHPStan\Testing\assertType;
+
+class Foo
+{
+	public function __construct(private ?string $param)
+	{
+	}
+
+	public function getParam(): ?string
+	{
+		return $this->param;
+	}
+
+	/**
+	 * @phpstan-assert =string $this->getParam()
+	 */
+	public function narrowGetParam(): void
+	{
+	}
+}
+
+class Bar
+{
+	public function __construct(private ?int $param)
+	{
+	}
+
+	public function getParam(): ?int
+	{
+		return $this->param;
+	}
+
+	/**
+	 * @phpstan-assert int $this->getParam()
+	 */
+	public function narrowGetParam(): void
+	{
+	}
+}
+
+function test(Foo|Bar $fooOrBar): void
+{
+	assertType('int|string|null', $fooOrBar->getParam());
+
+	$fooOrBar->narrowGetParam();
+
+	assertType('int|string', $fooOrBar->getParam());
+}

tests/PHPStan/Analyser/nsrt/bug-14108d.php

@@ -0,0 +1,59 @@
+<?php // lint >= 8.0
+
+namespace Bug14108d;
+
+use function PHPStan\Testing\assertType;
+
+class Foo
+{
+	public function __construct(private ?string $param)
+	{
+	}
+
+	public function getParam(): ?string
+	{
+		return $this->param;
+	}
+
+	/**
+	 * @phpstan-assert-if-true string $this->getParam()
+	 */
+	public function narrowGetParam(): bool
+	{
+	}
+}
+
+class Bar
+{
+	public function __construct(private ?int $param)
+	{
+	}
+
+	public function getParam(): ?int
+	{
+		return $this->param;
+	}
+
+	/**
+	 * @phpstan-assert int $this->getParam()
+	 */
+	public function narrowGetParam(): void
+	{
+	}
+}
+
+function test(Foo|Bar $fooOrBar): void
+{
+	assertType('int|string|null', $fooOrBar->getParam());
+
+	$fooOrBar->narrowGetParam();
+
+	assertType('int|string|null', $fooOrBar->getParam());
+
+	if ($fooOrBar->narrowGetParam()) {
+		assertType('int|string|null', $fooOrBar->getParam()); // could be 'int|string'
+	} else {
+		assertType('int|string|null', $fooOrBar->getParam());
+	}
+	assertType('int|string|null', $fooOrBar->getParam());
+}