Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Narrow type on assertCount and assertNotCount #205

Merged
merged 2 commits into from
Feb 23, 2024
Merged

Narrow type on assertCount and assertNotCount #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
daa717c
Narrow type on assertCount and assertNotCount
michalbundyra Feb 23, 2024
e589d47
remove trailing comma
michalbundyra Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/Type/PHPUnit/Assert/AssertTypeSpecifyingExtensionHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,20 @@ private static function getExpressionResolvers(): array
{
if (self::$resolvers === null) {
self::$resolvers = [
'Count' => static function (Scope $scope, Arg $expected, Arg $actual): Identical {
return new Identical(
$expected->value,
new FuncCall(new Name('count'), [$actual])
);
},
'NotCount' => static function (Scope $scope, Arg $expected, Arg $actual): BooleanNot {
return new BooleanNot(
new Identical(
$expected->value,
new FuncCall(new Name('count'), [$actual])
)
);
},
'InstanceOf' => static function (Scope $scope, Arg $class, Arg $object): Instanceof_ {
return new Instanceof_(
$object->value,
Expand Down
21 changes: 21 additions & 0 deletions tests/Type/PHPUnit/data/assert-function.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
use function PHPUnit\Framework\assertContains;
use function PHPUnit\Framework\assertContainsEquals;
use function PHPUnit\Framework\assertContainsOnlyInstancesOf;
use function PHPUnit\Framework\assertCount;
use function PHPUnit\Framework\assertNotCount;
use function PHPUnit\Framework\assertEmpty;
use function PHPUnit\Framework\assertInstanceOf;
use function PHPUnit\Framework\assertObjectHasAttribute;
Expand Down Expand Up @@ -90,4 +92,23 @@ public function containsOnlyInstancesOf(array $a, \Traversable $b): void
assertType('Traversable', $b);
}

public function count(array $a, \Countable $b): void
{
assertCount(3, $a);
assertType('non-empty-array', $a);

assertCount(7, $b);
assertType('Countable', $b);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure if we have any better type for non-empty Countable ?

}

public function notCount(array $a, array $b): void
{
assertNotCount(0, $a);
assertType('non-empty-array', $a);

// still might be empty
assertNotCount(1, $b);
assertType('array', $b);
}

}
Loading