Re: RFC: rules for #include directives

Hi On 1/20/23 11:52, Jakub Zelenka wrote:

As it was said, this is problematic for bug fixes when merging up and it's extra hurdle for maintainers - read this will slow down the development.

Can I do anything to help with those merges?

Reduce the diff to absolute minimum to prevent potential conflict. I think it would be more acceptable if there was a plan that will get us there in multiple releases rather than do one big bang change. Then devs more likely remember what actually changed between releases and will be more careful when merging up.

A reasonable first step might be just *adding* all the missing '#include's to '*.c' with one PR per ext/* directory - not yet touching Zend/ and not adding a reasoning comment, because existing code doesn't have the reasoning comment either. Touching only *.c files in ext/ should not have any effect on anything else and thus adding those '#include's should be safe with regard to possible breakage. It might also be argued that such a missing include is an actual (hidden) bug. These PRs thus should be easy enough to review with a quick glance. Best regards Tim Düsterhus