Move type assertion tests into TypeTest

Author: herndlm

tests/Type/WebMozartAssert/data/data.php

@@ -11,9 +11,6 @@ public function doFoo($a, $b, array $c, iterable $d, $e, $f, $g, $h, $i, $j, $k,
 	{
 		\PHPStan\Testing\assertType('mixed', $a);
 
-		Assert::integer($a);
-		\PHPStan\Testing\assertType('int', $a);
-
 		Assert::nullOrInteger($b);
 		\PHPStan\Testing\assertType('int|null', $b);
 
@@ -23,47 +20,6 @@ public function doFoo($a, $b, array $c, iterable $d, $e, $f, $g, $h, $i, $j, $k,
 		Assert::allInteger($d);
 		\PHPStan\Testing\assertType('iterable<int>', $d);
 
-		Assert::string($e);
-		\PHPStan\Testing\assertType('string', $e);
-
-		Assert::float($f);
-		\PHPStan\Testing\assertType('float', $f);
-
-		Assert::numeric($g);
-		\PHPStan\Testing\assertType('float|int|numeric-string', $g);
-
-		Assert::boolean($h);
-		\PHPStan\Testing\assertType('bool', $h);
-
-		Assert::scalar($i);
-		\PHPStan\Testing\assertType('bool|float|int|string', $i);
-
-		Assert::object($j);
-		\PHPStan\Testing\assertType('object', $j);
-
-		Assert::resource($k);
-		\PHPStan\Testing\assertType('resource', $k);
-
-		Assert::isCallable($l);
-		\PHPStan\Testing\assertType('callable(): mixed', $l);
-
-		Assert::isArray($m);
-		\PHPStan\Testing\assertType('array', $m);
-
-		Assert::isIterable($n);
-		\PHPStan\Testing\assertType('array|Traversable', $n);
-
-		Assert::isCountable($o);
-		\PHPStan\Testing\assertType('array|Countable', $o);
-
-		Assert::isInstanceOf($p, self::class);
-		\PHPStan\Testing\assertType('PHPStan\Type\WebMozartAssert\TypeInferenceTest', $p);
-
-		/** @var Foo|Bar $q */
-		$q = doFoo();
-		Assert::notInstanceOf($q, Bar::class);
-		\PHPStan\Testing\assertType('PHPStan\Type\WebMozartAssert\Foo', $q);
-
 		Assert::true($r);
 		\PHPStan\Testing\assertType('true', $r);
 
@@ -113,12 +69,6 @@ public function doFoo($a, $b, array $c, iterable $d, $e, $f, $g, $h, $i, $j, $k,
 		// should array<PHPStan\Type\WebMozartAssert\Foo>
 		\PHPStan\Testing\assertType('array<*NEVER*>', $ab);
 
-		Assert::stringNotEmpty($ac);
-		\PHPStan\Testing\assertType('non-empty-string', $ac);
-
-		Assert::integerish($ad);
-		\PHPStan\Testing\assertType('float|int|numeric-string', $ad);
-
 		Assert::implementsInterface($ae, Baz::class);
 		\PHPStan\Testing\assertType('PHPStan\Type\WebMozartAssert\Baz', $ae);
 

tests/Type/WebMozartAssert/data/type.php

@@ -6,9 +6,30 @@
 
 class TypeTest
 {
-	/**
-	 * @param mixed $a
-	 */
+	public function string($a): void
+	{
+		Assert::string($a);
+		\PHPStan\Testing\assertType('string', $a);
+	}
+
+	public function stringNotEmpty($a): void
+	{
+		Assert::stringNotEmpty($a);
+		\PHPStan\Testing\assertType('non-empty-string', $a);
+	}
+
+	public function integer($a): void
+	{
+		Assert::integer($a);
+		\PHPStan\Testing\assertType('int', $a);
+	}
+
+	public function integerish($a): void
+	{
+		Assert::integerish($a);
+		\PHPStan\Testing\assertType('float|int|numeric-string', $a);
+	}
+
 	public function positiveInteger($a): void
 	{
 		Assert::positiveInteger($a);
@@ -19,6 +40,18 @@ public function positiveInteger($a): void
 		\PHPStan\Testing\assertType('*NEVER*', $b);
 	}
 
+	public function float($a): void
+	{
+		Assert::float($a);
+		\PHPStan\Testing\assertType('float', $a);
+	}
+
+	public function numeric($a): void
+	{
+		Assert::numeric($a);
+		\PHPStan\Testing\assertType('float|int|numeric-string', $a);
+	}
+
 	public function natural($a): void
 	{
 		Assert::natural($a);
@@ -28,4 +61,67 @@ public function natural($a): void
 		Assert::natural($b);
 		\PHPStan\Testing\assertType('*NEVER*', $b);
 	}
+
+	public function boolean($a): void
+	{
+		Assert::boolean($a);
+		\PHPStan\Testing\assertType('bool', $a);
+	}
+
+	public function scalar($a): void
+	{
+		Assert::scalar($a);
+		\PHPStan\Testing\assertType('bool|float|int|string', $a);
+	}
+
+	public function object($a): void
+	{
+		Assert::object($a);
+		\PHPStan\Testing\assertType('object', $a);
+	}
+
+	public function resource($a): void
+	{
+		Assert::resource($a);
+		\PHPStan\Testing\assertType('resource', $a);
+	}
+
+	public function isCallable($a): void
+	{
+		Assert::isCallable($a);
+		\PHPStan\Testing\assertType('callable(): mixed', $a);
+	}
+
+	public function isArray($a): void
+	{
+		Assert::isArray($a);
+		\PHPStan\Testing\assertType('array', $a);
+	}
+
+	public function isIterable($a): void
+	{
+		Assert::isIterable($a);
+		\PHPStan\Testing\assertType('array|Traversable', $a);
+	}
+
+	public function isCountable($a): void
+	{
+		Assert::isCountable($a);
+		\PHPStan\Testing\assertType('array|Countable', $a);
+	}
+
+	public function isInstanceOf($a): void
+	{
+		Assert::isInstanceOf($a, self::class);
+		\PHPStan\Testing\assertType('PHPStan\Type\WebMozartAssert\TypeTest', $a);
+	}
+
+	/**
+	 * @param Foo|Bar $a
+	 */
+	public function notInstanceOf($a): void
+	{
+		Assert::notInstanceOf($a, Bar::class);
+		\PHPStan\Testing\assertType('PHPStan\Type\WebMozartAssert\Foo', $a);
+	}
 }