-
Notifications
You must be signed in to change notification settings - Fork 7.9k
gen_stub: various simplifications and clean up (5) #18665
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
Open
DanielEScherzer
wants to merge
16
commits into
php:master
Choose a base branch
from
DanielEScherzer:stub-simplify-5
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
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
53f76f3
to
89eb11d
Compare
In preparation for moving this logic to a dedicated class, add support for a maximum version of PHP in the generation of version-dependent flags. This replaces the manual logic in `FuncInfo::getFunctionEntry()` to split up the flags that are used when PHP 8.4 is not supported.
This new class holds the logic for applying different flags based on the PHP version, and replaces `VariableLike::addFlagForVersionsAbove()` (use `VersionFlags::addForVersionsAbove()`) and `generateVersionDependentFlagCode()` (use `VersionFlags::generateVersionDependentFlagCode()`).
Reduce the number of global functions by moving it to instance method `FileInfo::generateClassEntryCode()`.
Reduce the number of global functions by moving it to static method `FileInfo::getFileDocComments()`. Since it is only used by `FileInfo::parseStubFile()`, also make it private.
Simplifies the implementation of `::toTypeCode()` and `::toTypeMask()` by combining the `switch` blocks.
* `FuncInfo::isFinalMethod()` * `FuncInfo::getModifierNames()` * `FuncInfo::equalsApartFromNameAndRefcount()`
Simplifies the implementation of `::getPredefinedConstantTerm()` and `::getPredefinedConstantEntry()`, which only differ in the name of the tag used.
89eb11d
to
48ae55a
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Each commit can be reviewed independently, and should have no functional changes