Add non-negative-int and non-positive-int

phpstan · Oct 8, 2022 · 49cd131 · 49cd131
1 parent 1c01253
commit 49cd131
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 0 deletions.
diff --git a/src/PhpDoc/TypeNodeResolver.php b/src/PhpDoc/TypeNodeResolver.php
@@ -182,6 +182,12 @@ private function resolveIdentifierTypeNode(IdentifierTypeNode $typeNode, NameSco
 			case 'negative-int':
 				return IntegerRangeType::fromInterval(null, -1);
 
+			case 'non-positive-int':
+				return IntegerRangeType::fromInterval(null, 0);
+
+			case 'non-negative-int':
+				return IntegerRangeType::fromInterval(0, null);
+
 			case 'string':
 				return new StringType();
 

diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -1062,6 +1062,7 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8008.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/assert-class-type.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5552.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/extra-extra-int-types.php');
 	}
 
 	/**

diff --git a/tests/PHPStan/Analyser/data/extra-extra-int-types.php b/tests/PHPStan/Analyser/data/extra-extra-int-types.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace ExtraExtraIntTypes;
+
+use function PHPStan\Testing\assertType;
+
+class Foo
+{
+
+	/**
+	 * @param non-positive-int $nonPositiveInt
+	 * @param non-negative-int $nonNegativeInt
+	 */
+	public function doFoo(
+		int $nonPositiveInt,
+		int $nonNegativeInt,
+	): void
+	{
+		assertType('int<min, 0>', $nonPositiveInt);
+		assertType('int<0, max>', $nonNegativeInt);
+	}
+
+}