PHP 8.2: Support for disjunctive normal form types #1198
Conversation
kukulich
force-pushed
the
dnf-types
branch
2 times, most recently
from
30b321b to
622800c
Compare
| array_map(static fn (BetterReflectionNamedType|BetterReflectionUnionType|BetterReflectionIntersectionType $type): ReflectionNamedType|ReflectionUnionType|ReflectionIntersectionType|null => ReflectionType::fromTypeOrNull($type), $this->betterReflectionType->getTypes()), | ||
| static fn (ReflectionNamedType|ReflectionUnionType|ReflectionIntersectionType|null $type): bool => $type instanceof ReflectionNamedType, | ||
| ); | ||
| return array_map(static function (BetterReflectionType $type): ReflectionNamedType { |
There was a problem hiding this comment.
BetterReflectionType is not final: IMO, the union type should be preserved 🤔
There was a problem hiding this comment.
Changed to BetterReflectionNamedType because ReflectionIntersectionType::getTypes() returns list<ReflectionNamedType>
There was a problem hiding this comment.
I see 🤔
Need to reason about this a bit, 'bit slow after processing a few hundred mails, sorry.
kukulich
force-pushed
the
dnf-types
branch
2 times, most recently
from
94b739d to
cb56306
Compare
| use function count; | ||
|
|
||
| abstract class ReflectionType extends CoreReflectionType | ||
| { | ||
| public static function fromTypeOrNull(BetterReflectionNamedType|BetterReflectionUnionType|BetterReflectionIntersectionType|null $betterReflectionType): ReflectionUnionType|ReflectionNamedType|ReflectionIntersectionType|null | ||
| public static function fromType(BetterReflectionNamedType|BetterReflectionUnionType|BetterReflectionIntersectionType|null $betterReflectionType): ReflectionUnionType|ReflectionNamedType|ReflectionIntersectionType |
There was a problem hiding this comment.
According to infection, this method is not used in a public scope? 🤔
There was a problem hiding this comment.
It's used in ReflectionIntersectionType and ReflectionUnionType adapters so marked as @internal
| if (! $innerType instanceof ReflectionNamedType) { | ||
| continue; | ||
| } |
There was a problem hiding this comment.
Looks quite broken: perhaps we should drop this method completely from src/Reflection, and only keep it on adapters? 🤔
There was a problem hiding this comment.
It's good idea, the method is marked as deprecated in PHP. However I prefer to do it in separate PR because the method is used in some unit tests.
|
Sorry for not merging yet: this is really messy PHP stuff, and I've been through LOADS of meetings today @_@ |
No problem :) |
| use function count; | ||
|
|
||
| abstract class ReflectionType extends CoreReflectionType | ||
| { | ||
| public static function fromTypeOrNull(BetterReflectionNamedType|BetterReflectionUnionType|BetterReflectionIntersectionType|null $betterReflectionType): ReflectionUnionType|ReflectionNamedType|ReflectionIntersectionType|null | ||
| /** @internal */ | ||
| public static function fromType(BetterReflectionNamedType|BetterReflectionUnionType|BetterReflectionIntersectionType|null $betterReflectionType): ReflectionUnionType|ReflectionNamedType|ReflectionIntersectionType |
There was a problem hiding this comment.
How do we kill this mutant, before merging? 🤔
There was a problem hiding this comment.
Added tests but the mutant is still there 🤷♂️
There was a problem hiding this comment.
Let's roll with the current solution for now 👍
https://wiki.php.net/rfc/dnf_types
#1197 needs to be merged first.