Skip to content
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

CONTRIBUTING.md File #854

Merged
merged 10 commits into from
Jun 1, 2015
Merged

CONTRIBUTING.md File #854

merged 10 commits into from
Jun 1, 2015

Conversation

ruflin
Copy link
Owner

@ruflin ruflin commented May 18, 2015

This pull request is to discuss content of the CONTRIBUTING.md file. The first contributions are only some nodes.

FYI: @im-denisenko @webdevsHub

@ruflin
Copy link
Owner Author

ruflin commented May 18, 2015

  • I suggest to add that also "collaborators" should never merge their own pull request
  • Links to Elastica.io must be provided on how to run docker-compose and builds

@im-denisenko
Copy link
Contributor

A few thoughts.

For issues:

  • Ask people to open an issue only for bug/feature request/change request and use SO/Gitter otherwise.
  • Ask people to search in existing issues first
  • Ask people to provide information how to reproduce their bug or what is feature they want.

For pull requests:

  • Mention rule "one change per pull request"
  • Mention that each commit should have meaning.
  • Mention that squash trash commits is good.
  • Mention that rebase from upstream after PR is ready to be merged is very good.
  • Mention that every addition must have at least unit tests.
  • Mention that every test must have group.
  • Suggest to look through existing code to get point how to add new one.
  • Encourage people to use feature branches for pull requests instead master.
  • Mention semver and that BC breaks must be argumented.

@ruflin
Copy link
Owner Author

ruflin commented May 26, 2015

@im-denisenko I updated the file. I left out the parts with squashing commits and rebase. This can be dangerous especially for unexperienced users. So the experienced ones are going to do this anyways and know when to do it, but the less experience are going to "save" route. I added all the other points.

I suggest we merge this to have a first version available and update it from there. I would like to add some more "examples" on how to setup the project and run the tests.

@im-denisenko What is the current command you run to "cleanup" the code styles?

@im-denisenko
Copy link
Contributor

@ruflin Looks good. I'm not sure how it looks for native speaker, but i'm not one who could fix this :)

For cs cleanup I use one of these:

vendor/bin/php-cs-fixer fix directory/filename.php
vendor/bin/php-cs-fixer fix directory/
vendor/bin/php-cs-fixer fix

@ruflin
Copy link
Owner Author

ruflin commented May 28, 2015

I tested it briefly and it looks like we used php-cs-fixer dir --level=psr2so far. If I call fix, it applies some more changes. I actually quite like the additional changes like making everything to single quotes.

@im-denisenko
Copy link
Contributor

we used level psr2 so far

It was symfony level with 3 additional fixers, as defined here.
php-cs-fixer should get config from file with this name by default.

@ruflin
Copy link
Owner Author

ruflin commented May 28, 2015

Right, forgot about this one. It picks the config if no dir is defined as the dir is also in the config file. It removes all package comments and adds a dot at the end of all comments. This leads to changing almost all files. So either we haven't run it for a really long time or something in the "default" symfony config changed (which I assume is the case).

More details on how to contribute and guidelines for [pull requests](http://elastica.io/contribute/pull-request.html) can be found [here](http://elastica.io/contribute/).

See [Coding guidelines](http://elastica.io/contribute/coding-guidelines.html) for tips on how to do so.
All changes which are made to the project are added to the [CHANGELOG.md](https://github.com/ruflin/Elastica/blob/master/CHANGELOG.md).
Copy link
Contributor

Choose a reason for hiding this comment

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

Better:

"All changes must be documented in the CHANGELOG."

@ruflin
Copy link
Owner Author

ruflin commented Jun 1, 2015

@webdevsHub Thanks for the notes. I made the changes to the file.

ruflin added a commit that referenced this pull request Jun 1, 2015
@ruflin ruflin merged commit 1316779 into master Jun 1, 2015
@ruflin ruflin deleted the contributing branch June 1, 2015 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants