Detect recursion in scheme extension - #944
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR hardens the Formwork\Schemes\Scheme extension mechanism by preventing recursive extension chains and by allowing extension to be triggered using either a Scheme instance or a scheme ID string.
Changes:
- Added recursion protection for scheme extension via a static in-progress ID tracker and a new
RecursionException. - Updated
Scheme::extend()to acceptScheme|stringand adjusted the constructor to pass the configuredextendID directly. - Updated docblocks/imports to reflect the new exception and signature changes.
馃挕 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
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.
This pull request improves the scheme extension mechanism in the
Schemeclass by adding recursion protection and allowing schemes to be extended by ID as well as by instance. The main changes focus on preventing infinite loops when schemes extend each other, directly or indirectly, and improving error handling.Scheme extension improvements:
self::$extendingto track currently extending scheme IDs and detect recursion during extension, throwing a newRecursionExceptionif a recursive extension is detected. [1] [2]extendmethod to accept either aSchemeinstance or a scheme ID (string), improving flexibility when extending schemes.extendmethod, aligning with the new method signature.RecursionExceptionwhen recursion is detected and updating docblocks to reflect new exception types. [1] [2]RecursionExceptionclass.