Repository navigation
Regenerate the turbo declarations of ScopeOps - #7069
Merged
Merged
Conversation
ScopeOps gained the private conditionalExpressionKeyPrefix() and conditionalExpressionKeySuffix() helpers, so the generated header must declare their signatures for the method parity check to pass.
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
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.
f4fb9c6da("Describe each conditional expression part once when merging scopes") added the privateScopeOps::conditionalExpressionKeyPrefix()andconditionalExpressionKeySuffix()helpers. It ported their logic toturbo-ext/src/ScopeOps.cpp, but it did not regenerateturbo-ext/src/generated/ScopeOps.h. Since then, Compile PHAR's Turbo Extension Version Check has failed at the method parity step (php turbo-ext/bin/side-by-side.php):The failing check also skips every turbo job that depends on it, including the Docker runs and Commit PHAR, on 2.3.x (
20c433f5c,b9bd42781).94519e24f(the Version Check passed in CI, andside-by-side.phppasses locally).f4fb9c6da, found withgit bisect runover94519e24f..b9bd42781using the parity check.php8.5 turbo-ext/bin/generate-declarations.php. It adds the signatures of the two new private helpers to the generated header. No C++ or PHP logic changes.Verification on this branch, with the extension built with the strict warning flags (
-Werror, clean build):php8.5 turbo-ext/bin/side-by-side.php: exit 0, ScopeOps 15 methods pairedturbo-ext/tests/signature-parity.php:OK (18515 members compared)turbo-ext/tests/smoke.php:ALL OKResultCacheManagerCollectedDataTest::testFileChangedAndChangedBackDuringTheAnalysisIsAnalysedAgain, which passes 3 of 3 times when rerun on its own.Shipped PHP code is unchanged, so the downgraded PHAR's PHP 7.4 compatibility is unaffected.