fix: 修复生成器返回类型

Conversation 0 Commits 3 Files Changed 9

yurunsoft commented 1 month ago

Collaborator

There is no content yet.

yurunsoft added 2 commits 1 month ago

c0556882ab fix(generator): 接受 \Generator 作为合法返回类型

cdf4e5f789 fix(compiler): 保留生成器声明返回类型以满足接口协变检查

Cherry-pick of upstream 84ad3a5. The generator return type covariance
change is built on yurun's Translator.php, which diverged from
origin/master, so the files are materialized from the upstream commit
directly (they already include the cc25d71 FiberGenerator change).

- isReturnTypeOverrideCompatible now performs full covariance: every value
  the child can return must be acceptable under the parent's declared
  return type (nullable/union narrowing allowed).
- Add getReturnAcceptedTypes/isReturnTypeSubtype/isReturnTypeCoveredBy/
  isReturnTypeEntryCompatible helpers; generators use their source-level
  declared return type so interface/abstract covariance checks hold.
- FunctionDef gains declaredReturnType/declaredReturnClass/declaredReturnTypeCheck.

Regression tests: interface-return-type.phpt, interface-return-type-variants.phpt.

yurunsoft changed title from ~~compiler-keep-generator-retype-covariance~~ to fix: 修复生成器返回类型 1 month ago

韩天峰 added 1 commit 1 month ago

1698682273 merge: sync generator return covariance fix with master

韩天峰 merged commit 05a423125b into master 1 month ago

韩天峰 deleted branch compiler-keep-generator-retype-covariance 1 month ago

韩天峰 referenced this issue from a commit 1 month ago

Merge pull request 'fix: 修复生成器返回类型' (#31) from compiler-keep-generator-retype-covariance into master

The pull request has been merged as 05a423125b.

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No project

No Assignees

2 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: aot/compiler#31

fix: 修复生成器返回类型 #31