-
Notifications
You must be signed in to change notification settings - Fork 7.9k
[PoC] Limited Abstract Generics #18260
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.
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
Draft
Draft
Changes from all commits
Commits
Show all changes
41 commits
Select commit
Hold shift + click to select a range
e6fdff1
Zend: Use pointer to zend_type for variance checks
Girgias a192a3a
Add T_TYPE token
Girgias 9304a82
Support minimal compilation of associated type
Girgias 066f04f
Associate type to CE and minimal duplicate check
Girgias b7cf20b
Prevent associated type from being in a union or intersection type
Girgias 0ec2ea6
Support invariant bound types for associated types
Girgias e215b8b
Add true global for mixed type
Girgias e6a1a7e
Store zend_type ptr in associated types HT
Girgias d252759
Add parser support for constraint type
Girgias 1691402
Add variance checking for constrained associated type
Girgias 139bbf6
Add basic support for extending interfaces with associated type
Girgias 2b9f0f5
Fix namespaces interfering with AT
Girgias b1a3546
Improve AT constraint indication when dumping type to string
Girgias 363f817
Fix various unhandled cases where AT is part of a union type
Girgias 2198aaf
[skip ci] Get explicit notation working
Girgias be7efd5
Remove most of associated types
Girgias 87f9544
rename
Girgias 56f2f1c
Did I finally fix generic type binding?
Girgias 2d83b54
fix stuff
Girgias 51b689e
move stuff
Girgias cad9308
name of variable
Girgias 5e076d0
Rewrite generic type binding for inherited interfaces
Girgias beabf2b
Do some fixes about implicit and explicit interface implementations
Girgias 36a4736
Fix namespace resolution for interfaces
Girgias 7fbdc0a
Use safe_pemalloc for generic params alloc
Girgias 6cdc4f5
Fix AST and name resolution
Girgias 7b38d21
Extra fixes
Girgias 20e21ab
Rename last associated macro stuff to generic
Girgias 92a45c7
Add bound resolved type to string for error messages
Girgias d1bae38
Fix typo in variable name
Girgias 518d7ea
Update wording for error message
Girgias 9d17cae
Add failing test
Girgias 00372bd
Add some const qualifiers
Girgias 02695e0
Change to static storage
Girgias 6fd8860
rename interfaces
Girgias ad1ae05
Fix redeclaration of method, and other issues
Girgias fba8f76
Add an index field to zend_type
Girgias 106c3d2
Stop relying on the generic type name to find bound type
Girgias 439458c
Refactor bind_generic_types_for_inherited_interfaces
Girgias 229fcc9
Zend: Inherit interfaces early
Girgias 891f24d
Fix some implicit bound type issues
Girgias File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
31 changes: 31 additions & 0 deletions
Zend/tests/type_declarations/abstract_generics/abstract_generic_001.phpt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| --TEST-- | ||
| Abstract generic types basic | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| interface I<T> { | ||
| public function foo(T $param): T; | ||
| } | ||
|
|
||
| class CS implements I<string> { | ||
| public function foo(string $param): string { | ||
| return $param . '!'; | ||
| } | ||
| } | ||
|
|
||
| class CI implements I<int> { | ||
| public function foo(int $param): int { | ||
| return $param + 42; | ||
| } | ||
| } | ||
|
|
||
| $cs = new CS(); | ||
| var_dump($cs->foo("Hello")); | ||
|
|
||
| $ci = new CI(); | ||
| var_dump($ci->foo(5)); | ||
|
|
||
| ?> | ||
| --EXPECT-- | ||
| string(6) "Hello!" | ||
| int(47) |
100 changes: 100 additions & 0 deletions
Zend/tests/type_declarations/abstract_generics/big_example.phpt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| --TEST-- | ||
| Concrete example of using AT | ||
| --CREDITS-- | ||
| Levi Morrison | ||
| --FILE-- | ||
| <?php declare(strict_types=1); | ||
|
|
||
| namespace Sequence; | ||
|
|
||
| // No null. This is probably going to be painful, but let's try it. | ||
| interface Sequence<Item : object|array|string|float|int|bool> | ||
| { | ||
| function next(): ?Item; | ||
|
|
||
| /** | ||
| * @param callable(Item, Item): Item $f | ||
| * @return ?Item | ||
| */ | ||
| function reduce(callable $f): ?Item; | ||
| } | ||
|
|
||
| final class StringTablePair | ||
| { | ||
| public function __construct( | ||
| public readonly string $string, | ||
| public readonly int $id, | ||
| ) {} | ||
| } | ||
|
|
||
| final class StringTableSequence implements Sequence<StringTablePair> | ||
| { | ||
| private array $strings; | ||
|
|
||
| public function __construct(StringTable $string_table) { | ||
| $this->strings = $string_table->to_assoc_array(); | ||
| } | ||
|
|
||
| function next(): ?StringTablePair | ||
| { | ||
| $key = \array_key_first($this->strings); | ||
| if (!isset($key)) { | ||
| return null; | ||
| } | ||
| $value = \array_shift($this->strings); | ||
| return new StringTablePair($key, $value); | ||
| } | ||
|
|
||
| /** | ||
| * @param callable(Item, Item): Item $f | ||
| * @return ?Item | ||
| */ | ||
| function reduce(callable $f): ?StringTablePair | ||
| { | ||
| $reduction = $this->next(); | ||
| if (!isset($reduction)) { | ||
| return null; | ||
| } | ||
|
|
||
| while (($next = $this->next()) !== null) { | ||
| $reduction = $f($reduction, $next); | ||
| } | ||
| return $reduction; | ||
| } | ||
| } | ||
|
|
||
| final class StringTable | ||
| { | ||
| private array $strings = ["" => 0]; | ||
|
|
||
| public function __construct() {} | ||
|
|
||
| public function offsetGet(string $offset): int | ||
| { | ||
| return $this->strings[$offset] ?? throw new \Exception(); | ||
| } | ||
|
|
||
| public function offsetExists(string $offset): bool | ||
| { | ||
| return \isset($this->strings[$offset]); | ||
| } | ||
|
|
||
| public function intern(string $str): int | ||
| { | ||
| return $this->strings[$str] | ||
| ?? ($this->strings[$str] = \count($this->strings)); | ||
| } | ||
|
|
||
| public function to_sequence(): StringTableSequence | ||
| { | ||
| return new StringTableSequence($this); | ||
| } | ||
|
|
||
| public function to_assoc_array(): array { | ||
| return $this->strings; | ||
| } | ||
| } | ||
|
|
||
| ?> | ||
| --EXPECTF-- | ||
| Fatal error: Generic type cannot be part of a union type in %s on line %d | ||
|
Comment on lines
+99
to
+100
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. When I saw my example in here, I got excited that you added basic union support. Nope! 😆 One day 🙏🏻 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. As I said to Bob I really want to keep it as small as possible as it's already hurting my brain a bit! But this should be a rather easy limitation to lift :) |
||
21 changes: 21 additions & 0 deletions
..._declarations/abstract_generics/bound_types/implicit_interface_different_bound_types.phpt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| --TEST-- | ||
| Implicit interface inheritance with different bound types | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| interface I1<T> { | ||
| public function foo(T $param): T; | ||
| } | ||
|
|
||
| interface I2<T> extends I1<T> { | ||
| public function bar(int $o, T $param): T; | ||
| } | ||
|
|
||
| class C implements I2<float>, I1<string> { | ||
| public function foo(float $param): float {} | ||
| public function bar(int $o, float $param): float {} | ||
| } | ||
|
|
||
| ?> | ||
| --EXPECTF-- | ||
| Fatal error: Bound type T for interface I1 implemented explicitly in C with type string must match the implicitly bound type float from interface I2 in %s on line %d |
21 changes: 21 additions & 0 deletions
...declarations/abstract_generics/bound_types/implicit_interface_different_bound_types2.phpt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| --TEST-- | ||
| Implicit interface inheritance with different bound types 2 | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| interface I1<T> { | ||
| public function foo(T $param): T; | ||
| } | ||
|
|
||
| interface I2<T> extends I1<T> { | ||
| public function bar(int $o, T $param): T; | ||
| } | ||
|
|
||
| class C implements I1<string>, I2<float> { | ||
| public function foo(string $param): string {} | ||
| public function bar(int $o, float $param): float {} | ||
| } | ||
|
|
||
| ?> | ||
| --EXPECTF-- | ||
| Fatal error: Bound type T for interface I1 implemented explicitly in C with type string must match the implicitly bound type float from interface I2 in %s on line %d |
21 changes: 21 additions & 0 deletions
...declarations/abstract_generics/bound_types/implicit_interface_different_bound_types3.phpt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| --TEST-- | ||
| Implicit interface inheritance with different bound types 3 | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| interface I1<T> { | ||
| public function foo(T $param): T; | ||
| } | ||
|
|
||
| interface I2 extends I1<float> { | ||
| public function bar(int $o, float $param): float; | ||
| } | ||
|
|
||
| class C implements I2, I1<string> { | ||
| public function foo(float $param): float {} | ||
| public function bar(int $o, float $param): float {} | ||
| } | ||
|
|
||
| ?> | ||
| --EXPECTF-- | ||
| Fatal error: Bound type T for interface I1 implemented explicitly in C with type string must match the implicitly bound type float from interface I2 in %s on line %d |
21 changes: 21 additions & 0 deletions
...declarations/abstract_generics/bound_types/implicit_interface_different_bound_types4.phpt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| --TEST-- | ||
| Implicit interface inheritance with different bound types 4 | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| interface I1<T> { | ||
| public function foo(T $param): T; | ||
| } | ||
|
|
||
| interface I2 extends I1<float> { | ||
| public function bar(int $o, float $param): float; | ||
| } | ||
|
|
||
| class C implements I1<string>, I2 { | ||
| public function foo(string $param): string {} | ||
| public function bar(int $o, float $param): float {} | ||
| } | ||
|
|
||
| ?> | ||
| --EXPECTF-- | ||
| Fatal error: Bound type T for interface I1 implemented explicitly in C with type string must match the implicitly bound type float from interface I2 in %s on line %d |
21 changes: 21 additions & 0 deletions
...ts/type_declarations/abstract_generics/bound_types/implicit_interface_no_bound_types.phpt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| --TEST-- | ||
| Implicit interface inheritance missing bound types | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| interface I1<T> { | ||
| public function foo(T $param): T; | ||
| } | ||
|
|
||
| interface I2<T> extends I1<T> { | ||
| public function bar(int $o, T $param): T; | ||
| } | ||
|
|
||
| class C implements I2<float>, I1 { | ||
| public function foo(float $param): float {} | ||
| public function bar(int $o, float $param): float {} | ||
| } | ||
|
|
||
| ?> | ||
| --EXPECTF-- | ||
| Fatal error: Interface I1 expects 1 generic parameters, 0 given in %s on line %d |
21 changes: 21 additions & 0 deletions
...s/type_declarations/abstract_generics/bound_types/implicit_interface_no_bound_types2.phpt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| --TEST-- | ||
| Implicit interface inheritance missing bound types 2 | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| interface I1<T> { | ||
| public function foo(T $param): T; | ||
| } | ||
|
|
||
| interface I2<T> extends I1<T> { | ||
| public function bar(int $o, T $param): T; | ||
| } | ||
|
|
||
| class C implements I1, I2<float> { | ||
| public function foo(float $param): float {} | ||
| public function bar(int $o, float $param): float {} | ||
| } | ||
|
|
||
| ?> | ||
| --EXPECTF-- | ||
| Fatal error: Interface I1 expects 1 generic parameters, 0 given in %s on line %d |
21 changes: 21 additions & 0 deletions
...s/type_declarations/abstract_generics/bound_types/implicit_interface_no_bound_types3.phpt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| --TEST-- | ||
| Implicit interface inheritance missing bound types 3 | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| interface I1<T> { | ||
| public function foo(T $param): T; | ||
| } | ||
|
|
||
| interface I2 extends I1<string> { | ||
| public function bar(int $o, string $param): string; | ||
| } | ||
|
|
||
| class C implements I1, I2 { | ||
| public function foo(string $param): string {} | ||
| public function bar(int $o, string $param): string {} | ||
| } | ||
|
|
||
| ?> | ||
| --EXPECTF-- | ||
| Fatal error: Interface I1 expects 1 generic parameters, 0 given in %s on line %d |
21 changes: 21 additions & 0 deletions
...s/type_declarations/abstract_generics/bound_types/implicit_interface_no_bound_types4.phpt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| --TEST-- | ||
| Implicit interface inheritance missing bound types 4 | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| interface I1<T> { | ||
| public function foo(T $param): T; | ||
| } | ||
|
|
||
| interface I2 extends I1<string> { | ||
| public function bar(int $o, string $param): string; | ||
| } | ||
|
|
||
| class C implements I2, I1 { | ||
| public function foo(string $param): string {} | ||
| public function bar(int $o, string $param): string {} | ||
| } | ||
|
|
||
| ?> | ||
| --EXPECTF-- | ||
| Fatal error: Interface I1 expects 1 generic parameters, 0 given in %s on line %d |
22 changes: 22 additions & 0 deletions
.../type_declarations/abstract_generics/bound_types/implicit_interface_same_bound_types.phpt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| --TEST-- | ||
| Implicit interface inheritance with same bound types | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| interface I1<T> { | ||
| public function foo(T $param): T; | ||
| } | ||
|
|
||
| interface I2<T> extends I1<T> { | ||
| public function bar(int $o, T $param): T; | ||
| } | ||
|
|
||
| class C implements I2<string>, I1<string> { | ||
| public function foo(string $param): string {} | ||
| public function bar(int $o, string $param): string {} | ||
| } | ||
|
|
||
| ?> | ||
| DONE | ||
| --EXPECT-- | ||
| DONE |
22 changes: 22 additions & 0 deletions
...type_declarations/abstract_generics/bound_types/implicit_interface_same_bound_types2.phpt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| --TEST-- | ||
| Implicit interface inheritance with same bound types 2 | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| interface I1<T> { | ||
| public function foo(T $param): T; | ||
| } | ||
|
|
||
| interface I2<T> extends I1<T> { | ||
| public function bar(int $o, T $param): T; | ||
| } | ||
|
|
||
| class C implements I1<string>, I2<string> { | ||
| public function foo(string $param): string {} | ||
| public function bar(int $o, string $param): string {} | ||
| } | ||
|
|
||
| ?> | ||
| DONE | ||
| --EXPECT-- | ||
| DONE |
31 changes: 31 additions & 0 deletions
...ype_declarations/abstract_generics/constraints/abstract_generic_type_with_constraint.phpt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| --TEST-- | ||
| Abstract generic type with a constraint | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| interface I<T : int|string> { | ||
| public function foo(T $param): T; | ||
| } | ||
|
|
||
| class CS implements I<string> { | ||
| public function foo(string $param): string { | ||
| return $param . '!'; | ||
| } | ||
| } | ||
|
|
||
| class CI implements I<int> { | ||
| public function foo(int $param): int { | ||
| return $param + 42; | ||
| } | ||
| } | ||
|
|
||
| $cs = new CS(); | ||
| var_dump($cs->foo("Hello")); | ||
|
|
||
| $ci = new CI(); | ||
| var_dump($ci->foo(5)); | ||
|
|
||
| ?> | ||
| --EXPECT-- | ||
| string(6) "Hello!" | ||
| int(47) |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.