[AddLines] Fix update process to send changes to RecipeUpdate vs make them immediately#988
Merged
fabpot merged 5 commits intosymfony:1.xfrom Aug 4, 2023
Merged
Conversation
weaverryan
commented
Aug 2, 2023
| // reset the file content cache | ||
| $this->fileContents = []; | ||
| $this->executeUnconfigure($recipeUpdate->getOriginalRecipe(), $originalConfig); | ||
| $this->executeConfigure($recipeUpdate->getNewRecipe(), $newConfig); |
Contributor
Author
There was a problem hiding this comment.
The old logic "unconfigured" the original recipe, then configured the new recipe. So we're doing the same, except that we "record" the changes and report them to $recipeUpdate below instead of actually making the changes now.
| } catch (ParsingException $e) { | ||
| // if controllers.json is invalid (possible during a recipe upgrade), we can't update the file | ||
| return; | ||
| } |
Contributor
Author
There was a problem hiding this comment.
Unrelated to the PR - but noticed while doing it. We already have this same code in this file to avoid exploding if package.json can't be parsed due to a conflict.
fabpot
approved these changes
Aug 4, 2023
Member
|
Thank you @weaverryan. |
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
2 participants
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.
Hi!
This was an oversight when I create
AddLinesConfigurator.During
recipes:update, the purpose of theupdate()method in each configurator is to record what the "original" contents of a file would look like from the original recipe & what the "new" contents of a file would look like with the new recipe. Then, LATER, the patcher system creates a diff from these.The
AddLinesConfiguratorwas going rogue and updating the files immediately, which caused the "patcher" system later to explode because this file was unexpectedly already modified.The changes are less drastic than they look, as code needed to be moved from some public methods -> private methods.
Cheers!