Skip to content

Conversation

petk
Copy link
Member

@petk petk commented Sep 29, 2017

Hello,

after reading the CONTRIBUTING.md, README.GIT-RULES and README.SUBMITTING-PATCHES files, it seems to me that some things mentioned need to be updated or at least simplified a bit. It would be of an enormous help for new people to understand better how/what/where and to reduce some cognitive load when browsing the php-src repository.

As a first step, can we maybe refactor these 3 files into a single beginner friendly CONTRIBUTING.md file and update it for the current contributing procedures but at the same time still have all the necessary information for the long term contributors?

The README.GIT-RULES file is also used as a root indicator in two other files when building and is now changed to CONTRIBUTING.md instead. The CONTRIBUTING.md file is probably also the correct indicator for that instead since no other such file might appear in the repository. Other minor occurrences of the README.GIT-RULES file exist in the wiki pages which shouldn't be too complicated to refactor and point into the CONTRIBUTING.md file instead.

GitHub uses CONTRIBUTING.md file when sending pull requests as an informational link.

This pull request has refactored these files into a hopefully simpler but still informative approach to understand how to contribute to PHP. Any feedback is welcome here.

Thanks for checking this out.

Redacted: few other changes have been added and rebased.

CONTRIBUTING.md Outdated
| PHP-7.0 | For releasing the PHP 7.0.x series. This is a current stable version and is open for bugfixes only. |
| PHP-5.6 | For releasing the PHP 5.6.x series. This is a current stable version and is open for security bugfixes only. |
| PHP-5.5 and below | These branches are closed. |
| PHP-X.Y.Z | These branches are used for the release managers for tagging the releases, hence they are closed to the general public. |
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if this list should be here as it mandates some maintenance that is already done elsewhere. Maybe give only examples with X.Y.Z

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Table with branches removed since the text above is probably more descriptive, yes. And more future prone.

CONTRIBUTING.md Outdated
```

When you change the NEWS file for a bug fix, then please keep the bugs sorted in
decreasing order under the fixed version.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unless you are going to commit it yourself, you shouldn't include the NEWS entry as it will probably create conflicts for the person merging it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added.

Contributing information has been joined from multiple text files into a
single CONTRIBUTING.md file for convenience.

The README.GIT-RULES file has been also used as a root indicator in two other
files when building and is now changed to CONTRIBUTING.md instead. The
CONTRIBUTING.md file is probably also the correct indicator for that instead.
Other minor occurrences of the README.GIT-RULES file exist in the wiki pages
which shouldn't be too complicated to refactor and point into the
CONTRIBUTING.md file instead.
@petk petk force-pushed the patch-git-rules branch from 418cb2e to 253e9d7 Compare October 9, 2017 14:14
@petk
Copy link
Member Author

petk commented Oct 9, 2017

Some minor Markdown formatting has been fixed and information about the NEWS file has been joined into a single dot under Git rules section. Commits have been rebased and squashed into a single one.

IMHO, this is explained better - for those wanting to do a "quick fix" and for people having commit access, of course thanks to all previous write-ups in those 3 files.

In case there is anything confusing about this or not exactly clear, let me know. Thanks.

@petk
Copy link
Member Author

petk commented Oct 9, 2017

I'll join two pull requests into one instead for easier understanding of the whole. Closing this pull request in favor of a new one...

@petk petk closed this Oct 9, 2017
@petk petk deleted the patch-git-rules branch October 20, 2017 20:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants