Add more tests

herndlm · ondrejmirtes · commit 895cbf2c05e4 · 2022-01-17T22:32:15.000+01:00
diff --git a/tests/Type/WebMozartAssert/data/array.php b/tests/Type/WebMozartAssert/data/array.php
@@ -25,13 +25,16 @@ public function keyExists(array $a): void
 		\PHPStan\Testing\assertType('array{foo: string, bar?: string}', $a);
 	}
 
-	public function validArrayKey($a, bool $b): void
+	public function validArrayKey($a, bool $b, $c): void
 	{
 		Assert::validArrayKey($a);
 		\PHPStan\Testing\assertType('int|string', $a);
 
 		Assert::validArrayKey($b);
 		\PHPStan\Testing\assertType('*NEVER*', $b);
+
+		Assert::nullOrValidArrayKey($c);
+		\PHPStan\Testing\assertType('int|string|null', $c);
 	}
 
 	/**
@@ -94,10 +97,13 @@ public function countBetween(array $a, array $b, array $c, array $d): void
 		\PHPStan\Testing\assertType('*NEVER*', $d);
 	}
 
-	public function isList($a): void
+	public function isList($a, $b): void
 	{
 		Assert::isList($a);
 		\PHPStan\Testing\assertType('array', $a);
+
+		Assert::nullOrIsList($b);
+		\PHPStan\Testing\assertType('array|null', $b);
 	}
 
 }
diff --git a/tests/Type/WebMozartAssert/data/collection.php b/tests/Type/WebMozartAssert/data/collection.php
@@ -13,6 +13,12 @@ public function allString(array $a): void
 		\PHPStan\Testing\assertType('array<string>', $a);
 	}
 
+	public function allStringNotEmpty(array $a): void
+	{
+		Assert::allStringNotEmpty($a);
+		\PHPStan\Testing\assertType('array<string>', $a); // should be array<non-empty-string>
+	}
+
 	public function allInteger(array $a, iterable $b, iterable $c): void
 	{
 		Assert::allInteger($a);
diff --git a/tests/Type/WebMozartAssert/data/comparison.php b/tests/Type/WebMozartAssert/data/comparison.php
@@ -6,19 +6,25 @@
 
 class ComparisonTest
 {
-	public function true($a): void
+	public function true($a, $b): void
 	{
 		Assert::true($a);
 		\PHPStan\Testing\assertType('true', $a);
+
+		Assert::nullOrTrue($b);
+		\PHPStan\Testing\assertType('true|null', $b);
 	}
 
-	public function false($a): void
+	public function false($a, $b): void
 	{
 		Assert::false($a);
 		\PHPStan\Testing\assertType('false', $a);
+
+		Assert::nullOrFalse($b);
+		\PHPStan\Testing\assertType('false|null', $b);
 	}
 
-	public function notFalse(int $a): void
+	public function notFalse($a, $b): void
 	{
 		/** @var int|false $a */
 		Assert::notFalse($a);
@@ -37,10 +43,13 @@ public function notNull(?int $a): void
 		\PHPStan\Testing\assertType('int', $a);
 	}
 
