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

Jump to bottom

Feature/variadic intersection type #185

Merged
merged 17 commits into from
Apr 28, 2021
Merged

Feature/variadic intersection type #185

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e8778ab
Psl\Type\union - renamed parameters: left_type -> first, right_type -…
nzour Apr 26, 2021
6a80f71
Psl\Type\union - added variadic parameter $rest
nzour Apr 26, 2021
41c9cf6
Improving tests for UnionType
nzour Apr 26, 2021
49b6989
Added static-analysis tests for union type
nzour Apr 26, 2021
94223e6
cs fix: static-analysis test for union
nzour Apr 26, 2021
1b7c8dc
Psl\Type\literal_scalar simplified union type definition
nzour Apr 26, 2021
3344eb5
Psl\Type\intersection renamed function parameters: left_type -> first…
nzour Apr 26, 2021
a1d0e94
Psl\Type\intersection added variadic third parameter
nzour Apr 27, 2021
72c1249
Psl\Type\intersection cs fix
nzour Apr 27, 2021
3519ead
Added static analysis tests for intersection
nzour Apr 27, 2021
5d47fa6
Merge pull request #1 from azjezz/1.7.x
nzour Apr 27, 2021
fa5e6a3
Merge branch '1.7.x' into feature/variadic-intersection-type
nzour Apr 27, 2021
adf1ec3
Static analysis test for intersection - removed redundant psalm-suppress
nzour Apr 27, 2021
6993f4e
Psl\Type\intersection function - fix documentation near throws annota…
nzour Apr 27, 2021
722dc9a
Fix documentation for Psl\Type\intersection function
nzour Apr 27, 2021
a98c4df
Improve static analysis tests for intersection function
nzour Apr 27, 2021
904eed4
Little improve for IntersectionType tests
Apr 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 31 additions & 9 deletions tests/unit/Type/IntersectionTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ final class IntersectionTypeTest extends TypeTest
{
public function testIntersectionLeft(): void
{
$intersection = Type\intersection(Type\array_key(), Type\int());
$intersection = Type\intersection(Type\array_key(), Type\int(), Type\positive_int());

static::assertSame(1, $intersection->coerce('1'));
}
Expand Down Expand Up @@ -53,14 +53,36 @@ public function getToStringExamples(): iterable
'Psl\Collection\IndexAccessInterface&Psl\Collection\CollectionInterface'
];

yield [Type\intersection(
Type\object(IndexAccessInterface::class),
Type\union(Type\object(CollectionInterface::class), Type\object(Iterator::class))
), 'Psl\Collection\IndexAccessInterface&(Psl\Collection\CollectionInterface|Iterator)'];
yield [
Type\intersection(
Type\object(IndexAccessInterface::class),
Type\union(
Type\object(CollectionInterface::class),
Type\object(Iterator::class)
)
),
'Psl\Collection\IndexAccessInterface&(Psl\Collection\CollectionInterface|Iterator)'
];

yield [Type\intersection(
Type\union(Type\object(CollectionInterface::class), Type\object(Iterator::class)),
Type\object(IndexAccessInterface::class)
), '(Psl\Collection\CollectionInterface|Iterator)&Psl\Collection\IndexAccessInterface'];
yield [
Type\intersection(
Type\union(
Type\object(CollectionInterface::class),
Type\object(Iterator::class)
),
Type\object(IndexAccessInterface::class)
),
'(Psl\Collection\CollectionInterface|Iterator)&Psl\Collection\IndexAccessInterface'
];

yield [
Type\intersection(
Type\object(IndexAccessInterface::class),
Type\object(CollectionInterface::class),
Type\object(Iterator::class),
Type\shape(['id' => Type\string()]),
),
Comment on lines +79 to +84
Copy link
Owner

Choose a reason for hiding this comment

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

technically an impossible type, but okay :p

'Psl\Collection\IndexAccessInterface&Psl\Collection\CollectionInterface&Iterator&array{\'id\': string}'
];
}
}