-
-
Notifications
You must be signed in to change notification settings - Fork 196
fix: Recipe update skip ignored files #885
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
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for this @maxime-aknin! I thought I had all the edge cases covered. I was wrong :).
I've left some comments - mostly minutiae coding standard changes.
Cheers!
Oh, and for the coding standards, I should have just pointed you at fabbot (one of the CI checks): https://fabbot.io/report/symfony/flex/885/d84cd84094be56d55cfd5db080db4c40a6dcce16 - you can fix everything automatically from there. |
Hello @weaverryan 👋 That's ok I think every code style problem is now fixed. Sorry I didn't take the time to properly check the code standards before submitting. Thanks for the feedback and for the great symfonycast 🤘 Cheers ! |
@weaverryan Can you check now that the code has been updated now? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great 👍
Thank you @maxime-aknin. |
I ran into an issue with the

composer recipes:update
command. While trying to updatedoctrine/doctrine-bundle
recipe from 2.0 to 2.4, the command ouput stated that the recipe was updated with conflicts, but there were no actual changes made in files (except the symfony lock file):What's happening is that this recipe update contains changes that are applied to
phpunit.xml
bySymfony\Flex\Configurator\EnvConfigurator
, but this file is also added togitignore
byphpunit/phpunit
recipeThe fact that there is an ignored file in the recipe patch makes the

git apply
command in RecipePatcher fail without applying the patch, and this failure is not detected by the rest of the function.My proposal is to filter out ignored files from the beginning of the
generatePatch
function to fix this issue.