Extract remaining tests

Author: herndlm

tests/Type/WebMozartAssert/AssertTypeSpecifyingExtensionTest.php

@@ -15,7 +15,7 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/array.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/collection.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/comparison.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/data.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/object.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/string.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/type.php');
 	}

tests/Type/WebMozartAssert/data/array.php

@@ -17,8 +17,14 @@ public function keyNotExists(array $a): void
 	}
 
 	/**
-	 * @param mixed $a
+	 * @param array{foo?: string, bar?: string} $a
 	 */
+	public function keyExists(array $a): void
+	{
+		Assert::keyExists($a, 'foo');
+		\PHPStan\Testing\assertType('array{foo: string, bar?: string}', $a);
+	}
+
 	public function validArrayKey($a, bool $b): void
 	{
 		Assert::validArrayKey($a);
@@ -28,4 +34,32 @@ public function validArrayKey($a, bool $b): void
 		\PHPStan\Testing\assertType('*NEVER*', $b);
 	}
 
+	/**
+	 * @param int[] $a
+	 */
+	public function count(array $a): void
+	{
+		Assert::count($a, 1);
+		$a1 = array_pop($a);
+		$a2 = array_pop($a);
+		\PHPStan\Testing\assertType('int', $a1);
+		\PHPStan\Testing\assertType('int|null', $a2);
+	}
+
+	/**
+	 * @param int[] $a
+	 */
+	public function minCount(array $a): void
+	{
+		Assert::minCount($a, 1);
+		$a1 = array_pop($a);
+		\PHPStan\Testing\assertType('int', $a1);
+	}
+
+	public function isList($a): void
+	{
+		Assert::isList($a);
+		\PHPStan\Testing\assertType('array', $a);
+	}
+
 }

tests/Type/WebMozartAssert/data/comparison.php

@@ -52,10 +52,13 @@ public function notSame($a): void
 		\PHPStan\Testing\assertType('-1', $a);
 	}
 
-	public function inArray($a): void
+	public function inArray($a, $b): void
 	{
 		Assert::inArray($a, ['foo', 'bar']);
 		\PHPStan\Testing\assertType('\'bar\'|\'foo\'', $a);
+
+		Assert::nullOrInArray($b, ['foo', 'bar']);
+		\PHPStan\Testing\assertType('\'bar\'|\'foo\'|null', $b);
 	}
 
 	public function oneOf($a): void

tests/Type/WebMozartAssert/data/data.php

@@ -0,0 +1,51 @@
+<?php declare(strict_types=1);
+
+namespace PHPStan\Type\WebMozartAssert;
+
+use Webmozart\Assert\Assert;
+
+class ObjectTest
+{
+
+	public function classExists($a): void
+	{
+		Assert::classExists($a);
+		\PHPStan\Testing\assertType('class-string', $a);
+	}
+
+	public function subclassOf($a): void
+	{
+		Assert::subclassOf($a, self::class);
+		\PHPStan\Testing\assertType('class-string<PHPStan\Type\WebMozartAssert\ObjectTest>|PHPStan\Type\WebMozartAssert\ObjectTest', $a);
+	}
+
+	public function interfaceExists($a): void
+	{
+		Assert::interfaceExists($a);
+		\PHPStan\Testing\assertType('class-string', $a);
+	}
+
+	public function implementsInterface($a): void
+	{
+		Assert::implementsInterface($a, ObjectFoo::class);
+		\PHPStan\Testing\assertType('PHPStan\Type\WebMozartAssert\ObjectFoo', $a);
+	}
+
+	public function propertyExists(object $a): void
+	{
+		Assert::propertyExists($a, 'foo');
+		\PHPStan\Testing\assertType('object&hasProperty(foo)', $a);
+	}
+
+	public function methodExists(object $a): void
+	{
+		Assert::methodExists($a, 'foo');
+		\PHPStan\Testing\assertType('object&hasMethod(foo)', $a);
+	}
+
+}
+
+interface ObjectFoo
+{
+
+}

tests/Type/WebMozartAssert/data/object.php

@@ -18,10 +18,13 @@ public function stringNotEmpty($a): void
 		\PHPStan\Testing\assertType('non-empty-string', $a);
 	}
 
-	public function integer($a): void
+	public function integer($a, $b): void
 	{
 		Assert::integer($a);
 		\PHPStan\Testing\assertType('int', $a);
+
+		Assert::nullOrInteger($b);
+		\PHPStan\Testing\assertType('int|null', $b);
 	}
 
 	public function integerish($a): void
@@ -124,4 +127,10 @@ public function notInstanceOf($a): void
 		Assert::notInstanceOf($a, Bar::class);
 		\PHPStan\Testing\assertType('PHPStan\Type\WebMozartAssert\Foo', $a);
 	}
+
+	public function isArrayAccessible($a): void
+	{
+		Assert::isArrayAccessible($a);
+		\PHPStan\Testing\assertType('array|ArrayAccess', $a);
+	}
 }