-	public function same($a): void
+	public function same($a, $b): void
 	{
 		Assert::same($a, 1);
 		\PHPStan\Testing\assertType('1', $a);
+
+		Assert::nullOrSame($b, 1);
+		\PHPStan\Testing\assertType('1|null', $b);
 	}
 
 	/**
@@ -61,9 +70,12 @@ public function inArray($a, $b): void
 		\PHPStan\Testing\assertType('\'bar\'|\'foo\'|null', $b);
 	}
 
-	public function oneOf($a): void
+	public function oneOf($a, $b): void
 	{
 		Assert::oneOf($a, [1, 2]);
 		\PHPStan\Testing\assertType('1|2', $a);
+
+		Assert::nullOrOneOf($b, [1, 2]);
+		\PHPStan\Testing\assertType('1|2|null', $b);
 	}
 }
diff --git a/tests/Type/WebMozartAssert/data/object.php b/tests/Type/WebMozartAssert/data/object.php
@@ -7,28 +7,40 @@
 class ObjectTest
 {
 
-	public function classExists($a): void
+	public function classExists($a, $b): void
 	{
 		Assert::classExists($a);
 		\PHPStan\Testing\assertType('class-string', $a);
+
+		Assert::nullOrClassExists($b);
+		\PHPStan\Testing\assertType('class-string|null', $b);
 	}
 
-	public function subclassOf($a): void
+	public function subclassOf($a, $b): void
 	{
 		Assert::subclassOf($a, self::class);
 		\PHPStan\Testing\assertType('class-string<PHPStan\Type\WebMozartAssert\ObjectTest>|PHPStan\Type\WebMozartAssert\ObjectTest', $a);
+
+		Assert::nullOrSubclassOf($b, self::class);
+		\PHPStan\Testing\assertType('class-string<PHPStan\Type\WebMozartAssert\ObjectTest>|PHPStan\Type\WebMozartAssert\ObjectTest|null', $b);
 	}
 
-	public function interfaceExists($a): void
+	public function interfaceExists($a, $b): void
 	{
 		Assert::interfaceExists($a);
 		\PHPStan\Testing\assertType('class-string', $a);
+
+		Assert::nullOrInterfaceExists($b);
+		\PHPStan\Testing\assertType('class-string|null', $b);
 	}
 
-	public function implementsInterface($a): void
+	public function implementsInterface($a, $b): void
 	{
 		Assert::implementsInterface($a, ObjectFoo::class);
 		\PHPStan\Testing\assertType('PHPStan\Type\WebMozartAssert\ObjectFoo', $a);
+
+		Assert::nullOrImplementsInterface($b, ObjectFoo::class);
+		\PHPStan\Testing\assertType('PHPStan\Type\WebMozartAssert\ObjectFoo|null', $b);
 	}
 
 	public function propertyExists(object $a): void
diff --git a/tests/Type/WebMozartAssert/data/string.php b/tests/Type/WebMozartAssert/data/string.php
@@ -7,34 +7,43 @@
 class TestStrings
 {
 
-	public function length(string $a, string $b): void
+	public function length(string $a, string $b, string $c): void
 	{
 		Assert::length($a, 0);
 		\PHPStan\Testing\assertType('\'\'', $a);
 
 		Assert::length($b, 1);
 		\PHPStan\Testing\assertType('non-empty-string', $b);
+
+		Assert::nullOrLength($c, 1);
+		\PHPStan\Testing\assertType('non-empty-string', $c); // should be non-empty-string|null
 	}
 
-	public function minLength(string $a, string $b): void
+	public function minLength(string $a, string $b, string $c): void
 	{
 		Assert::minLength($a, 0);
 		\PHPStan\Testing\assertType('string', $a);
 
 		Assert::minLength($b, 1);
 		\PHPStan\Testing\assertType('non-empty-string', $b);
+
+		Assert::nullOrMinLength($c, 1);
+		\PHPStan\Testing\assertType('non-empty-string', $c); // should be non-empty-string|null
 	}
 
-	public function maxLength(string $a, string $b): void
+	public function maxLength(string $a, string $b, string $c): void
 	{
 		Assert::maxLength($a, 0);
 		\PHPStan\Testing\assertType('\'\'', $a);
 
 		Assert::maxLength($b, 1);
 		\PHPStan\Testing\assertType('string', $b);
+
+		Assert::nullOrMaxLength($c, 1);
+		\PHPStan\Testing\assertType('string', $c);  // should be string|null
 	}
 
-	public function lengthBetween(string $a, string $b, string $c, string $d): void
+	public function lengthBetween(string $a, string $b, string $c, string $d, string $e): void
 	{
 		Assert::lengthBetween($a, 0, 0);
 		\PHPStan\Testing\assertType('\'\'', $a);
@@ -47,6 +56,9 @@ public function lengthBetween(string $a, string $b, string $c, string $d): void
 
 		Assert::lengthBetween($d, 1, 1);
 		\PHPStan\Testing\assertType('non-empty-string', $d);
+
+		Assert::nullOrLengthBetween($e, 1, 1);
+		\PHPStan\Testing\assertType('non-empty-string', $e); // should be non-empty-string|null
 	}
 
 }
diff --git a/tests/Type/WebMozartAssert/data/type.php b/tests/Type/WebMozartAssert/data/type.php

Original file line number	Diff line number	Diff line change
`@@ -25,13 +25,16 @@ public function keyExists(array $a): void`
`25`	`25`	`\PHPStan\Testing\assertType('array{foo: string, bar?: string}', $a);`
`26`	`26`	`}`
`27`	`27`
`28`		`- public function validArrayKey($a, bool $b): void`
	`28`	`+ public function validArrayKey($a, bool $b, $c): void`
`29`	`29`	`{`
`30`	`30`	`Assert::validArrayKey($a);`
`31`	`31`	`\PHPStan\Testing\assertType('int\|string', $a);`
`32`	`32`
`33`	`33`	`Assert::validArrayKey($b);`
`34`	`34`	`\PHPStan\Testing\assertType('NEVER', $b);`
	`35`	`+`
	`36`	`+ Assert::nullOrValidArrayKey($c);`
	`37`	`+ \PHPStan\Testing\assertType('int\|string\|null', $c);`
`35`	`38`	`}`
`36`	`39`
`37`	`40`	`/**`
`@@ -94,10 +97,13 @@ public function countBetween(array $a, array $b, array $c, array $d): void`
`94`	`97`	`\PHPStan\Testing\assertType('NEVER', $d);`
`95`	`98`	`}`
`96`	`99`
`97`		`- public function isList($a): void`
	`100`	`+ public function isList($a, $b): void`
`98`	`101`	`{`
`99`	`102`	`Assert::isList($a);`
`100`	`103`	`\PHPStan\Testing\assertType('array', $a);`
	`104`	`+`
	`105`	`+ Assert::nullOrIsList($b);`
	`106`	`+ \PHPStan\Testing\assertType('array\|null', $b);`
`101`	`107`	`}`
`102`	`108`
`103`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,12 @@ public function allString(array $a): void`
`13`	`13`	`\PHPStan\Testing\assertType('array<string>', $a);`
`14`	`14`	`}`
`15`	`15`
	`16`	`+ public function allStringNotEmpty(array $a): void`
	`17`	`+ {`
	`18`	`+ Assert::allStringNotEmpty($a);`
	`19`	`+ \PHPStan\Testing\assertType('array<string>', $a); // should be array<non-empty-string>`
	`20`	`+ }`
	`21`	`+`
`16`	`22`	`public function allInteger(array $a, iterable $b, iterable $c): void`
`17`	`23`	`{`
`18`	`24`	`Assert::allInteger($a);`
Original file line number	Diff line number	Diff line change
`@@ -6,19 +6,25 @@`
`6`	`6`
`7`	`7`	`class ComparisonTest`
`8`	`8`	`{`
`9`		`- public function true($a): void`
	`9`	`+ public function true($a, $b): void`
`10`	`10`	`{`
`11`	`11`	`Assert::true($a);`
`12`	`12`	`\PHPStan\Testing\assertType('true', $a);`
	`13`	`+`
	`14`	`+ Assert::nullOrTrue($b);`
	`15`	`+ \PHPStan\Testing\assertType('true\|null', $b);`
`13`	`16`	`}`
`14`	`17`
`15`		`- public function false($a): void`
	`18`	`+ public function false($a, $b): void`
`16`	`19`	`{`
`17`	`20`	`Assert::false($a);`
`18`	`21`	`\PHPStan\Testing\assertType('false', $a);`
	`22`	`+`
	`23`	`+ Assert::nullOrFalse($b);`
	`24`	`+ \PHPStan\Testing\assertType('false\|null', $b);`
`19`	`25`	`}`
`20`	`26`
`21`		`- public function notFalse(int $a): void`
	`27`	`+ public function notFalse($a, $b): void`
`22`	`28`	`{`
`23`	`29`	`/** @var int\|false $a */`
`24`	`30`	`Assert::notFalse($a);`
`@@ -37,10 +43,13 @@ public function notNull(?int $a): void`
`37`	`43`	`\PHPStan\Testing\assertType('int', $a);`
`38`	`44`	`}`
`39`	`45`
`40`		`- public function same($a): void`
	`46`	`+ public function same($a, $b): void`
`41`	`47`	`{`
`42`	`48`	`Assert::same($a, 1);`
`43`	`49`	`\PHPStan\Testing\assertType('1', $a);`
	`50`	`+`
	`51`	`+ Assert::nullOrSame($b, 1);`
	`52`	`+ \PHPStan\Testing\assertType('1\|null', $b);`
`44`	`53`	`}`
`45`	`54`
`46`	`55`	`/**`
`@@ -61,9 +70,12 @@ public function inArray($a, $b): void`
`61`	`70`	`\PHPStan\Testing\assertType('\'bar\'\|\'foo\'\|null', $b);`
`62`	`71`	`}`
`63`	`72`
`64`		`- public function oneOf($a): void`
	`73`	`+ public function oneOf($a, $b): void`
`65`	`74`	`{`
`66`	`75`	`Assert::oneOf($a, [1, 2]);`
`67`	`76`	`\PHPStan\Testing\assertType('1\|2', $a);`
	`77`	`+`
	`78`	`+ Assert::nullOrOneOf($b, [1, 2]);`
	`79`	`+ \PHPStan\Testing\assertType('1\|2\|null', $b);`
`68`	`80`	`}`
`69`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,28 +7,40 @@`
`7`	`7`	`class ObjectTest`
`8`	`8`	`{`
`9`	`9`
`10`		`- public function classExists($a): void`
	`10`	`+ public function classExists($a, $b): void`
`11`	`11`	`{`
`12`	`12`	`Assert::classExists($a);`
`13`	`13`	`\PHPStan\Testing\assertType('class-string', $a);`
	`14`	`+`
	`15`	`+ Assert::nullOrClassExists($b);`
	`16`	`+ \PHPStan\Testing\assertType('class-string\|null', $b);`
`14`	`17`	`}`
`15`	`18`
`16`		`- public function subclassOf($a): void`
	`19`	`+ public function subclassOf($a, $b): void`
`17`	`20`	`{`
`18`	`21`	`Assert::subclassOf($a, self::class);`
`19`	`22`	`\PHPStan\Testing\assertType('class-string<PHPStan\Type\WebMozartAssert\ObjectTest>\|PHPStan\Type\WebMozartAssert\ObjectTest', $a);`
	`23`	`+`
	`24`	`+ Assert::nullOrSubclassOf($b, self::class);`
	`25`	`+ \PHPStan\Testing\assertType('class-string<PHPStan\Type\WebMozartAssert\ObjectTest>\|PHPStan\Type\WebMozartAssert\ObjectTest\|null', $b);`
`20`	`26`	`}`
`21`	`27`
`22`		`- public function interfaceExists($a): void`
	`28`	`+ public function interfaceExists($a, $b): void`
`23`	`29`	`{`
`24`	`30`	`Assert::interfaceExists($a);`
`25`	`31`	`\PHPStan\Testing\assertType('class-string', $a);`
	`32`	`+`
	`33`	`+ Assert::nullOrInterfaceExists($b);`
	`34`	`+ \PHPStan\Testing\assertType('class-string\|null', $b);`
`26`	`35`	`}`
`27`	`36`
`28`		`- public function implementsInterface($a): void`
	`37`	`+ public function implementsInterface($a, $b): void`
`29`	`38`	`{`
`30`	`39`	`Assert::implementsInterface($a, ObjectFoo::class);`
`31`	`40`	`\PHPStan\Testing\assertType('PHPStan\Type\WebMozartAssert\ObjectFoo', $a);`
	`41`	`+`
	`42`	`+ Assert::nullOrImplementsInterface($b, ObjectFoo::class);`
	`43`	`+ \PHPStan\Testing\assertType('PHPStan\Type\WebMozartAssert\ObjectFoo\|null', $b);`
`32`	`44`	`}`
`33`	`45`
`34`	`46`	`public function propertyExists(object $a): void`
Original file line number	Diff line number	Diff line change
`@@ -7,34 +7,43 @@`
`7`	`7`	`class TestStrings`
`8`	`8`	`{`
`9`	`9`
`10`		`- public function length(string $a, string $b): void`
	`10`	`+ public function length(string $a, string $b, string $c): void`
`11`	`11`	`{`
`12`	`12`	`Assert::length($a, 0);`
`13`	`13`	`\PHPStan\Testing\assertType('\'\'', $a);`
`14`	`14`
`15`	`15`	`Assert::length($b, 1);`
`16`	`16`	`\PHPStan\Testing\assertType('non-empty-string', $b);`
	`17`	`+`
	`18`	`+ Assert::nullOrLength($c, 1);`
	`19`	`+ \PHPStan\Testing\assertType('non-empty-string', $c); // should be non-empty-string\|null`
`17`	`20`	`}`
`18`	`21`
`19`		`- public function minLength(string $a, string $b): void`
	`22`	`+ public function minLength(string $a, string $b, string $c): void`
`20`	`23`	`{`
`21`	`24`	`Assert::minLength($a, 0);`
`22`	`25`	`\PHPStan\Testing\assertType('string', $a);`
`23`	`26`
`24`	`27`	`Assert::minLength($b, 1);`
`25`	`28`	`\PHPStan\Testing\assertType('non-empty-string', $b);`
	`29`	`+`
	`30`	`+ Assert::nullOrMinLength($c, 1);`
	`31`	`+ \PHPStan\Testing\assertType('non-empty-string', $c); // should be non-empty-string\|null`
`26`	`32`	`}`
`27`	`33`
`28`		`- public function maxLength(string $a, string $b): void`
	`34`	`+ public function maxLength(string $a, string $b, string $c): void`
`29`	`35`	`{`
`30`	`36`	`Assert::maxLength($a, 0);`
`31`	`37`	`\PHPStan\Testing\assertType('\'\'', $a);`
`32`	`38`
`33`	`39`	`Assert::maxLength($b, 1);`
`34`	`40`	`\PHPStan\Testing\assertType('string', $b);`
	`41`	`+`
	`42`	`+ Assert::nullOrMaxLength($c, 1);`
	`43`	`+ \PHPStan\Testing\assertType('string', $c); // should be string\|null`
`35`	`44`	`}`
`36`	`45`
`37`		`- public function lengthBetween(string $a, string $b, string $c, string $d): void`
	`46`	`+ public function lengthBetween(string $a, string $b, string $c, string $d, string $e): void`
`38`	`47`	`{`
`39`	`48`	`Assert::lengthBetween($a, 0, 0);`
`40`	`49`	`\PHPStan\Testing\assertType('\'\'', $a);`
`@@ -47,6 +56,9 @@ public function lengthBetween(string $a, string $b, string $c, string $d): void`
`47`	`56`
`48`	`57`	`Assert::lengthBetween($d, 1, 1);`
`49`	`58`	`\PHPStan\Testing\assertType('non-empty-string', $d);`
	`59`	`+`
	`60`	`+ Assert::nullOrLengthBetween($e, 1, 1);`
	`61`	`+ \PHPStan\Testing\assertType('non-empty-string', $e); // should be non-empty-string\|null`
`50`	`62`	`}`
`51`	`63`
`52`	`64`	`}`